Matt Mackall <mpm@selenic.com> [Sat, 11 Aug 2012 12:45:53 -0500] rev 17352
merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 11 Aug 2012 12:45:37 -0500] rev 17351
merge with i18n
Nikolaj Sjujskij <sterkrig@myopera.com> [Fri, 10 Aug 2012 15:42:15 +0400] rev 17350
i18n-ru: fix spelling of "missing" equivalent
Alexander Sauta <demosito@gmail.com> [Thu, 09 Aug 2012 13:31:08 +0400] rev 17349
i18n-ru: synchronized with b131e24e2984
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 07 Aug 2012 11:18:45 -0300] rev 17348
i18n-pt_BR: synchronized with b5c560787a4e
Mads Kiilerich <mads@kiilerich.com> [Wed, 08 Aug 2012 18:10:37 +0200] rev 17347
check-code: fix check for trailing whitespace on continued lines too
The tests in test-annotate.t and test-import-git.t that relied on trailing
space in a file created by a here string is now masked by a literal 'EOL'
string that is removed.
Mads Kiilerich <mads@kiilerich.com> [Wed, 08 Aug 2012 18:10:30 +0200] rev 17346
check-code: fix check for trailing whitespace on empty lines
It seems like the intention with c7d23b4ca4ba was to catch lines with only
one whitespace too.
Mads Kiilerich <mads@kiilerich.com> [Wed, 08 Aug 2012 18:10:16 +0200] rev 17345
check-code: fix check for trailing whitespace on sh command lines
The $ has been without necessary escaping since introduced in c7d23b4ca4ba.
Patrick Mezard <patrick@mezard.eu> [Wed, 08 Aug 2012 21:38:53 +0200] rev 17344
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Mon, 06 Aug 2012 10:45:11 +0200] rev 17343
update: fix typo in help text
Spotted by Kevin Chase <kevincha99@hotmail.com>
Augie Fackler <raf@durin42.com> [Wed, 08 Aug 2012 10:04:02 -0500] rev 17342
clone: don't fail with --update for non-local clones (issue3578)
This was broken by 5884812686f7 due to lack of test coverage. This
adds a test and fixes the defect.
Matt Mackall <mpm@selenic.com> [Mon, 06 Aug 2012 12:07:21 -0500] rev 17341
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 06 Aug 2012 12:03:07 -0500] rev 17340
merge with i18n
Alexander Sauta <demosito@gmail.com> [Mon, 06 Aug 2012 18:15:16 +0400] rev 17339
i18n-ru: synchronized with 474ae9720aa5
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 02 Aug 2012 11:46:30 -0300] rev 17338
i18n-pt_BR: synchronized with e4db509c08ec
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 02 Aug 2012 11:45:16 -0300] rev 17337
histedit, i18n: warn translators about edit command names
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 15:58:23 +0200] rev 17336
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 02 Aug 2012 11:28:21 -0300] rev 17335
histedit: sync docstring with edit comment
The docstring should probably reuse the edit comment string instead.
Ross Lagerwall <rosslagerwall@gmail.com> [Sat, 04 Aug 2012 14:37:17 +0200] rev 17334
templater: handle a missing value correctly
Before, using a broken style such as:
changeset =
would result in a traceback.
This fixes a regression introduced in 63c47e4ac617.
Javi Merino <cibervicho@gmail.com> [Sat, 04 Aug 2012 12:29:53 +0200] rev 17333
help/hgweb: fix spelling error
Patrick Mezard <patrick@mezard.eu> [Fri, 03 Aug 2012 17:33:44 +0200] rev 17332
tests: remove stray test-convert-mtn-rename-directory.out
Patrick Mezard <patrick@mezard.eu> [Thu, 02 Aug 2012 18:33:40 +0200] rev 17331
Merge with stable
Patrick Mezard <patrick@mezard.eu> [Thu, 02 Aug 2012 17:48:58 +0200] rev 17330
context: simplify workingctx._parents
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2012 01:49:36 -0500] rev 17329
Added signature for changeset 7f5094bb3f42
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2012 01:49:32 -0500] rev 17328
Added tag 2.3 for changeset 7f5094bb3f42
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 01 Aug 2012 15:12:22 +0200] rev 17327
test: fix typo in test comment
Augie Fackler <raf@durin42.com> [Wed, 01 Aug 2012 09:41:57 -0500] rev 17326
histedit: add proper locking around repair.strip() calls
Patrick Mezard <patrick@mezard.eu> [Tue, 31 Jul 2012 18:18:26 +0200] rev 17325
rebase: remove second broken synopsis line (issue3172)
Displaying multiple synopsis in online help has been broken since Matt
RST refactoring, around ff26712a0c50. Rebase help is apparently the only
one using this trick, just drop the second synopsis and assume people
will understand as with graft help.
Idan Kamara <idankk86@gmail.com> [Sat, 28 Jul 2012 22:40:30 +0300] rev 17324
localrepo: clear the filecache on _rollback() and destroyed()
This restores the old behaviour of clearing the filecache when the repo is
destroyed but combines it with also clearing it on _rollback. Before, we tried
to only call it through _rollback but that ruined callers of destroyed.
Doing it on both code paths covers destroyed being called from somewhere
else, e.g. strip.
Mads Kiilerich <mads@kiilerich.com> [Wed, 01 Aug 2012 00:20:10 +0200] rev 17323
help: add 'mergetools' alias for the 'merge-tools' help topic
The '-' in 'merge-tools' is surprising but necessary in the configuration.
Let's help those who forget that and are looking for help.