facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity
8,077 Commits 24 Branches 62 Tags 323 MiB
3da3b1d1e0
Commit Graph

2202 Commits

Author SHA1 Message Date
Patrick Mezard
d34099656d convert/cvs: delay CVS log parsing after initialization (issue1581/2) 
Source and destination constructors should be fast so configurations issues are
hit quickly, including authentication and filemap/authormap/splicemap issues.
Delaying might be a problem if the remove side disconnects idle connections
while the log is being read. It did not happen when converting openafs
repository, where log retrieval took at least 10mn.
 2009-04-11 21:17:11 +02:00
Patrick Mezard
b6f490f554 convert: better mapfile parsing errors (issue1581/1) 2009-04-11 21:15:27 +02:00
Patrick Mezard
ea6ab7b729 Merge with crew-stable 2009-04-11 20:49:47 +02:00
Patrick Mezard
629f02e472 purge: fix 7625ece8e2f7 (remove read-only files) 
- use try/except to avoid unnecessary work
- edit only mode bits
 2009-04-11 00:13:18 +02:00
Patrick Mezard
229740c001 purge: remove read-only files under Windows (issue583) 
Initial version by Benoit Boissinot <bboissin@gmail.com>
 2009-04-10 21:20:28 +02:00
Martin Geisler
a0c28e829e commands: more informative description of "!" files in status 
This makes the description more similar to the one used by Subversion.
Suggestion by Dennis Brakhane.
 2009-04-09 20:00:48 +02:00
Martin Geisler
e8820e5792 commands: automatically word-wrap cmdline options 
Some of the descriptions of command line options were getting quite
long, and when translated they are likely to grow even longer. This
word-wraps them at 70 characters, just like the help texts.

We could have opted to wrap them at the terminal width instead, but I
think it looks better to have them be consistent with the help texts.
 2009-04-09 14:43:02 +02:00
Patrick Mezard
8b64865271 Merge with crew-stable 2009-04-08 23:24:22 +02:00
Martin Geisler
bee180f29b commands: consistently write switches as -a/--abc 2009-04-08 21:20:31 +02:00
Martin Geisler
a135216a5b upper-case command line meta variables 2009-04-08 20:43:19 +02:00
Martin Geisler
e45e28d3cc notify, commands: word-wrap help strings 2009-04-08 00:41:07 +02:00
Martin Geisler
42fa3800bd expand "rev" to "revision" in help texts 2009-04-07 23:06:50 +02:00
Martin Geisler
249541da43 expand "repo" to "repository" in help texts 2009-04-07 22:58:05 +02:00
Martin Geisler
ea1734b579 expand "dir" to "directory" in help texts 2009-04-07 22:47:56 +02:00
Henrik Stuart
670fb51b7d patchbomb: Support initial in-reply-to header 
This allows follow-up/revised patches to appear properly threaded
in mail readers and in the archives, reducing noise.
 2009-04-08 19:32:16 +02:00
Nicolas Dumazet
6ebdee6dde profiling: Adding support for kcachegrind output format, using lsprofcalltree 2009-04-08 14:20:57 +02:00
Nicolas Dumazet
f2cfd93c8c profiling: Adding a profiling.format config variable 
Allows defining other output formats for profiling.

If an invalid format is given, output a warning and ignore it.
For now, only the standard 'text' value is supported.
 2009-04-02 16:01:30 +09:00
Nicolas Dumazet
14ff1a53ae profiling: Adding profiling.output config variable 
If specified, outputs profiling data to the said file.
Prints to stderr by default
 2009-04-08 14:19:41 +02:00
Nicolas Dumazet
b87b90da60 profiling: dropping hotshot profiling. --profile as a unique profiling option 
hotshot was an experimental module, which is broken for Python < 2.5
And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile
(formerly lsprof) should be used instead.
 2009-04-08 14:18:20 +02:00
Henrik Stuart
235c60980e log: fix broken multiple user search 
This fix also allows partial user matches so the full name and email
does not have to be written out in verbatim.
 2009-04-07 20:57:25 +02:00
Martin Geisler
79a1ecab7b commands: describe "!" files as "missing" in help for status 2009-04-07 17:32:40 +02:00
Benoit Boissinot
309c0e0a31 merge with -stable 2009-04-06 20:11:00 +02:00
Dirkjan Ochtman
2ad060935d tests: use unified diff in test-command-template for better error reports 2009-04-06 10:53:01 +02:00
Martin Geisler
1e1d82e968 convert: align option types in help text 2009-04-05 13:20:30 +02:00
Wagner Bruna
103904e6a1 commands: fix typo on flag description 2009-04-05 05:12:43 -03:00
Martin Geisler
f1c1a1fa6e commands: word-wrap help texts at 70 characters 2009-04-04 23:21:23 +02:00
Martin Geisler
b37b6d3cd0 rebase: word-wrap help texts at 70 characters 2009-04-04 23:19:11 +02:00
Martin Geisler
9d08018e0f keyword: word-wrap help texts at 70 characters 2009-04-04 23:17:53 +02:00
Martin Geisler
69ba878bb4 convert: word-wrap help texts at 70 characters 2009-04-04 23:16:55 +02:00
Martin Geisler
04b0d911a3 Change double spaces to single spaces in help texts. 2009-04-04 21:09:43 +02:00
Martin Geisler
af7a5be45e commands, help: consistently write 'URL' in upper-case 2009-04-04 17:44:18 +02:00
Martin Geisler
695e12c72b commands: use single-quotes for 'hg help ...' hints 2009-04-04 00:27:55 +02:00
Matt Mackall
f2b63f05d7 convert: attempt to check repo type before checking for tool 2009-04-04 12:28:13 -05:00
Dirkjan Ochtman
049b5daa9b merge with crew-stable 2009-04-04 19:43:00 +02:00
Marti Raudsepp
b717070e88 convert: handle comments starting with '#' in authormap files 2009-04-04 18:04:38 +02:00
Marti Raudsepp
f86045b534 convert: fix authormap handling of lines without '=' 
Unpacking the result from str.split raises ValueError, not IndexError, if the
line does not contain a '='.
 2009-04-04 15:41:32 +02:00
Vsevolod Solovyov
201e56ffbb Fix issue1495, corner case of adding empty files via patching 2009-03-24 23:28:55 +00:00
madhu@madhu
d6166450e5 Returns lines changed for paths specified as arguments correctly. 
This fixes issue 1569. hg churn <path> now returns only the number
of lines changed in the path, if the path is specified by filtering
files through a match filter at the changeset level. test-churn
has been updated to take care of this issue.
 2009-03-25 01:49:03 +05:30
Marti Raudsepp
387a098ed6 convert: Add testcase for convert authormap. 2009-03-14 14:31:08 +02:00
Christian Ebert
3849a2cc57 tests: guess lexer by filename for recent pygments 
Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii
by util.tolocal, which yields class="err". Guess lexer by extension instead.
 2009-04-04 15:14:36 +02:00
Pavel Volkovitskiy
d933c50ed4 right way to check if file was in renamed directory, fixes import monotone 
repos with renamed directories
 2009-04-02 22:25:49 +04:00
Henrik Stuart
ced279d296 convert: added cvsnt mergepoint support 2009-04-02 14:48:06 +02:00
Stefano Tortarolo
73c9e38e37 rebase: keep original mq patch format (Issue1574) 
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.

Note: this version corrects a failure in the test
 2009-03-26 16:58:50 +02:00
Stefano Tortarolo
3d01e07230 rebase: don't lose rename/copy data (Issue1423) 2009-03-30 18:26:32 +02:00
Justin Peng
d4938a90ee Correct a bug on date formats with '>' or '<' accompanied by space characters. 2009-04-01 09:11:00 -07:00
Stefano Tortarolo
6016fce500 rebase: store/restore arguments correctly 
Keep and keepbranches were lost after an interruption
 2009-03-29 14:43:49 +02:00
Stefano Tortarolo
f885e061f2 rebase: correct help text 
Show the correct parameters in help text
 2009-03-29 14:47:59 +02:00
