Fri, 09 Dec 2011 17:34:58 +0100 largefiles: fix 'hg status' abort after merge 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.
Fri, 09 Dec 2011 17:34:57 +0100 largefiles: use lfutil functions
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.
Fri, 09 Dec 2011 17:34:56 +0100 largefiles: fix indentation
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:34:56 +0100] rev 15627
largefiles: fix indentation
Wed, 07 Dec 2011 16:25:51 +0100 largefiles: remove pre-1.7 compatibility code
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.
Fri, 09 Dec 2011 17:34:53 +0100 merge: make debug output easier to read
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.
Fri, 09 Dec 2011 15:50:33 +0100 sshrepo: add more safe characters (issue2983)
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: @%+=:,
Thu, 08 Dec 2011 16:01:44 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Dec 2011 16:01:44 -0600] rev 15623
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip