Mon, 18 Oct 2010 23:20:14 -0500 merge: when --tool is specified, disable HGMERGE by setting to empty string
Steve Borho <steve@borho.org> [Mon, 18 Oct 2010 23:20:14 -0500] rev 12765
merge: when --tool is specified, disable HGMERGE by setting to empty string HGMERGE has different semantics than ui.merge. HGMERGE should hold the name on an executable in your path, or an absolute tool path. As such, it's not safe to simply copy the user's specified --tool value into HGMERGE. Instead, we disable HGMERGE by setting it to an empty string.
Mon, 18 Oct 2010 14:10:36 +0900 ui: only fix config if the relevant section has changed
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 18 Oct 2010 14:10:36 +0900] rev 12764
ui: only fix config if the relevant section has changed In particular, when extensions add hooks, or add non-ui and non-paths configuration items during their setups, we really have no reason to re-"fix" the config dictionaries.
Tue, 19 Oct 2010 23:15:31 +0900 test-tags: use printf instead of echo '...\n'
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 19 Oct 2010 23:15:31 +0900] rev 12763
test-tags: use printf instead of echo '...\n'
Sun, 17 Oct 2010 22:24:26 +0200 discovery: findincoming() is no longer used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 22:24:26 +0200] rev 12762
discovery: findincoming() is no longer used
Sun, 17 Oct 2010 19:25:35 +0200 discovery: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 19:25:35 +0200] rev 12761
discovery: use set instead of dict
Sun, 17 Oct 2010 16:16:12 +0200 discovery: remove unused "base" argument from find.*incoming()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 16:16:12 +0200] rev 12760
discovery: remove unused "base" argument from find.*incoming()
Sat, 09 Oct 2010 17:16:39 -0500 discovery: do not use the implicit updating of the "base" arg
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 17:16:39 -0500] rev 12759
discovery: do not use the implicit updating of the "base" arg
Tue, 19 Oct 2010 20:20:10 +0900 tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 19 Oct 2010 20:20:10 +0900] rev 12758
tags: do not fail if tags.cache is corrupted (issue2444) This file is not critical for hg, so we can safely swallow the ValueError
Sun, 10 Oct 2010 09:50:25 -0500 merge: make 'diverging renames' diagnostic a more helpful note.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:50:25 -0500] rev 12757
merge: make 'diverging renames' diagnostic a more helpful note. See the Hg Book on why we actually want to detect this case: http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290 Before: $ hg up deadbeef warning: detected divergent renames of X to: ... After: $ hg up deadbeef note: possible conflict - X was renamed multiple times to: ... No functionality change.
Mon, 18 Oct 2010 14:37:52 +0200 gendoc: refactor get_cmd
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:52 +0200] rev 12756
gendoc: refactor get_cmd Refactors the get_cmd to take the table as argument, instad of just referencing the global table, thereby enabling reuse for extension command tables.
Mon, 18 Oct 2010 14:37:50 +0200 mq: switched to `` around * * *
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:50 +0200] rev 12755
mq: switched to `` around * * * So it can be parsed by rst.
Sun, 17 Oct 2010 00:45:34 +0200 Revert: capitalization doc fix
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Oct 2010 00:45:34 +0200] rev 12754
Revert: capitalization doc fix
Tue, 19 Oct 2010 03:56:20 +0200 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:56:20 +0200] rev 12753
subrepo: abort instead of pushing/pulling to the repo itself _abssource will now abort (or return None) in the rare cases where no push/pull path can be found.
Tue, 19 Oct 2010 03:55:28 +0200 subrepo: rename relpath to subrelpath and introduce reporelpath
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:28 +0200] rev 12752
subrepo: rename relpath to subrelpath and introduce reporelpath
Tue, 19 Oct 2010 03:55:06 +0200 mdiff: carriage return (\r) is also ignorable whitespace
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:06 +0200] rev 12751
mdiff: carriage return (\r) is also ignorable whitespace
Fri, 15 Oct 2010 23:00:45 -0500 merge: add --tool argument to merge and resolve
Steve Borho <steve@borho.org> [Fri, 15 Oct 2010 23:00:45 -0500] rev 12750
merge: add --tool argument to merge and resolve These arguments are shorthand for --config ui.merge, but they also override HGMERGE if it is found in the user's environment.
Sun, 17 Oct 2010 14:00:01 +0300 patchbomb: move command option help from the extension (patchbomb) to the command (email)
timeless <timeless@gmail.com> [Sun, 17 Oct 2010 14:00:01 +0300] rev 12749
patchbomb: move command option help from the extension (patchbomb) to the command (email)
Sun, 17 Oct 2010 13:24:37 -0400 alias: fail gracefully when invalid global options are given (issue2442)
Steve Losh <steve@stevelosh.com> [Sun, 17 Oct 2010 13:24:37 -0400] rev 12748
alias: fail gracefully when invalid global options are given (issue2442) This patch modifies the check for shell aliases to prevent crashing when an invalid global option is given. When an invalid global option is given the check will simply return and let the normal error handling for this case happen.
Thu, 07 Oct 2010 13:44:17 -0700 bookmarks: better fix for issue2016 (lookup infinite recursion)
Paul Molodowitch <pm@stanfordalumni.org> [Thu, 07 Oct 2010 13:44:17 -0700] rev 12747
bookmarks: better fix for issue2016 (lookup infinite recursion) 741290486877 partially reverted by Patrick Mézard <pmezard@gmail.com>
Mon, 02 Aug 2010 07:15:47 +0300 merge/progress: marking strings for localization
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12746
merge/progress: marking strings for localization
Mon, 02 Aug 2010 07:15:47 +0300 verify/progress: using gerund to indicate action and adding units
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12745
verify/progress: using gerund to indicate action and adding units
Tue, 20 Jul 2010 20:53:48 +0200 progress: dropping superfluous space from units
timeless <timeless@gmail.com> [Tue, 20 Jul 2010 20:53:48 +0200] rev 12744
progress: dropping superfluous space from units
Sat, 16 Oct 2010 18:09:01 +0200 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com> [Sat, 16 Oct 2010 18:09:01 +0200] rev 12743
check-code: add 'no tab indent' check for unified tests and fix the offending tests accordingly
Sun, 17 Oct 2010 04:14:06 +0200 url: validity (notBefore/notAfter) is checked by OpenSSL (issue2407)
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Oct 2010 04:14:06 +0200] rev 12742
url: validity (notBefore/notAfter) is checked by OpenSSL (issue2407) Removing the check from our code makes https with cacerts check work with Python < 2.6.
(0) -10000 -3000 -1000 -300 -100 -50 -24 +24 +50 +100 +300 +1000 +3000 +10000 +30000 tip