Martin Geisler <mg@aragost.com> [Fri, 11 Mar 2011 12:35:41 +0100] rev 13577
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 16:49:37 +0100] rev 13576
ui: yield unchanged values in walkconfig
Ever since walkconfig was introduced back in 25e7ea0f2cff, the values
yielded has been mutated by replacing "\n" with "\\n". This makes
walkconfig less useful than it could and there is no other way to
iterate over all config sections.
The third-party reposettings extension used ui.walkconfig but did not
take the replacement into account -- this change will actually fix a
bug in the extension when a value contains a newline.
Matt Mackall <mpm@selenic.com> [Thu, 10 Mar 2011 11:30:38 -0600] rev 13575
Added signature for changeset aa1f3be38ab1
Matt Mackall <mpm@selenic.com> [Thu, 10 Mar 2011 11:30:34 -0600] rev 13574
Added tag 1.8.1 for changeset aa1f3be38ab1
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 09 Mar 2011 15:29:50 -0300] rev 13573
i18n-pt_BR: synchronized with 66d65bccbf06
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 13:43:47 +0100] rev 13572
tests: use $TESTTMP more and use (glob) less
This locks down the test output a little more.
Augie Fackler <durin42@gmail.com> [Fri, 07 Jan 2011 15:19:21 -0600] rev 13571
hgweb_mod: respond right away if the client specified 100-continue support
Clients that send 100-continue should make sure they really support
continue intelligently. In a later patch we'll introduce a capability so
new clients don't pay a performance penalty talking to old servers.
Augie Fackler <durin42@gmail.com> [Sat, 06 Feb 2010 04:27:28 -0600] rev 13570
hgweb: add support for 100-continue as recommended by PEP 333.
Eric Eisner <ede@mit.edu> [Tue, 08 Mar 2011 15:36:56 -0500] rev 13569
subrepo: show the source that git pulls
Mark Drago <markdrago@gmail.com> [Tue, 08 Mar 2011 08:41:39 -0500] rev 13568
commands.update() now works properly with a revision of 0
Without this change commands.update() treats an integer 0 as if no revision
was passed and updates to the branch head. This fix allows an integer 0 to
be detected as a revision number so the working directory is correctly
changed to revision 0 rather than the branch head.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 14:55:31 -0600] rev 13567
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:35:01 -0600] rev 13566
mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Not all applications needed the workarounds, so I did not add alternate keys for
every Windows merge application.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 13:05:18 -0600] rev 13565
filemerge: introduce a 'regkeyalt' merge tool variable
This allows us to provide alternate search keys for 64bit operating systems that
may have 32bit merge tools installed. Presumably it may find other uses.
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:25:18 -0600] rev 13564
merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Mar 2011 10:03:01 -0600] rev 13563
wix: drop bin/ folder from MSI installers (issue 2673)
Also fixes issue 2658.
Martin Geisler <mg@aragost.com> [Tue, 08 Mar 2011 11:01:01 +0100] rev 13562
zsh completion: remove computed default values from help texts
The default encoding and encoding mode are computed at runtime and can
vary from system to system. The two remaining default values in the
completion help texts (number of directories to strip on import and
default bundle name) are fixed in the source code.
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Mar 2011 01:21:50 +0100] rev 13561
merge: remove last traces of fastforward merging
bbc97d419b16 introduced fast-forward branch merging.
66ed92ed115a partly removed it again.
The fastforward variable would always be false if branchmerge was false, so the
fastforward variable makes no difference and we can remove it completely.
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:19:17 +0100] rev 13560
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Mar 2011 23:02:04 +0100] rev 13559
subrepo: backout 67fbe566eff1, --force requires svn >= 1.5
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:46 -0600] rev 13558
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:46:28 -0600] rev 13557
merge with i18n
David Soria Parra <dsp@php.net> [Sun, 06 Mar 2011 15:32:37 +0100] rev 13556
i18n-de: improve translation for "unmerged branches"
This translation issue was pointed out by Georg Brandl.
Steven Brown <StevenGBrown@gmail.com> [Mon, 07 Mar 2011 15:37:11 +0800] rev 13555
httprepo: order URL query string fields for readability
- cmd is always first, since the other fields are arguments to that command.
- The other fields are in alphabetical order, rather than random order.
example "hg serve" output
BEFORE
127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 -
AFTER
127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 -
127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:45:10 -0600] rev 13554
ancestor: improve description
Eric Eisner <ede@mit.edu> [Mon, 07 Mar 2011 12:03:54 -0500] rev 13553
subrepo: don't crash when git repo is missing
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:44:43 -0600] rev 13552
ancestor: rewrite to deal with crossed linkrevs (issue2682)
This version is about 10% slower, possibly because it visits some
revisions in a different topological order than what's in the revlog.
Georg Brandl <georg@python.org> [Sun, 06 Mar 2011 11:30:57 +0100] rev 13551
hgcia: accept "queued." xmlrpc return as success
Matt Mackall <mpm@selenic.com> [Mon, 07 Mar 2011 15:03:10 -0600] rev 13550
merge: back out single-parent fast-forward merge
This backs out
changeset: 13158:9e7e24052745
user: Mads Kiilerich <mads@kiilerich.com>
date: Tue Dec 07 03:29:21 2010 +0100
summary: merge: fast-forward merge with descendant
Before named branches, the invariants were:
a) "merges" always have two parents
b) p1 is not linearly related to p2
Adding named branches made (b) problematic, so the above patch was
introduced, which fixed (b) but broke (a).
After discussion, we decided that the invariants should be:
a) "merges" always have two parents
b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13549
merge: drop resolve state for mergers with identical contents (issue2680)
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:13:36 +0100] rev 13548
merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:30 +0100] rev 13547
hgweb: fix filelog rss links generation
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 22:03:18 +0100] rev 13546
hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)
Mads Kiilerich <mads@kiilerich.com> [Sun, 06 Mar 2011 19:38:00 +0100] rev 13545
merge with stable
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 10:27:07 -0600] rev 13544
cacert: improve error report when web.cacert file does not exist
timeless <timeless@gmail.com> [Sun, 06 Mar 2011 05:56:59 -0600] rev 13543
tests: improve hghave error reporting for missing Py OpenSSL
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:21:50 +0100] rev 13541
Improve unresolved merge conflicts warning (issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 13539
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:17:47 +0100] rev 13538
test-doctest: handle unix/windows path discrepancies
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 10:06:09 +0100] rev 13537
test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13536
merge: drop resolve state for mergers with identical contents (issue2680)
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:36 -0600] rev 13535
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:12 -0600] rev 13534
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/
Adrian Buehlmann <adrian@cadifra.com> [Fri, 18 Feb 2011 01:19:01 +0100] rev 13533
statichttprepo: abort if opener mode is 'r+' or 'rb+'
The old version of the check failed to catch
modifying modes 'r+' and 'rb+'.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:11:15 +0100] rev 13532
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 13531
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant but it is much simpler than rewriting our own
purge command for subversion.
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:41:38 +0100] rev 13530
convert/svn: stop using svn bindings when pushing to svn
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:19:28 +0100] rev 13529
convert/svn: read trunk name once, use None for default
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 21:42:15 +0100] rev 13528
mq: mention qfinish in qimport help
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 22:00:41 -0600] rev 13527
merge with stable
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 21:57:20 -0600] rev 13526
bookmark: fix invalidation of localrepo._bookmarkcurrent
Eric Eisner <ede@mit.edu> [Wed, 02 Mar 2011 12:19:18 -0500] rev 13525
subrepo: show the source that git clones
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:52:31 +0100] rev 13524
check-code: catch "echo > $HGRCPATH" too
Make error message consistent with the other error messages.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:23:22 +0100] rev 13523
merge with stable
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:22:50 +0100] rev 13522
check-code: better check for overwriting $HGRCPATH
Suggested by Mads Kiilerich on IRC.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:16:11 +0100] rev 13521
test-eol-*: remove unused config settings
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:09:06 +0100] rev 13520
mq: forbid commit of merge involving mq patches
Martin Geisler <mg@aragost.com> [Tue, 01 Mar 2011 17:01:17 +0100] rev 13519
tests: don't overwrite HGRCPATH
Overwriting instead of appending to the file removes the [defaults]
section put into the file by run-tests.py.
It also defeats the --inotify option to run-tests.py.
(Nothing was broken yet, but the lack of -d "0 0" cause changeset
hashes to change unexpectedly in a test case I was editing.)
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 13:24:48 +0100] rev 13518
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:38 -0600] rev 13517
Added signature for changeset 2616325766e3
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:32 -0600] rev 13516
Added tag 1.8 for changeset 2616325766e3
Gilles Moris <gilles.moris@free.fr> [Tue, 01 Mar 2011 07:28:20 +0100] rev 13515
contrib: update tcsh_completion for Mercurial 1.8
Added the following commands: bookmarks debugignore.
Fix the tcsh parse script for the current help text layout.
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 12:48:31 -0600] rev 13514
merge with i18n