Mon, 16 Apr 2007 20:17:39 -0300 actually port simplemerge to hg
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
Mon, 16 Apr 2007 20:17:39 -0300 Import 3-way merge code from bzr
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
Mon, 16 Apr 2007 20:17:39 -0300 add mdiff.get_matching_blocks
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4361
add mdiff.get_matching_blocks
Mon, 16 Apr 2007 13:31:15 -0300 Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:31:15 -0300] rev 4360
Merge with crew-stable.
Wed, 25 Apr 2007 13:35:18 -0500 hg serve: don't do DNS lookups
Matt Mackall <mpm@selenic.com> [Wed, 25 Apr 2007 13:35:18 -0500] rev 4359
hg serve: don't do DNS lookups
Sat, 27 Jan 2007 23:07:06 +0100 Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
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)
Tue, 24 Apr 2007 10:44:13 -0700 Work around python 2.5.1 tarfile regression
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 10:44:13 -0700] rev 4357
Work around python 2.5.1 tarfile regression
Thu, 19 Apr 2007 17:52:42 +0200 Avoid float rounding errors when checking http protocol version.
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.
Mon, 16 Apr 2007 12:37:30 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:37:30 -0500] rev 4355
Merge with stable
Mon, 16 Apr 2007 12:27:49 -0500 Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:27:49 -0500] rev 4354
Merge with crew
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip