Matt Mackall
8f44013035
test-grep: use lowercase hg command
2007-08-15 15:30:33 -05:00
Brendan Cully
0893e6763c
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.
2007-08-15 13:21:23 -07:00
Sascha Wilde
dddf718ec2
Use smerge minor mode in emacs to resolve conflicts.
...
The condition-case is used to suppress errors with emacs versions before 21.
2007-08-15 17:27:51 +02:00
Patrick Mezard
4ad44c80f1
Merge with crew-stable
2007-08-15 16:43:40 +02:00
Patrick Mezard
04cf5bb0f5
test-grep: test issue 685
2007-08-15 16:18:40 +02:00
Patrick Mezard
498ca5601a
Fix issue 685: trackback in grep -r after rename
2007-08-15 16:09:04 +02:00
Thomas Arendsen Hein
c6dbd813b7
merge with crew-stable
2007-08-14 21:36:08 +02:00
Patrick Mezard
8169b36e09
Merge with crew-stable
2007-08-14 19:30:14 +02:00
Patrick Mezard
e1556e1cd2
hghave: test hotshot dependencies (debian does not provide profile)
2007-08-14 19:25:49 +02:00
Patrick Mezard
f54fb44413
Merge with crew-stable
2007-08-14 19:06:10 +02:00
Patrick Mezard
3f797895fa
test-profile: fix grep, check hotshot availability
2007-08-14 18:53:45 +02:00
Benoit Boissinot
eb931a15ff
fix bundlerepo broken by f778fb08323c
...
since we now use struct in case of lazy parser, this have to be an integer
instead of None
see issue681
2007-08-14 18:25:27 +02:00
Benoit Boissinot
f25ebf4477
merge with -stable
2007-08-14 17:20:51 +02:00
Patrick Mezard
1c4c581aa9
Merge with crew-stable
2007-08-14 16:30:38 +02:00
Patrick Mezard
0e4dfe7a43
Test --time, --profile and --lsprof
2007-08-14 16:27:35 +02:00
Patrick Mezard
38b7c18bab
demandimport: ignore resource module, not available under Windows.
2007-08-14 16:03:15 +02:00
Guillaume Chazarain
011bd031bd
Return 0 as 'hg bisect reset' is successful
2007-08-14 14:29:36 +02:00
Brendan Cully
f3948130fd
imerge: simplify c3b3184057da
2007-08-13 11:58:47 -07:00
Patrick Mezard
e7663b6ff8
demandimport: ignore pwd and grp.
...
Both are unavailable under Windows and tarfile detects them via ImportError.
2007-08-13 19:42:52 +02:00
Patrick Mezard
a7e536de52
imerge: fix status file lookups
2007-08-13 19:42:52 +02:00
Patrick Mezard
9e00bc29ee
demandimport: ignore pwd and grp.
...
Both are unavailable under Windows and tarfile detects them via ImportError.
2007-08-13 19:42:52 +02:00
Patrick Mezard
aebb857395
util: ignore invalid path errors in path_auditor.
2007-08-13 19:42:50 +02:00
Alexis S. L. Carvalho
a866998db8
merge with crew-stable
2007-08-12 12:43:52 -03:00
Alexis S. L. Carvalho
664fc9f5dd
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.
2007-08-12 12:15:10 -03:00
Thomas Arendsen Hein
beed59edcd
merge with crew-stable
2007-08-11 13:35:25 +02:00
Thomas Arendsen Hein
9c6e25abcf
Added test for commands.dispatch (especially 88803a69b24)
2007-08-11 13:34:19 +02:00
Thomas Arendsen Hein
87b480f2bb
test-context.py: Don't create second repo instance (fixed since 3300640607e3)
2007-08-11 13:17:24 +02:00
Thomas Arendsen Hein
37a2cd8e7d
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
2007-08-11 13:07:47 +02:00
Thomas Arendsen Hein
467db29b4a
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"
2007-08-11 12:47:58 +02:00
Thomas Arendsen Hein
5f273063c7
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.
2007-08-11 12:36:04 +02:00
Bryan O'Sullivan
6cbcae9959
Make a few portability improvements to path auditing code.
2007-08-10 10:51:47 -07:00
Bryan O'Sullivan
1b98353d91
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.
2007-08-10 10:46:03 -07:00
Bryan O'Sullivan
3899e7b033
mq: teach qpop about symlinks
2007-08-09 20:16:00 -07:00
Bryan O'Sullivan
d003ab09e5
debugstate: print symlinks as 'lnk', not '777'
2007-08-09 20:03:34 -07:00
Bryan O'Sullivan
c42c6ca456
manifest: accept -r for rev specification
2007-08-09 19:42:33 -07:00
Bryan O'Sullivan
46880a1c4f
record: improve docs, improve prompts
2007-08-09 17:29:16 -07:00
Patrick Mezard
6650213c7b
Merge with crew-stable
2007-08-09 23:29:29 +02:00
Patrick Mezard
b69056f11a
hghave: prefix temporary files with "hg-hghave-"
2007-08-09 23:14:52 +02:00
Patrick Mezard
0bbfa25ca1
test-no-symlinks: rename .bundle into .hg for consistency.
2007-08-09 23:14:50 +02:00
Brendan Cully
de91e598a2
Merge with crew-stable
2007-08-09 12:35:10 -07:00
Brendan Cully
127294b50c
fix up previous commit for stable
2007-08-09 12:34:25 -07:00
Brendan Cully
c8c558a817
Merge with crew-stable
2007-08-09 11:37:47 -07:00
Brendan Cully
38822453d6
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.
2007-08-08 18:04:06 -07:00
Benoit Boissinot
5c3e74025c
merge with -stable
2007-08-09 01:07:11 +02:00
Benoit Boissinot
25ee8ea56b
unobfuscate part of fec055ae35cc
2007-08-09 01:04:27 +02:00
Patrick Mezard
7f6bafcf19
Merge with crew-stable
2007-08-08 23:11:12 +02:00
Benoit Boissinot
258f71b5a3
merge with -stable
2007-08-08 23:00:01 +02:00
Eric Hopper
e7f6d77433
Fix hgwebdir after aaaee74b883fc144cc3472c81c61157bc69374b6 broke it.
2007-08-08 22:47:30 +02:00
Patrick Mezard
17afbade48
Test symlink handling on platform not supporting them
2007-08-08 22:47:18 +02:00
Patrick Mezard
d0f548d7df
hghave: feature absence can be checked by prefixing with 'no-'
2007-08-08 23:07:39 +02:00
