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.
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.
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2012 00:52:43 -0500] rev 17314
merge with i18n
Alexander Sauta <demosito@gmail.com> [Wed, 01 Aug 2012 18:56:39 +0400] rev 17313
i18n-ru: synchronized with 85188487b9b4
Nikolaj Sjujskij <sterkrig@myopera.com> [Fri, 20 Jul 2012 12:18:31 +0400] rev 17312
i18n-ru: add missing space in summary output template
Alexander Sauta <demosito@gmail.com> [Wed, 01 Aug 2012 18:10:07 +0400] rev 17311
i18n-ru: synchronized with b616e4aacf96
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 01 Aug 2012 05:58:00 +0900] rev 17310
i18n-ja: synchronized with 3339e3df159d
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 31 Jul 2012 14:12:14 -0300] rev 17309
i18n-pt_BR: synchronized with e66fa4d587dc
With review and suggestions by Sheila Genesine.
Patrick Mezard <patrick@mezard.eu> [Wed, 01 Aug 2012 15:49:00 +0200] rev 17308
log: make opts entries optional (issue2423)
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 Jul 2012 19:47:54 +0200] rev 17307
test-clone: fix for vfat
fixes http://hgbuildbot.kublai.com/builders/vfat%20hg%20tests%20%28stable%29/builds/65
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 31 Jul 2012 15:57:50 +0200] rev 17306
obsolete: fix typos in comments introduced by 6955d69a52a4
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 31 Jul 2012 15:50:44 +0200] rev 17305
pager: drop -S option for less in example for pager configuration
Using less -S will hide possibly important information when reviewing a
changeset, e.g. something wrong/dangerous after the 80th column, because
"less" will not give an indication that following characters are hidden.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 31 Jul 2012 15:32:08 +0200] rev 17304
obsolete: properly increment currentlen when building pushkey payload
In the old code, the current length was always 0 leading to markers
payload never being split.
wujek srujek <wujek.srujek@googlemail.com> [Tue, 31 Jul 2012 00:59:38 +0200] rev 17303
hgweb: fixes invalid parents / children in comparison
Previously, the parents / children were computed relative to the cset of the
currently shown file, which was wrong and inconsistent with diff and others.
With this patch, the listed csets are those that contain changes to the
currently compared file, which don't necessarily have to be the direct parents
and children of the changeset itself.
wujek srujek <wujek.srujek@googlemail.com> [Tue, 31 Jul 2012 14:14:15 +0200] rev 17302
hgweb: fixes traceback for invalid files by removing top-level template
The top-level 'comparison' template was not really needed, and it also caused a
traceback to be shown for inexistent files (as reported by Ross Lagerwall).
Getting rid of it makes the overall templating structure simpler and causes
invalid files to be handled nicely.
Matt Mackall <mpm@selenic.com> [Mon, 30 Jul 2012 22:33:45 -0500] rev 17301
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 30 Jul 2012 03:37:28 +0900] rev 17300
i18n-ja: synchronized with b087cfebc3ac
Mads Kiilerich <mads@kiilerich.com> [Tue, 31 Jul 2012 03:30:42 +0200] rev 17299
check-code: indent 4 spaces in py files
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 28 Jul 2012 13:33:06 +0200] rev 17298
pushkey: do not exchange obsole markers if feature is disabled
This apply to both push and pull both when client or server.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sat, 28 Jul 2012 13:05:25 +0200] rev 17297
obsolete: warns if markers exist in a repo where the feature is not enabled
We don't simply abort to allow the user to run other diagnostic commands.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sat, 28 Jul 2012 13:19:06 +0200] rev 17296
obsolete: introduce an `_enabled` switch to disable the feature by default
Obsolete markers wide-usage and propagation should be avoided by default until
the obsolete feature is more mature.
This changeset introduce the `_enable` variable and prevent the creation of
obsolete marker if the feature is set to `False` (the default).
More limitation comes in followup changesets.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 27 Jul 2012 18:32:56 +0200] rev 17295
pushkey: splits obsolete marker exchange into multiple keys
Obsolete markers are now exchanged in smaller pieces that fit in a http header.
This changes is done to avoid 400 bad request error when exchanging obsolete
puskey over http.
The last key pushed is always hold by the "dump0" key to ensure an easy place to
hook for people who need it.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 26 Jul 2012 16:41:42 +0200] rev 17294
obsolete: add debug output regarding obsolete marker exchange.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sat, 28 Jul 2012 12:28:35 +0200] rev 17293
pushkey: add more verbose debug output regarding pushkey
Very few data are displayed now, making it hard to debug phases and obsolete
related issues.
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Jul 2012 19:26:05 +0200] rev 17292
debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu> [Mon, 30 Jul 2012 15:48:04 +0200] rev 17291
revset: minor doc fixes on obsolete related revsets
Ross Lagerwall <rosslagerwall@gmail.com> [Mon, 30 Jul 2012 11:33:27 +0200] rev 17290
hgweb: make paper:error consistent with template
Tests fixed by Patrick Mézard <patrick@mezard.eu>
Ross Lagerwall <rosslagerwall@gmail.com> [Mon, 30 Jul 2012 11:02:10 +0200] rev 17289
hgweb: avoid traceback when file or node parameters are missing
Previously, browsing to http://serv/diff would generate an internal
server error due to the file and node parameters being missing.
The same error also occurred for filelog, comparison and annotate.
Ross Lagerwall <rosslagerwall@gmail.com> [Mon, 30 Jul 2012 08:18:25 +0200] rev 17288
hgweb: fix "branches" links in gitweb template
Tests fixed by Patrick Mézard <patrick@mezard.eu>
Ross Lagerwall <rosslagerwall@gmail.com> [Mon, 30 Jul 2012 08:11:22 +0200] rev 17287
hgweb: fix typo in monoblue template
Ross Lagerwall <rosslagerwall@gmail.com> [Mon, 30 Jul 2012 08:06:05 +0200] rev 17286
hgweb: fix capitalization in monoblue template
Make the capitalization consistent on all pages.
Mads Kiilerich <mads@kiilerich.com> [Mon, 30 Jul 2012 03:53:38 +0200] rev 17285
histedit: add trailing newline when editing commit messages
test-histedit-edit.t failed because Solaris sed strips lines not ending with
\n.
Mads Kiilerich <mads@kiilerich.com> [Mon, 30 Jul 2012 02:38:32 +0200] rev 17284
test-histedit-outgoing.t: remove unused section
Mads Kiilerich <mads@kiilerich.com> [Mon, 30 Jul 2012 02:38:29 +0200] rev 17283
test-hook.t: Solaris /usr/bin/egrep do not support {4}
Matt Mackall <mpm@selenic.com> [Sun, 29 Jul 2012 12:29:35 -0500] rev 17282
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Sat, 28 Jul 2012 22:58:18 +0200] rev 17281
i18n-sv: continue translating mq extension
Jens Bäckman <jens.backman@gmail.com> [Sat, 28 Jul 2012 14:59:09 +0200] rev 17280
i18n-sv: translated record extension
Jens Bäckman <jens.backman@gmail.com> [Sat, 28 Jul 2012 14:57:21 +0200] rev 17279
i18n-sv: synchronized with a09cc6aeed4a
Pascal Quantin <pascal.quantin@gmail.com> [Sun, 29 Jul 2012 17:04:51 +0200] rev 17278
win32: update Inno Setup installer extensions list
Matt Mackall <mpm@selenic.com> [Sun, 29 Jul 2012 11:08:45 -0500] rev 17277
hgweb: avoid traceback if raw is used as default style
Spotted by Angel Ezquerra.
Simon Heimberg <simohe@besonet.ch> [Sat, 28 Jul 2012 22:55:01 +0200] rev 17276
largefiles: use hg.peer instead of hg.remoteui
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 29 Jul 2012 16:19:32 +0900] rev 17275
histedit: remove updating statistics line from the examples describing rules
Before this patch, updating statistics line appears at the bottom of
the examples describing rules to edit history.
But such line never appear in the file describing rules while
histedit-ing, so this patch removes that line from the examples.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 29 Jul 2012 09:03:51 +0200] rev 17274
hgignore: ignore zip files
Simon Heimberg <simohe@besonet.ch> [Sat, 28 Jul 2012 22:36:22 +0200] rev 17273
peer: delete double definition of method peer
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 28 Jul 2012 23:51:57 +0900] rev 17272
revset: fix the definition of "unstable changesets" for "unstable" predicate
unstable-ness of changesets should be determined by obsolete-ness of
not descendants but ancestors.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 20 Jul 2012 19:08:26 -0400] rev 17271
largefiles: support revsets for outgoing --large
Previous to this, outgoing with a revset succeeded unless --large was also
specified.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 20 Jul 2012 23:50:52 -0400] rev 17270
largefiles: fix a traceback introduced with recent peer changes
Changeset 1ac628cd7113 broke 'outgoing --large'
...
File "hgext\largefiles\lfutil.py", line 56, in findoutgoing
remote.local(), force=force)
File "mercurial\discovery.py", line 31, in findcommonincoming
if not remote.capable('getbundle'):
AttributeError: 'lfilesrepo' object has no attribute 'capable'
This restores the previous functionality, though I'm not sure if there's a
better way to do this- that changeset introduces a hunk in debugdiscovery that
does this:
if not util.safehasattr(remote, 'branches'):
# enable in-client legacy support
remote = localrepo.locallegacypeer(remote.local())
Is there a legacy support issue here too?
Matt Harbison <matt_harbison@yahoo.com> [Fri, 20 Jul 2012 19:14:41 -0400] rev 17269
largefiles: support revsets for cat
Previous to this, cat only accepted revsets if the largefiles extension was
disabled.