Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:42:25 -0500] rev 5328
manifest: minor performance tweak
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:41:54 -0500] rev 5327
dirstate: speed up read and write
read:
- single call to len(st)
- fewer assignments for position tracking
- don't split apart tuple from unpack
- use a literal for the unpack spec
write:
- localize variables and functions
- avoid copied function call
- use % for string concatenation
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:36:38 -0500] rev 5326
dirstate: make dir collision logic faster
- shortcircuit decpath if we haven't built the _dirs map
- increment only for leafnodes of directory tree
(this should make construction more like O(nlog n) than O(n^2))
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:34:26 -0500] rev 5325
Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:25:25 -0500] rev 5324
convert-cvs: update test to pass on Linux
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:18:06 -0500] rev 5323
verify: report first bad changeset
- add linkrev and file arguments to err
- track lowest reported linkrev in err
- find linkrev in a couple cases
- sort linkrevs when reporting a bunch of errors against a file
- tidy up lots of messages
- make more robust against damaged indexes
- report first bad changeset if an error is encountered
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:14:39 -0500] rev 5322
revlog: more robust for damaged indexes
- fix flag reporting
- make broken length reporting smarter
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:13:38 -0500] rev 5321
debugindex: more robust for damaged indexes
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 18:24:19 +0200] rev 5320
revlog: fix inlined revision transaction extra data (issue 749)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 15:29:58 +0200] rev 5319
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 14:40:44 +0200] rev 5318
Test renaming files brought by merge second parent (issue 746)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 14:40:44 +0200] rev 5317
localrepo: fix undelete() on merge working directory (issue 746)
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 19:05:36 +0200] rev 5316
bisect: remove useless try/except
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:56:36 +0200] rev 5315
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:52:26 +0200] rev 5314
Test static-http calls on '/' URI (issue 747)
Paul Bx <pb@e-scribe.com> [Sat, 22 Sep 2007 18:37:35 +0200] rev 5313
statichttprepo: fix calls on '/' URI (issue 747)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:35:53 +0200] rev 5312
bisect: don't write data on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:23:56 +0200] rev 5311
bisect: do silent init if necessary
Patrick Mezard <pmezard@gmail.com> [Sat, 15 Sep 2007 16:07:05 +0200] rev 5310
debuginstall: stop looking for patch utility, just test it
Brendan Cully <brendan@kublai.com> [Fri, 14 Sep 2007 21:47:40 -0700] rev 5309
Updated zsh completion from issue722.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 23:10:41 +0200] rev 5308
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:47:15 +0200] rev 5307
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5306
convert: workaround for cvsps.cache under Windows
In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5305
convert: fix remote cvs file paths separator
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5304
convert: avoid interpreting Windows path as CVS connection strings.
CVS connection strings regexp detect colons to separate protocols from path and login. Unfortunately, Windows paths contains colons and were interpreted as rsh connection strings.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5303
convert: call popen2 in binary mode, with a command string.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5302
hghave: detect cvs and cvsps availability
"cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5301
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:38:29 +0200] rev 5300
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:05:30 +0200] rev 5299
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:04:42 +0200] rev 5298
parents: make it match the doc when called on a file
parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.
Brendan Cully <brendan@kublai.com> [Tue, 11 Sep 2007 13:24:52 -0700] rev 5297
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 11 Sep 2007 13:23:59 -0700] rev 5296
Document pseudo-tags "null" and ".".
Brendan Cully <brendan@kublai.com> [Mon, 10 Sep 2007 15:00:19 -0700] rev 5295
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 10 Sep 2007 15:00:05 -0700] rev 5294
mq: fix regression in 6fd953d5faea
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:53:23 +0200] rev 5293
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 10 Sep 2007 23:34:33 +0200] rev 5292
sshrepo: fix Windows command quoting
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:36:01 +0200] rev 5291
extdiff: avoid repr() doubling paths backslashes under Windows
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 17:54:38 +0200] rev 5290
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Sep 2007 17:38:52 +0200] rev 5289
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
Edward Lee <edward.lee@engineering.uiuc.edu> [Fri, 07 Sep 2007 16:35:43 +0200] rev 5288
interhg: allow more flexible pattern specification (fixes 2/3 of issue699)
- something else than "pat" followed by a number can be used as key
- something else than "/" can be used as delimiter
- "ilmsux" flags (e.g. "i" for case insensitive) can be used
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 16:14:51 +0200] rev 5287
Don't decode unicode strings.
This does not work with python2.3 and is probably not useful anyway with 2.4.
Brendan Cully <brendan@kublai.com> [Thu, 06 Sep 2007 18:12:36 -0700] rev 5286
Update test-record for 3ef190234b55
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Sep 2007 10:52:54 -0700] rev 5285
record: change wording of initial per-file prompt
Steve Borho <steve@borho.org> [Wed, 05 Sep 2007 21:53:59 +0200] rev 5284
hgk: add repo root to window title
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 04 Sep 2007 18:37:28 +0200] rev 5283
Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)
Patrick Mezard <pmezard@gmail.com> [Tue, 04 Sep 2007 13:56:15 +0200] rev 5282
test-convert-hg-source: enforce conversion order with --date
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5281
convert: rename a class and a function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5280
convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5279
convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5278
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 23:15:44 +0200] rev 5277
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:43 +0200] rev 5276
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:03 +0200] rev 5275
fix the dummy 00changelog.i not being copied on clone
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 13:14:03 +0200] rev 5274
convert/subversion: Use util.set() instead of set() for python2.3 compatibility
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:54:07 +0200] rev 5273
Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:40:23 +0200] rev 5272
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:32:18 +0200] rev 5271
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 11:18:29 +0200] rev 5270
hgweb: Show date of last change for each file in manifest
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 01:21:31 +0200] rev 5269
remove unneeded statement
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 30 Aug 2007 23:54:01 +0200] rev 5268
kill lonely docstring
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 18:55:56 +0200] rev 5267
Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 16:42:17 +0200] rev 5266
Added support for the Atom syndication format
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 17:01:10 -0700] rev 5265
Include . in PYTHONPATH (makes testing unbundled extensions easier)
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:50:21 -0700] rev 5264
Make run-tests.py work when invoked outside of tests.
This makes it usable for unbundled extensions.
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:19:27 -0700] rev 5263
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:15:23 -0700] rev 5262
When reverting a file which was renamed, also revert the old name
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Aug 2007 23:02:41 -0300] rev 5261
Avoid a working dir walk while trying to detect copies for diff --git
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Aug 2007 22:48:25 -0300] rev 5260
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 17:08:53 -0700] rev 5259
bundle: fix up lazy reads
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:48:21 -0700] rev 5258
Make bundlerepo lazier
This allows the localbranch extension to override sopener in time.
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:41:31 -0700] rev 5257
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:39:07 -0700] rev 5256
convert: new config variable hg.tagsbranch controls which branch tags are committed to
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 14:48:08 -0700] rev 5255
Push capability checking into protocol-level code.
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:11 +0200] rev 5224
improve error message for 'hg merge' when repo already at branchtip
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 22:45:41 -0700] rev 5223
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5222
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:51:59 -0700] rev 5221
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:56 +0200] rev 5220
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:08 +0200] rev 5219
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:53:16 +0200] rev 5218
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:52:28 +0200] rev 5217
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:59 +0200] rev 5216
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:16 +0200] rev 5215
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:38:08 +0200] rev 5214
check exec: return fallback in case of error during the check
If there is any error while checking if exec is supported,
we can return fallback.
fix issue705
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 13:59:52 -0700] rev 5213
mq: some improvements to header rewriting (closes #690)
Tested with qrefresh -m against the mm series.
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:24:54 -0700] rev 5212
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:23:07 -0700] rev 5211
Do not lose previous tags when adding a tag in raw mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 23 Aug 2007 01:48:29 -0300] rev 5210
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:10:45 -0500] rev 5209
gendoc: use demandimport
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:14:53 -0500] rev 5208
Merge with -crew
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:04:26 -0500] rev 5207
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:03:56 -0500] rev 5206
match: handle large regexes
Some Python versions don't handle large regexes, so when we hit an
overflow, split our regex in two.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:13:32 +0200] rev 5205
make hg add of a removed file unremove the file
if a file was removed, hg add shouldn't mark the file
as added, but as normal
see issue683
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:02:08 +0200] rev 5204
abort when adding a file in merged state
rupert.thurner@gmail.com [Mon, 20 Aug 2007 22:02:05 +0200] rev 5203
add import from url capability
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:40 +0200] rev 5202
convert: load parent commits on-demand
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:07 +0200] rev 5201
convert: wrap cached commits author remapping
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 21:36:10 -0300] rev 5200
path_auditor: cache names of audited directories
We use a separate cache to avoid problems with
audit = path_auditor(repo.root)
audit("subrepo")
audit("subrepo/file")
whitelisting "subrepo" (which is fine) and then using the same whitelist
with "subrepo/file" (which is not fine).
Since we create a separate path_auditor for every path on the command line,
a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit
the paths.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Aug 2007 20:21:14 +0200] rev 5199
Quote ^ and ~ chars in test-parentrevspec.
At least ^ causes problems on some sh implementations.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 14:25:55 -0300] rev 5198
Remove demandimport.enable from dispatch.py
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Aug 2007 11:37:08 +0200] rev 5197
Enable demandimport only in scripts, not in importable modules (issue605)
This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 23:20:13 -0300] rev 5196
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5195
Fix sshrepo.unbundle
We weren't reading all the data sent by the server. Depending on
the system, the remote hg (actually, the remote python) could send a
"close failed: [Errno 32] Broken pipe", making some tests fail.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5194
run-tests.py: pass --install-scripts to setup.py
This avoids possible problems when the user has a ~/.pydistutils.cfg.
Fixes issue638. Patch provided by Ralf Schmitt.
Peter Meerwald <pmeerw@pmeerw.net> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5193
recognize user:password in URLs that include port numbers.
when giving user/pwd in an URL, eg.
hg pull http://user:pwd@host.com:666/hg/something,
hg would still ask for user/pwd in interactive mode (or fail in
non-interactive)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 20:18:05 -0300] rev 5192
convert: fix mercurial_sink.putcommit
Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a
revision that touches no files, but this can break regular conversions
from some repositories:
- conceptually, since we're converting a repo, we should try to make
the new hg repo as similar as possible to the original repo - we
should create a new changeset, even if the original revision didn't
touch any files (maybe the commit message had some important bit);
- even if a "regular" revision that doesn't touch any file may seem
weird (and maybe even broken), it's completely legitimate for a merge
revision to not touch any file, and, if we just skip it, the
converted repo will end up with wrong history and possibly an extra
head.
As an example, say the crew and main hg repos are sync'ed. Somebody
sends an important patch to the mailing list. Matt quickly applies
and pushes it. But at the same time somebody also applies it to crew
and pushes it. Suppose the commit message ended up being a bit
different (say, there was a typo and somebody didn't fix it) or that
the date ended up being different (because of different patch-applying
scripts): the changeset hashes will be different, but the manifests
will be the same.
Since both changesets were pushed to public repos, it's hard to recall
them. If both are merged, the manifest from the resulting merge
revision will have the exact same contents as its parents - i.e. the
merge revision really doesn't touch any file at all.
To keep the file filtering stuff "working", the generic code was changed
to skip empty revisions if we're filtering the repo, fixing a bug in the
process (we want parents[0] instead of tip).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5191
Add parentrevspec extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5190
Move enabling of demandimport to dispatch.py
This avoids loading many modules before enabling demandimport.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5189
Move cmdtable and reposetup handling out of extensions.py
A new function (extensions.extensions) allows the code that is
interested in those attributes to handle them directly.
This allows some cleanups of extensions.py. Notably, we can
remove the extensions.commandtable hack.
It also makes it easier to add standard extension attributes,
like a "hgwebsetup" function or a "helptable" dict that augments
the data in help.py, etc.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 17 Aug 2007 19:11:16 +0200] rev 5188
Adjust contrib/hg-ssh for moved dispatch() function.
Matt Mackall <mpm@selenic.com> [Fri, 17 Aug 2007 00:35:16 -0500] rev 5187
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:55:15 -0500] rev 5186
verify: report expected linkrev
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:55:13 -0500] rev 5185
dispatch: move command dispatching into its own module
- move command dispatching functions from commands and cmdutil to dispatch
- change findcmd to take a table argument
- remove circular import of commands in cmdutil
- privatize helper functions in dispatch
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:10:36 -0500] rev 5184
move parseurl from cmdutil to hg
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:10:24 -0500] rev 5183
fix-up references to repo.RepoError
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:09:50 -0500] rev 5182
remove unneeded imports of mdiff
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:56:39 -0500] rev 5181
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 17 Aug 2007 00:43:49 +0200] rev 5180
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 17 Aug 2007 00:42:22 +0200] rev 5179
clone: do not delete the target if only the update fails
Patrick Mezard <pmezard@gmail.com> [Thu, 16 Aug 2007 08:23:14 +0200] rev 5178
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 16 Aug 2007 08:19:15 +0200] rev 5177
Merge with hg-stable
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:30:33 -0500] rev 5176
test-grep: use lowercase hg command
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 16:22:12 -0700] rev 5175
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 16:20:10 -0700] rev 5174
mq: truncate patch just before rewriting header
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 14:38:18 -0700] rev 5173
convert: raise Abort instead of NoRepo when CVS pserver auth fails.
At this point we know the source is CVS, so we should not go through
the rest of the converters.
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 13:21:23 -0700] rev 5172
convert: hg: optionally create branches as clones
If convert.hg.clonebranches is set, branches will be created as clones of
their parent revisions. All clones will be subdirectories of the
destination path.
Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5171
Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:43:40 +0200] rev 5170
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:18:40 +0200] rev 5169
test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:09:04 +0200] rev 5168
Fix issue 685: trackback in grep -r after rename
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Aug 2007 21:36:08 +0200] rev 5167
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:51:49 +0200] rev 5166
The >| redirection does not exist in plain sh.
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:30:14 +0200] rev 5165
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:25:49 +0200] rev 5164
hghave: test hotshot dependencies (debian does not provide profile)
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:06:10 +0200] rev 5163
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 18:53:45 +0200] rev 5162
test-profile: fix grep, check hotshot availability
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 17:20:51 +0200] rev 5161
merge with -stable
Guillaume Chazarain <guichaz@yahoo.fr> [Tue, 14 Aug 2007 14:29:36 +0200] rev 5160
Return 0 as 'hg bisect reset' is successful
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 18:25:27 +0200] rev 5159
fix bundlerepo broken by 4205f626dc05
since we now use struct in case of lazy parser, this have to be an integer
instead of None
see issue681
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5158
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:27:35 +0200] rev 5157
Test --time, --profile and --lsprof
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:03:15 +0200] rev 5156
demandimport: ignore resource module, not available under Windows.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5155
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Brendan Cully <brendan@kublai.com> [Mon, 13 Aug 2007 11:58:47 -0700] rev 5154
imerge: simplify 1d5ebb0d366f
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5153
imerge: fix status file lookups
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5152
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:50 +0200] rev 5151
util: ignore invalid path errors in path_auditor.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:43:52 -0300] rev 5150
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:15:10 -0300] rev 5149
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:35:25 +0200] rev 5148
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:34:19 +0200] rev 5147
Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:17:24 +0200] rev 5146
test-context.py: Don't create second repo instance (fixed since 7b5723c95a82)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:07:47 +0200] rev 5145
fancyopts: Copy list arguments in command table before modifying.
Before this, executing
commands.dispatch(['log', '-r', '0'])
commands.dispatch(['log', '-r', 'tip'])
would look like:
hg log -r 0
hg log -r 0 -r tip
Reported by TK Soh, patch by Alexis S. L. Carvalho
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 12:47:58 +0200] rev 5144
Print less scary message if the system supports symlinks:
"Skipping test-no-symlinks: system supports symbolic links"
instead of
"Skipping test-no-symlinks: unexpected feature: symbolic links"
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 12:36:04 +0200] rev 5143
Hide absolute path from test-no-symlinks output.
And add missing eol and remove trailing space which where introduced by the
patches adding this test.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:51:47 -0700] rev 5142
Make a few portability improvements to path auditing code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:46:03 -0700] rev 5141
Make audit_path more stringent.
The following properties of a path are now checked for:
- under top-level .hg
- starts at the root of a windows drive
- contains ".."
- traverses a symlink (e.g. a/symlink_here/b)
- inside a nested repository
If any of these is true, the path is rejected.
The check for traversing a symlink is arguably stricter than necessary;
perhaps we should be checking for symlinks that point outside the
repository.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:16:00 -0700] rev 5140
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:03:34 -0700] rev 5139
debugstate: print symlinks as 'lnk', not '777'
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 19:42:33 -0700] rev 5138
manifest: accept -r for rev specification
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 17:29:16 -0700] rev 5137
record: improve docs, improve prompts
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:29:29 +0200] rev 5136
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:52 +0200] rev 5135
hghave: prefix temporary files with "hg-hghave-"
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:50 +0200] rev 5134
test-no-symlinks: rename .bundle into .hg for consistency.
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:35:10 -0700] rev 5133
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:34:25 -0700] rev 5132
fix up previous commit for stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 11:37:47 -0700] rev 5131
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Wed, 08 Aug 2007 18:04:06 -0700] rev 5130
Cache extension load failures.
hg commands call extensions.loadall twice, once during dispatch and
once when the repository is instantiated. Without this change, load
caches successful loads, but not unsuccessful, causing errors to be
displayed twice.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:07:11 +0200] rev 5129
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:04:27 +0200] rev 5128
unobfuscate part of f94dbc6c7eaf
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:11:12 +0200] rev 5127
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 22:47:18 +0200] rev 5126
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:07:39 +0200] rev 5125
hghave: feature absence can be checked by prefixing with 'no-'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 23:00:01 +0200] rev 5124
merge with -stable
Eric Hopper <hopper@omnifarious.org> [Wed, 08 Aug 2007 22:47:30 +0200] rev 5123
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 12:27:20 +0200] rev 5122
refactor options from cmdtable
- add extracommitopts for user and date
- factor stuff
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:57:23 +0200] rev 5121
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:56:26 +0200] rev 5120
CVS import: Support new-style .cvspass-file format.
Based on an email from Ralf.Leibold at nuance dot com
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 12:24:25 +0200] rev 5119
raise util.Abort again if specified revision is not an integer.
This was changed to NoRepo in 462cc56d898f, because specifying non-integer
revisions for e.g. the Mercurial backend caused Abort to be raised in the
subversion importer.
Now util.Abort is raised again, but the check is done after verifying if it
really is a subversion repository.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 12:10:56 +0200] rev 5118
debugsvnlog call had too many quotes (found by Edouard Gomez)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:43 +0200] rev 5117
Remove trailing spaces, fix indentation
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:14 +0200] rev 5116
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:24:33 +0200] rev 5115
Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:01:20 +0200] rev 5114
Removed debug print from convert/subversion.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:56:21 +0200] rev 5113
Replace _ with inst for catching exceptions to not shadow gettext.
And removed one _(...) because mercurial.i18n is not yet imported
in convert/subversion.py.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:49:07 +0200] rev 5112
Move debugsvnlog to subversion module.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:42:32 +0200] rev 5111
convert: Use debugsvnlog instead of git-like debug-svn-log.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:50:57 -0700] rev 5110
extdiff: do single file diffs from the wc with no copy
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:42:11 -0700] rev 5109
extdiff: made it less chatty in non-verbose mode
Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:32:23 -0700] rev 5108
extdiff: un-nested two functions
The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 15:37:14 -0700] rev 5107
convert: remove accidental debug print
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:59:00 -0700] rev 5106
convert: use '.' as destination name if renaming subdir into root
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:17:05 -0700] rev 5105
Automated merge with http://hg.intevation.org/mercurial/crew