Steve Borho
63d4e6092c on clone failure, only remove directories we created 
If the user created the clone target directory before running
the clone command, only cleanup the .hg/ repository when errors
occur.  Leave the empty target directory in place.
 2009-03-31 21:21:53 -05:00
Greg Ward
558dacc406 issue1582: improve description of splicemap syntax in help. 2009-03-31 15:52:48 -04:00
Steve Borho
ad54f46fa2 allow clone into existing but empty directories 2009-03-29 16:15:06 -05:00
Benoit Boissinot
1f5f22d2a8 merge with backout 2009-03-30 01:23:12 +02:00
Benoit Boissinot
fe6c4f18cd Backed out changeset d4343088804c 
The difference came from a configuration difference (network unreachable vs.
connection refused), not from an OS change.
 2009-03-30 01:23:01 +02:00
Rocco Rutte
a1eb264519 record: Give user a hint about chunk selection progress 
It greatly improves usability when one roughly knows where
the chunks of interest are.
 2009-03-28 23:09:36 +01:00
Rocco Rutte
0e71380f6b coal/paper: Turn <img> into <img/> where missing 2009-03-28 22:22:22 +01:00
Benoit Boissinot
6712106532 add missing +x flag to test-inotify-issue1542 2009-03-28 19:50:37 +01:00
Mads Kiilerich
36ec467f85 convert: missing p4 tool is only slightly fatal 
checktool with default abort=True caused convert to fail too early.
 2009-03-27 13:39:18 +01:00
John Coomes
664dabc0ed tests: strip o/s-dependent error messages from some http tests 2009-02-27 17:28:26 -08:00
Nicolas Dumazet
ddda9ba6fe Fixing issue1542, adding a relevant test 
inotify is smart enough to notify you about any changes in a
directory, even if you only watch the directory, and none if its
contents: the recursive add_watch I added was unnecessary.

The only thing that matters here is the recursive status update on
directory deletion.

And scan() has to be called _before_ the deferred call is registered.
(race condition: depending on the times, the previous patch could
apparently fail on the provided test. It's not the case anymore.)
 2009-03-26 19:01:06 +09:00
Matt Mackall
b6fd334dd0 Merge with -stable 2009-03-24 16:41:41 -05:00
Dirkjan Ochtman
33d6485beb add debugcommands command: an easy to parse command + option index 2009-03-23 13:43:48 +01:00
Alexander Solovyov
475ce753d3 templater: ability to display diffstat for log-like commands 2009-03-23 10:41:42 +01:00
Matt Mackall
68f6893175 Merge with -stable 2009-03-20 18:55:20 -05:00
Lee Cantey
1f2673b393 Fix for merge changes introduced in rev 397091458855 2009-03-19 10:25:13 -07:00
Matt Mackall
4cd17487f7 Merge with stable 2009-03-17 13:46:53 -05:00
Mads Kiilerich
21fd26f154 test-merge-tools: test ui.merge functionality and selection of internal tools 2009-03-09 18:44:44 +01:00
Stefano Tortarolo
ae208b3a98 rebase: pull --rebase updates if there is nothing to rebase 2009-01-18 19:59:51 +01:00
Mads Kiilerich
d6ab2f95b5 test-merge-tool: Make sure no hgmerge can be found in $PATH 
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
 2009-02-10 22:47:38 +01:00
Matt Mackall
2e1730294c patch: teach selectfile about symlinks (issue1438) 2009-02-16 17:37:23 -06:00
Matt Mackall
1a2d87e4e1 mq: handle empty patches more gracefully (issue1501) 2009-02-16 17:37:23 -06:00
Simon Heimberg
23251d5bdf test suite: saver check if bzr is installed 
Test if bzrlib.__doc__ is not empty. Ignores an empty lib.
 2009-02-08 13:46:04 +01:00
Augie Fackler
7131a2f8b7 fancyopts: Parse options that occur after arguments. 
This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required.
Fixes issue1402.
Doc fixes for mq by mpm.
 2009-02-10 13:26:00 -06:00
Augie Fackler
0dd0e4f46d tests: Add a test for the behavior of 'hg export -- -2' 2009-02-10 16:31:52 -06:00
Mads Kiilerich
9b111ad022 test-merge-tools: Don't use tac 
"tac" was a bad tool - is not available on all platforms.

The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
 2009-02-10 16:11:48 +01:00
Matt Mackall
d7c2a2e49b merge: mark kept local files as readded on linear update (issue539) 2009-02-15 10:50:48 -06:00
Jim Correia
78e5b53d7d add --git option to commands supporting --patch (log, incoming, history, tip) 
No short -g form, since it would conflict with -g from the graphlog extension.
 2009-02-14 22:40:39 +01:00
Dirkjan Ochtman
29fd92e139 tests: fix for test-identify returning 255 2009-02-13 13:52:34 +01:00
Gilles Moris
60d2f6f240 extdiff: add --change option to display single changeset diff 
This is the counterpart for extdiff of 44ccab2b73f0.
 2009-02-07 19:41:05 +01:00
Dirkjan Ochtman
73563fa8ff identify: have consistent output for local repositories 
Also, add some extensive testing for it (hardly any in the suite so far).
 2009-02-13 11:32:33 +01:00
Martin Geisler
8d98ac17bc reset mergestate after commit 2008-12-25 10:42:01 +01:00
Mads Kiilerich
d775f5aa2a Make util.find_exe alway returns existing file, fixing issue1459 
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT

This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
 2009-01-25 21:20:13 +01:00
Mads Kiilerich
ec83cadc8e test-merge-tools 
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
 2009-01-25 21:20:11 +01:00
Jim Correia
652c76f46a Account for symlinks when setting up HGTMP. 
On Mac OS X, several top-level directories are actually symlinks into
/private. When setting up HGTMP, expand the symlinks so that later
comparisons to or substituations with the actual path work as expected.
 2009-01-25 14:12:41 -05:00
Benoit Allard
c429e1d8f6 coal/paper: switch to XHTML 1.1 2009-02-05 18:15:33 +01:00
Martin Geisler
8fdb89c045 run-tests: add --pure flag for using pure Python modules 2009-01-31 22:50:18 +01:00
Benoit Boissinot
51f22b2a1b merge with crew 2009-01-27 18:17:59 +01:00
Steve Borho
4860997ffa record: do not lose permission changes on commit 2009-01-27 09:58:48 -06:00
Dirkjan Ochtman
e5623f9c50 graphlog: some testing for incoming and outgoing graphs 2009-01-26 16:34:38 +01:00
Matt Mackall
e0882a579f fix up tests for paths and urls help 2009-01-25 12:07:41 -06:00
Patrick Mezard
1977ae7dbb Merge with crew-stable 2009-01-25 18:58:12 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Dirkjan Ochtman
4e4940dc82 templater: fix age filter to state the obvious on future timestamps 2009-01-22 16:07:44 +01:00
Dirkjan Ochtman
2976fb29b0 tests: fix issue in test-audit-path with HGTMP on OS X 2009-01-22 15:22:37 +01:00
Dirkjan Ochtman
ed55287ff1 tests: eliminate use of sed -i (which fails on NetBSD) 2009-01-22 14:33:49 +01:00
Dirkjan Ochtman
44cb61f1a6 tests: fix up tests to cope with 8d681e04a351 2009-01-22 14:32:39 +01:00
Dirkjan Ochtman
c4b462d161 merge with crew-stable 2009-01-19 12:58:01 +01:00
Stepan Koltsov
1fa2450a68 coal/paper: add missing spaces in changeset child formatting 2009-01-19 12:36:06 +01:00
Christian Ebert
5afb33fd34 notify: fix neglect of custom headers set via template 
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
 2009-01-15 01:38:52 +01:00
Patrick Mezard
a70c4ebc9d merge: fix execute bit update issue introduced by db8aabe14ff1 2009-01-13 22:41:06 +01:00
Patrick Mezard
7ab8b3fde9 diffstat: don't fail on merges 
First version by Alexander Solovyov <piranha@piranha.org.ua>
 2009-01-13 20:28:06 +02:00
Christian Ebert
4f717b637b notify: fix neglect of custom headers set via template 
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
 2009-01-15 01:38:52 +01:00