Augie Fackler <durin42@gmail.com> [Mon, 12 Dec 2011 11:54:22 -0600] rev 15645
zsh completion: add support for qfinish
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:24:38 -0600] rev 15644
merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 14:24:29 -0600] rev 15643
merge with i18n
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 10 Dec 2011 20:48:33 +0200] rev 15642
i18n-de: Error reported by Mathias Goldau and commit msg shortened
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 10 Dec 2011 20:22:33 +0200] rev 15641
i18n-de: mostly update fuzzies
More helptexts have been changed into on id per paragraph. New keywords
added. hg example calls changed to :hg:`..` syntax (where changed in EN).
Alexander Sauta <demosito@gmail.com> [Thu, 08 Dec 2011 00:05:24 +0300] rev 15640
i18n-ru: eol, fetch, color, LargeFiles, gpg, keywords translated
Alexander Sauta <demosito@gmail.com> [Fri, 18 Nov 2011 21:19:05 +0300] rev 15639
i18n-ru: glossary added, acl translation fixed
Andrey Somov <py4fun@gmail.com> [Thu, 10 Nov 2011 22:05:02 +0100] rev 15638
i18n-ru: update translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 12 Dec 2011 17:10:19 +0900] rev 15637
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:26:33 +0100] rev 15636
merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 15 Dec 2011 16:18:10 +0100] rev 15635
test-subrepo: test for Issue3153
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
Mads Kiilerich <mads@kiilerich.com> [Thu, 08 Dec 2011 16:39:00 +0100] rev 15622
sshrepo: don't quote obviously safe strings (
issue2983)
This restores compatibility with hg-over-ssh servers that don't parse
commandlines as sh does but works ok in the most common cases.
Kevin Bullock <kbullock@ringworld.org> [Wed, 16 Nov 2011 15:29:57 -0600] rev 15621
bookmarks: update and updatecurrentbookmark return status
This makes bookmarks.update() and bookmarks.updatecurrentbookmark() return
True or False to indicate whether the bookmark was updated or not. This allows
callers to e.g. abort if the update failed.
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:23:13 -0600] rev 15620
bookmarks: clarify help for use of merge and update
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:23:01 -0600] rev 15619
merge: make 'nothing to merge' aborts consistent
Makes the 'nothing to merge' abort messages in commands.py consistent with
those in merge.py. Also makes commands.merge() and merge.update() use hints.
The tests show the changes.
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Dec 2011 11:22:57 -0600] rev 15618
merge: remove excess creation of changectx