Lee Cantey
524f7a0cf1
Add notes about configuring a merge program
2007-04-26 23:58:18 -07:00
Lee Cantey
3fd9fb852e
Update copyright year and change to range
2007-04-27 16:04:17 -07:00
Patrick Mezard
6af99d87d5
Use patch.patch() when checking for patch availability.
...
The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
2007-04-28 11:53:36 +02:00
Brendan Cully
ff66cca34d
Merge with crew
2007-04-28 09:03:47 -07:00
Patrick Mezard
5ec31f4a50
Fix find_in_path not including some file extension logic under win32.
...
Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.
2007-04-28 11:43:31 +02:00
Joel Rosdahl
57515f7282
Fix bad reference to RepoError in import command
2007-04-28 16:28:54 +02:00
Bryan O'Sullivan
7b6d636f19
Refactor commands.serve to allow other commands to run as services.
...
This introduces a new function, cmdutil.service.
2007-04-27 21:30:55 -07:00
Brendan Cully
3787b004e8
Do not automatically rename an atomicfile if a write to it has generated an exception.
2007-04-25 13:14:01 -07:00
Thomas Arendsen Hein
b4fc156022
merge with stable
2007-04-25 18:43:55 +02:00
Brendan Cully
86e588eafb
Make copy --after work for files that have been hg added.
2007-04-24 18:43:18 -07:00
Bryan O'Sullivan
06ea864877
When reloading the dirstate, recompute ignore information if needed.
2007-04-24 12:02:51 -07:00
Bryan O'Sullivan
3b15a417aa
dirstate: speed up write by 50%.
2007-04-24 12:02:42 -07:00
Bryan O'Sullivan
6518558080
dirstate: make parents() faster.
...
This allows localrepository.status() to avoid reading all but the
first 40 bytes of the dirstate in the common case of running "hg
status".
2007-04-24 11:46:15 -07:00
Bryan O'Sullivan
b9daf16a19
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".
2007-04-24 11:05:39 -07:00
Bryan O'Sullivan
390039e974
util._matcher: speed up regexp matching.
...
In cdc7e3627e1b, 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.
2007-04-24 10:53:25 -07:00
Brendan Cully
33f64bb34f
Merge with crew-stable
2007-04-24 10:47:41 -07:00
Brendan Cully
c779d79c71
Work around python 2.5.1 tarfile regression
2007-04-24 10:44:13 -07:00
Thomas Arendsen Hein
5cf9fd7310
Merge with crew-stable
2007-04-19 17:54:43 +02:00
Thomas Arendsen Hein
f828391cdc
Avoid float rounding errors when checking http protocol version.
2007-04-19 17:52:42 +02:00
Thomas Arendsen Hein
1a74aebc73
Work around problem where 'del os.environ["FOO"]' doesn't update environment.
...
test-hook failed since changeset f4d1d9e93f1a because of this on Solaris 8.
2007-04-19 13:04:26 +02:00
Thomas Arendsen Hein
bc615bbf0b
Use python instead of shell printf with \x for test-simplemerge-cmd
...
Needed e.g. to be compatible with Solaris.
2007-04-19 12:47:55 +02:00
Alexis S. L. Carvalho
68cb905520
Merge with crew.
2007-04-16 20:23:45 -03:00
Alexis S. L. Carvalho
a4fb0722ca
change tests to use simplemerge by default
2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
2fe1ec9254
polish the simplemerge command; add a test
2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
f65315991b
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
2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
50315bfe3b
Import 3-way merge code from bzr
...
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
425cc6372f
add mdiff.get_matching_blocks
2007-04-16 20:17:39 -03:00
Matt Mackall
e2dfe968ea
Merge with stable
2007-04-16 12:37:30 -05:00
Matt Mackall
b8f97a9a35
Merge with crew
2007-04-16 12:27:49 -05:00
Matt Mackall
f63e728c54
merge: fix quadratic behavior in find-copies
2007-04-16 12:24:52 -05:00
Alexis S. L. Carvalho
86b1b3e13e
Merge with crew-stable.
2007-04-16 13:31:15 -03:00
Matt Mackall
765aba6082
Merge with stable
2007-04-16 09:52:37 -05:00
Matt Mackall
8392cf0d15
hgweb: fix rfind bug in PATH_INFO handling
2007-04-16 09:51:50 -05:00
Matt Mackall
871161e884
Merge with crew
2007-04-15 18:42:51 -05:00
Matt Mackall
bc0f074639
Merge with stable
2007-04-15 18:42:38 -05:00
Matt Mackall
4cebb5c773
Merge with crew
2007-04-15 18:40:22 -05:00
Brendan Cully
e65b40f5e7
Merge with Matt
2007-04-12 16:05:28 -07:00
Brendan Cully
a7d01d6295
mq: fix qtop when some patches beneath are guarded
2007-04-12 14:45:53 -07:00
Patrick Mezard
c06d45d1c7
mq: test qtop with holes in the patch sequence.
2007-04-12 22:41:50 +02:00
Matt Mackall
a6178f3d01
Merge with crew
2007-04-12 12:42:22 -05:00
Matt Mackall
65b380693b
hgweb: make PATH_INFO handling slightly more robust
2007-04-12 11:00:21 -05:00
TK Soh
cd2f400311
test-command-template: improve test coverage
2007-04-10 16:25:21 -05:00
Alexis S. L. Carvalho
62e2a7bfb7
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.
2007-04-16 13:00:23 -03:00
Alexis S. L. Carvalho
4b47aae3d4
fix 'hg <not-log> -v --template foo' with revisions without copies
2007-04-16 13:00:23 -03:00
Matt Mackall
e293a4cd6d
Merge with stable
2007-04-10 14:05:15 -05:00
Brendan Cully
3c3e3924c4
Merge with crew-stable
2007-04-10 10:34:43 -07:00
TK Soh
424b1a050d
minor typo fix in templater's docstring
2007-04-10 12:24:28 -05:00
Joel Rosdahl
cd9e37bddc
Add graphlog extension
2007-04-09 10:39:28 +02:00
Brendan Cully
ef31abfcc7
Merge with crew-stable
2007-04-12 15:07:05 -07:00
Alexis S. L. Carvalho
ea51c7fac2
Merge with crew-stable.
2007-04-09 04:57:25 -03:00
