Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 14:16:04 -0700] rev 5254
Turn capabilities into a mutable set, instead of a fixed tuple.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 13:38:34 -0700] rev 5253
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 13:38:16 -0700] rev 5252
convert: document filemap.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5251
Test svn repository conversion
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5250
hghave: detect subversion bindings availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5249
hghave: detect subversion client and admin tools availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5248
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5247
run-tests: append PYTHONPATH instead of overwriting it
Optional dependencies like svn bindings not necessarily live in site-packages.
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 11:56:53 -0700] rev 5246
convert: svn: check for branch movement in any log entry, not just the first.
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:55:33 -0300] rev 5245
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5244
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5243
Fix theoretical issue in filecommit.
If the file was copied, we don't want to reuse the original entry.
I think this is mostly a theoretical issue - when there are copies,
fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would
think the file was unmodified. In any case, if there was a copy,
we should forcefully create a new entry.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5242
Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 02:21:58 -0300] rev 5241
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5240
avoid double slash problem mentioned in issue695
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5239
clone: remove "file://" before making the path absolute
This avoids writing bogus paths to .hgrc. Fixes issue695.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5238
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5237
clone: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5236
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5235
pull -r: pass the revisions as the heads argument of findincoming
This can make a hg pull -r faster if the remote repo has many heads,
and fixes an "abort: received changelog group is empty".
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:13:24 +0200] rev 5234
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:05:19 +0200] rev 5233
convert: fix /dev/null redirections under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 16:49:26 +0200] rev 5232
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:07:13 +0200] rev 5231
Test git repository conversion
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:35:57 +0200] rev 5230
hghave: detect git availability
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 14:51:27 +0200] rev 5229
convert: fix issue702 about GIT_DIR= construct unsupported under Windows.
Brendan Cully <brendan@kublai.com> [Sun, 01 Jul 2007 21:09:08 -0700] rev 5228
convert: gitcmd wrapper for os.popen
Brendan Cully <brendan@kublai.com> [Sat, 25 Aug 2007 12:25:53 -0700] rev 5227
Improve extdiff configuration.
In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple
alias = command [opts]... form. For example:
[extdiff]
cdiff = colordiff -uprN
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 16:31:37 +0200] rev 5226
cgi: sys.path.insert should be before importing mercurial
thanks to R. Burke
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5225
merge with crew