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.
Mads Kiilerich <mads@kiilerich.com> [Wed, 01 Aug 2012 14:59:15 +0200] rev 17322
help: use the first topic name from helptable, not the longest alias
This makes the 'additional help topics' list consistent with the output from
keyword search (for instance subrepo/subrepos).
The sorting by longest name was introduced in 3f6a4f1de43f. There might have
been a good reason for it back then, but now it seems like a better idea to
place the preferred name first in the list in helptable.
Mads Kiilerich <mads@kiilerich.com> [Wed, 01 Aug 2012 00:18:23 +0200] rev 17321
help: fix helptable indentation
Patrick Mezard <patrick@mezard.eu> [Wed, 01 Aug 2012 14:08:19 +0200] rev 17320
transplant: fix emptied changeset message
- Append an EOL
- State the changeset is skipped
Patrick Mezard <patrick@mezard.eu> [Tue, 31 Jul 2012 17:39:32 +0200] rev 17319
transplant: handle non-empty patches doing nothing (issue2806)
If patch.patch() reports patched files when applying a changeset and the
following commit says nothing changed, transplant used to abort with a
RuntimeError, assuming something went wrong with patching.
The mismatch is patch.patch() reports patched files, not changed ones.
It could be modified to report changed files but it means duplicating
work from status, may be expensive in the case of binary files, and is
probably not that useful at API level. For instance, if two patches are
applied on the working directory, the outcome may be nothing changed
while each call would have returned modified files. The caller would
have to call status() itself again.
This patch fixes the issue by trusting patching code: if the patch
succeeded and commit reports nothing changed, then nothing changed,
patch() did not "dropped changes on the floor".
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 23:16:20 +0200] rev 17318
hgweb: fix graph view paging
- Fix off-by-one error on displayed entries count in normal mode
- Fix incorrect paging when the top revision was lower than revcount
- Fix revcount not overriding web.maxshortchanges everywhere
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 19:44:57 +0200] rev 17317
help/config.txt: document web.maxshortchanges
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Jul 2012 19:37:25 +0200] rev 17316
help/config.txt: reorder [web] options
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 30 Jul 2012 03:27:07 +0900] rev 17315
histedit: make comment part of the file describing rules as translatable
"i18n.gettext()" invocation for "editcomment" itself should have
little impact for whole initialization cost of histedit, because it is
already invoked for initialization of the command table entry.
'\n\n' has to be added to the text being edited separately from
"editcomment", because leading 'line feed' characters are not exported
to "hg.pot" file correctly.