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
Matt Mackall
1fca17b321
Fix new CVS test output
2009-03-20 18:49:44 -05:00
Greg Ward
c9426abe07
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
2009-03-18 09:15:38 -04:00
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
Benjamin Pollack
022828a7a5
regression test for issue1552
...
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
2009-03-17 11:34:40 -04:00
Matt Mackall
7d51e0b1f6
bundlerepo: reintroduce dirstate
2009-03-17 13:43:11 -05:00
Matt Mackall
e31a8bb788
atom: fix URLs used in entry GUIDs
2009-03-16 17:21:06 -05:00
Matt Mackall
891ec3832e
resolve: keep .orig files
2009-03-16 16:58:41 -05:00
Matt Mackall
56a3a8557f
Merge with crew-stable
2009-03-09 11:41:38 -05:00
Benoit Boissinot
c34938cba1
verify: find correct first corrupted cset for missing/corrupted revlogs
2009-03-07 20:16:03 +01:00
Mads Kiilerich
240dc61d24
test-identify: require no-outer-repo
...
The test expects "There is no Mercurial repository here (.hg not found)"
2009-03-05 14:53:59 +01:00
Frank Kingswood
a2f1d401c2
convert: Perforce source for conversion to Mercurial
2009-03-03 21:32:23 +00:00
Matt Mackall
f91e781c87
remove tests for long-gone imerge extension
2009-03-04 18:42:24 -06:00
Augie Fackler
bf90b0cbb4
merge: better error messages to lead users to hg update --clean to abandon merges.
...
Fixes issue1533.
2009-03-04 13:06:16 -06:00
Matt Mackall
5871cdf2c8
audit: be even pickier (issue1450)
2009-03-04 17:02:16 -06: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
Alex Unden
eb753f04dc
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01
bookmarks: Set current bookmark if we create a new one on the tip
...
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
2009-03-01 00:30:01 +01:00