Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:50:42 -0700] rev 17443
Merge with crew-stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:50:15 -0700] rev 17442
Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 15:46:04 -0700] rev 17441
subrepo: encode unicode path names (issue3610)
Subversion 1.7 changes its XML output to include an explicit encoding tag:
<?xml version="1.0" encoding="UTF-8"?>
This triggers xml.dom.minidom to always return unicode strings, causing
other parts of the code to explode.
We unconditionally encode path names before handing them back, which
works with both str (actually a no-op) and unicode values.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 31 Aug 2012 13:08:11 +0200] rev 17440
test-hybridencode: add more testcases for hashed paths
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:50:50 -0700] rev 17439
Merge with crew-stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:50:22 -0700] rev 17438
Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:49:39 -0700] rev 17437
Merge with stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 04 Sep 2012 13:49:10 -0700] rev 17436
Merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2012 23:42:02 +0200] rev 17435
merge with crew-stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 30 Aug 2012 22:13:24 +0200] rev 17434
test: remove invalid hidden rev in graphlog test
The hidden set of revision can not have descendant outside this set.
The extension is patched to raise and exception when this happen.
Patrick Mezard <patrick@mezard.eu> [Wed, 29 Aug 2012 21:26:39 +0200] rev 17433
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 29 Aug 2012 11:48:36 +0200] rev 17432
test-hybridencode: more testcases
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Aug 2012 01:24:57 +0200] rev 17431
remove template-vars.txt - it is outdated and neither usable nor necessary
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:17:21 +0200] rev 17430
largefiles: minor code cleanup
Fix:
* unnecessary use of map and lambda
* comment instead of readable code
* comparing None with 0
* and...or anti-pattern for 'ternary if' with very clever handling of i=None
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:16:22 +0200] rev 17429
declare local constants instead of using magic values and comments
Mads Kiilerich <mads@kiilerich.com> [Mon, 27 Aug 2012 23:14:27 +0200] rev 17428
avoid using abbreviations that look like spelling errors
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Aug 2012 02:41:20 +0200] rev 17427
improve some comments and docstrings, fixing issues found when spell checking
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Aug 2012 02:41:20 +0200] rev 17426
delete some dead comments and docstrings
Mads Kiilerich <mads@kiilerich.com> [Wed, 15 Aug 2012 22:39:18 +0200] rev 17425
fix wording and not-completely-trivial spelling errors and bad docstrings
Mads Kiilerich <mads@kiilerich.com> [Wed, 15 Aug 2012 22:38:42 +0200] rev 17424
fix trivial spelling errors
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 31 Aug 2012 23:27:26 +0200] rev 17423
strip: fix revset usage (issue3604)
The `repair` code builds a giant revset query instead of using the "%lr" idiom.
It is inefficient and crash when the number of stripped changeset is too big.
This changeset replaces the bad code by a better revset usage.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 02 Aug 2012 13:51:49 +0200] rev 17422
mergetools.hgrc: set vimdiff to check=changed
The standard reaction in from of unexpected vimdiff is to ":quit". This will
make vimdiff return a 0 status even if no merge were done at all.
This change detect that nothing have been changed in vimdiff as a potential
unresolved conflict.
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Aug 2012 02:09:43 +0200] rev 17421
hgweb: avoid bad $$ processing in graph (issue3601)
JavaScript .replace always magically processed $$ $& $' $` in replacement
strings and thus displayed subject lines incorrectly in the graph view.
Instead of regexps and .replace we now just create the strings the right way in
the first place.
Steve Borho <steve@borho.org> [Wed, 29 Aug 2012 13:16:56 -0500] rev 17420
wix: pick up new template files
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:43 -0500] rev 17419
Added signature for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:49:39 -0500] rev 17418
Added tag 2.3.1 for changeset 072209ae4ddb
Matt Mackall <mpm@selenic.com> [Sat, 01 Sep 2012 12:48:08 -0500] rev 17417
merge with crew
Martin Schröder <martin.schroeder@nerdluecht.de> [Sat, 01 Sep 2012 14:31:31 +0200] rev 17416
i18n-de: synchronized with 20665910d9d9; fix Bug 3082
Wagner Bruna <wbruna@yahoo.com> [Fri, 31 Aug 2012 21:49:52 -0300] rev 17415
i18n-pt_BR: synchronized with bdd248666dbc
Wagner Bruna <wbruna@yahoo.com> [Fri, 31 Aug 2012 21:44:58 -0300] rev 17414
merge with i18n