Renato Cunha <renato@renatocunha.com> [Wed, 14 Dec 2011 12:28:00 -0200] rev 15634
diff: don't crash when diffing a revision with a deleted subrepo (issue3153)
When a user requested a diff between a revision (r1) that contained a subrepo
and another (r2) that did not, mercurial would crash if r1 was specified before
r2 but would execute the diff otherwise. This fixes this behavior by skipping
the missing subrepo in the diff.
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 11:13:38 +0100] rev 15633
status: add missing ":" to help text
Martin Geisler <mg@lazybytes.net> [Sat, 10 Dec 2011 18:40:05 +0100] rev 15632
dispatch: remove extra newline
The return statement belongs to the lines above.
Ion Savin <comp_@gmx.net> [Fri, 09 Dec 2011 14:14:30 +0200] rev 15631
annotate: show full changeset hash when invoked with --debug and -c
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:58:12 +0100] rev 15630
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:58 +0100] rev 15629
largefiles: fix 'hg status' abort after merge
If a largefile is introduced on the branch that is merged into the
working copy, then 'hg status' would abort with an error like:
$ hg status
abort: .hglf/foo@33fdd332ec64: not found in manifest!
The problem was that the largefiles status code only looked in the
first parent for the largefile. Largefiles are now always reported as
modified if they don't exist in the first parent -- this matches the
behavior of localrepo.status for normal files.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:57 +0100] rev 15628
largefiles: use lfutil functions
Using regular expressions to cut off a (fixed) string prefix is overly
complicated and wasteful.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:56 +0100] rev 15627
largefiles: fix indentation
Martin Geisler <mg@aragost.com> [Wed, 07 Dec 2011 16:25:51 +0100] rev 15626
largefiles: remove pre-1.7 compatibility code
Mercurial 1.7 added the --subrepos flag to status and archive and the
largefiles code was still compatible with the old method signatures.
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:53 +0100] rev 15625
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Dec 2011 15:50:33 +0100] rev 15624
sshrepo: add more safe characters (issue2983)
Extended the list of safe characters introduced in 86fc364ca5f8 to include
everything from pipes._safechars, which is only available on Unix platforms.
Place "-" at the end of the range to avoid backslash-escape.
New characters: @%+=:,
Matt Mackall <mpm@selenic.com> [Thu, 08 Dec 2011 16:01:44 -0600] rev 15623
merge with stable