Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 11:05:39 -0700] rev 4372
localrepository.status: only acquire wlock if actually needed.
This speeds up the common case of not needing to update the dirstate,
and avoids the need to reload and parse the dirstate "just in case".
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 10:53:25 -0700] rev 4371
util._matcher: speed up regexp matching.
In
4babaa52badf, Benoit made a change that substantially slows matching
when a big .hgignore file is in play, because it calls into the regexp
matching engine potentially hundreds of times per file to be matched.
I've partly rolled back his change, so that we only call into the matcher
once per file, but preserved the ability to report a meaningful error
message if there's a syntax error in the regexp.
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 10:47:41 -0700] rev 4370
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 17:54:43 +0200] rev 4369
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 13:04:26 +0200] rev 4368
Work around problem where 'del os.environ["FOO"]' doesn't update environment.
test-hook failed since changeset
949516072388 because of this on Solaris 8.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 12:47:55 +0200] rev 4367
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:23:45 -0300] rev 4366
Merge with crew.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4365
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4364
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4363
actually port simplemerge to hg
- use bdiff instead of patiencediff; this is a larger change, since
bdiff works on 2 multi-line strings, while patiencediff works on 2
lists;
- rename the main class from Merge3 to Merge3Text and add a Merge3
class that derives from Merge3Text. This new Merge3 class has
the same interface from the original class, so that the tests
still work;
- Merge3 uses util.binary to detect binary data and raises
util.Abort instead of a specific exception;
- don't use the @decorator syntax, to keep python2.3 compatibility;
- the test uses unittest, which likes to print how long it took to
run. This obviously doesn't play too well with hg's test suite,
so we override time.time to fool unittest;
- one test has a different (but still valid) output because of the
different diff algorithm used;
- the TestCase class used by bzr has some extras to help debugging.
test-merge3.py used 2 of them:
- log method to log some data
- assertEqualDiff method to ease viewing diffs of diffs
We add a dummy log method and use regular assertEquals instead of
assertEqualDiff.
- make simplemerge executable and add "#!/usr/bin/env python" header
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4362
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4361
add mdiff.get_matching_blocks
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:31:15 -0300] rev 4360
Merge with crew-stable.
Matt Mackall <mpm@selenic.com> [Wed, 25 Apr 2007 13:35:18 -0500] rev 4359
hg serve: don't do DNS lookups
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Jan 2007 23:07:06 +0100] rev 4358
Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
- fix off by 11 when checking if there are more hunks (found by Maris Fogels)
- bail out if start is greater than end
- check if new hunk starts after start/end/len block of current hunk as
the pointer can wrap around on very large values, reproducible with
import mpatch; mpatch.patchedsize(12, 'x'*12)
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 10:44:13 -0700] rev 4357
Work around python 2.5.1 tarfile regression
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 17:52:42 +0200] rev 4356
Avoid float rounding errors when checking http protocol version.
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:37:30 -0500] rev 4355
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:27:49 -0500] rev 4354
Merge with crew
TK Soh <teekaysoh@yahoo.com> [Tue, 10 Apr 2007 16:25:21 -0500] rev 4353
test-command-template: improve test coverage
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:00:23 -0300] rev 4352
command line templates: add formatnode filter
This will print a full hash node with --debug and a short one otherwise.
Use it with some default templates and in map-cmdline.default to print
the parents. This should fix
issue538.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:00:23 -0300] rev 4351
fix 'hg <not-log> -v --template foo' with revisions without copies
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:24:52 -0500] rev 4350
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 09:52:37 -0500] rev 4349
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 09:51:50 -0500] rev 4348
hgweb: fix rfind bug in PATH_INFO handling
Matt Mackall <mpm@selenic.com> [Sun, 15 Apr 2007 18:42:51 -0500] rev 4347
Merge with crew
Matt Mackall <mpm@selenic.com> [Sun, 15 Apr 2007 18:42:38 -0500] rev 4346
Merge with stable
Brendan Cully <brendan@kublai.com> [Thu, 12 Apr 2007 16:05:28 -0700] rev 4345
Merge with Matt