Matt Mackall <mpm@selenic.com> [Thu, 27 Sep 2007 23:59:18 -0500] rev 5366
bdiff: switch to lyhash
lyhash is a very simple and fast hash function that had the fewest
hash collisions on a 3.9M line text corpus and 190k line binary corpus
and should have significantly fewer collisions than the current hash
function.
Matt Mackall <mpm@selenic.com> [Thu, 27 Sep 2007 23:59:02 -0500] rev 5365
bdiff: use INT_MAX to avoid some inner loop comparisons
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:58:54 -0500] rev 5364
bdiff: simple splitlines optimization
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:57:57 -0500] rev 5363
I have spotted the biggest bottleneck in "bdiff.c". Actually it was
pretty easy to find after I recompiled the python interpreter and
mercurial for profiling.
In "bdiff.c" function "equatelines" allocates the minimum hash table
size, which can lead to tons of collisions. I introduced an
"overcommit" factor of 16, this is, I allocate 16 times more memory
than the minimum value. Overcommiting 128 times does not improve the
performance over the 16-times case.
Patrick Mezard <pmezard@gmail.com> [Thu, 04 Oct 2007 14:26:34 +0200] rev 5362
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Oct 2007 14:23:28 +0200] rev 5361
test-convert-git: support older git client (1.4.4.4)
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Oct 2007 21:08:37 +0200] rev 5360
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Oct 2007 21:01:47 +0200] rev 5359
test-convert-cvs: handle older cvs client
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:01:00 -0700] rev 5358
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:00:38 -0700] rev 5357
convert: fix a few residual bugs in darcs importer
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:36 -0700] rev 5356
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:11 -0700] rev 5355
convert: support darcs as a source repo
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:48:52 -0700] rev 5354
convert: fail properly if we can't read a source hg repository
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:46:59 -0700] rev 5353
util: add default argument to strdate
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:46:17 -0700] rev 5352
convert: add before/after hooks for converter sources
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Oct 2007 20:25:35 +0200] rev 5351
merge with -stable
Steve Borho <steve@ageia.com> [Tue, 02 Oct 2007 20:22:33 +0200] rev 5350
set_exec: do not chmod a symlink
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:38:42 +0200] rev 5349
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:36:22 +0200] rev 5348
Test debugindexdot
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:36:11 +0200] rev 5347
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5346
Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5345
convert: fix missing import
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 21:10:54 -0700] rev 5344
Merge with crew-stable.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 21:08:14 -0700] rev 5343
convert: delete empty directories if deleting a file (bug 754)
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 20:55:36 -0700] rev 5342
Merge with crew.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:30:37 -0400] rev 5341
darcs2hg: Added support for darcs tags.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:13:54 -0400] rev 5340
darcs2hg: Now detects and recovers from simple darcs conflicts.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 12:42:52 -0400] rev 5339
darcs2hg: Now understands files that were explicitly renamed in darcs.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 26 Sep 2007 01:58:45 -0300] rev 5338
revlog: fix revlogio.packentry corner case
We want to store version information about the revlog in the first
entry of its index. The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).
We now give the revision number to packentry to avoid heuristics.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Sep 2007 19:05:34 +0200] rev 5337
Don't try to determine interactivity if ui() called with interactive=False.
WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a,
hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but
sys.stdin.isatty() was still called by the ui objects. This change makes sure
only the ui.fixconfig() method will call ui.isatty() (by making the
ui._readline() method, which is currently only called from ui.prompt(),
private). ui.fixconfig() is changed to let config files override the initial
interactivity setting, but not check isatty() if interactive=False was
specified in the creation of the ui.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:14:18 -0300] rev 5336
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5335
convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5334
mq: fix qrefresh -e with no patches applied
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5333
Push over HTTP: really tell the user the size of the bundle
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5332
hgwebdir: ignore hgrc parse errors while building the index page
An error in the .hg/hgrc file from a repository would prevent the
following repos from being shown in the index page.
The IOError handling was unnecessary - it's already handled in
readconfig.
This should fix issue731.
The error in the .hg/hgrc file will still prevent the repo from
being exported with hgweb.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5331
hgweb: don't raise an exception when displying empty repos
The nullid node claims it's in the default branch, but the branch dict
is empty. This fixes the main symptom from issue696, but we may want
to set branchtags()['default'] = nullid somewhere for empty repos.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5330
make identify an optionalrepo command
Fixes issue726.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5329
copy: if destination ends with "/", make sure it's a directory
Fixes issue724.
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.