Alexis S. L. Carvalho
c10901518c
fix bash completion of debug commands; add test for debugcomplete
...
The debugconfig -> showconfig renaming broke things.
2006-10-08 20:27:23 -03:00
Thomas Arendsen Hein
3eba465a03
merge with upstream
2006-10-08 10:55:11 +02:00
Matt Mackall
c60f9a48ec
Fix undetected change bug in rename tests
2006-10-07 17:30:26 -05:00
Thomas Arendsen Hein
eda6c4fc83
Make test-bundle-r executable.
2006-10-07 18:14:03 +02:00
Matt Mackall
f0d4af67fe
Update test output
2006-10-06 17:14:50 -05:00
Matt Mackall
447f49c02a
Merge with crew
2006-10-06 17:14:18 -05:00
Matt Mackall
718de207ba
merge: copy fixes and tests
...
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
2006-10-06 16:55:11 -05:00
Benoit Boissinot
3a1d29d975
ssh: make the error message more clear, add a testcase
2006-10-06 16:24:14 +02:00
Thomas Arendsen Hein
1b2caf3f19
Un-debugify debugconfig to showconfig. (issue 317)
2006-10-05 15:51:54 +02:00
Thomas Arendsen Hein
739335e4b5
merge with upstream
2006-10-05 10:07:40 +02:00
Matt Mackall
81e539f559
merge: fixes for merge+rename
...
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
2006-10-04 19:08:04 -05:00
Brendan Cully
de0df5a89b
Merge with upstream
2006-10-03 12:14:33 -07:00
Jose M. Prieto
7670d11c8a
Add documentation about the date formats allowed in the command line
2006-10-03 12:33:22 +02:00
Jose M. Prieto
a76c2de547
util.strdate: assume local time when no timezone specified
2006-10-03 12:33:18 +02:00
Jose M. Prieto
06cffb7de4
util.strdate: compute timestamp using UTC, not local timezone
2006-10-03 12:33:14 +02:00
Benoit Boissinot
eeb30a5065
[extendedchangelog] encode/decode function
...
encode '\n', '\r' and '\0'
2006-10-02 22:35:37 +02:00
Matt Mackall
a9124fdfed
merge: extend file merge function for renames
2006-10-02 12:04:48 -05:00
Benoit Boissinot
f8998cc29f
merge with crew
2006-10-02 08:40:26 +02:00
Benoit Boissinot
02c099067f
test-merge-revert2 solaris fix
2006-10-02 08:36:29 +02:00
Thomas Arendsen Hein
0a7b982aa6
Whitespace/Tab cleanup
2006-10-01 19:26:33 +02:00
Thomas Arendsen Hein
5110ed5266
Merge with upstream
2006-09-30 09:46:03 +02:00
Thomas Arendsen Hein
bdf79a5c6d
Remove unneeded (and bashismic) export HGMERGE=true.
2006-09-30 09:39:44 +02:00
Matt Mackall
72659a3964
merge: use repo.parents and parent contexts in update
2006-09-29 16:39:38 -05:00
Stephen Darnell
87280e847b
Remove single character equivalent of --nodates (was -D)
2006-09-28 21:00:01 +01:00
Stephen Darnell
a808384cf1
Add -D/--nodates options to hg diff/export that removes dates from diff headers
...
and replace uses of sed in the tests with --nodates.
2006-09-26 00:05:24 +01:00
Brendan Cully
d1c28696d4
Show copies in hg log.
...
The format is:
copies: destination (source)...
2006-09-29 13:01:19 -07:00
Thomas Arendsen Hein
1803d363c7
Make "hg log --style=changelog > changelog" work (issue338)
...
Style files in templates/ now take precedence over current directory.
This can be overridden with --style=./changelog if really neeeded.
Added test for issue338.
2006-09-29 21:24:15 +02:00
Thomas Arendsen Hein
d3fc1dadc1
Documentation fixes for addremove.
...
- It is no longer deprecated, but the short help still included (DEPRECATED).
- Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
2006-09-27 21:43:45 +02:00
Brendan Cully
2946d7faed
Refactor annotate copy support.
2006-09-27 09:10:21 -07:00
Matt Mackall
235ebaa809
Add core copy detection algorithm
...
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.
While the merge code invokes the copy detection routine, it does not
yet use the result.
2006-09-25 16:45:31 -05:00
Giorgos Keramidas
c6538e557f
tests: add new test; test-mq-qrefresh
2006-09-20 21:44:35 +02:00
Matt Mackall
885b6f1a23
merge: simplify actions with helper function
2006-09-17 21:27:30 -05:00
Matt Mackall
56ee773f9b
merge: simplify local created logic
2006-09-17 21:11:26 -05:00
Matt Mackall
769045bfdc
merge: remove linear variable
2006-09-17 17:13:02 -05:00
Matt Mackall
d031f12c1d
Merge with backout
2006-09-15 16:01:16 -05:00
Matt Mackall
277fde1fea
Back out trusted hgrc change for now
...
Backed out changeset f077d29b114d4
2006-09-15 16:00:16 -05:00
Matt Mackall
3f3298dd8d
Merge with crew
2006-09-15 15:22:45 -05:00
Brendan Cully
2af71f83a1
cat: default to working dir parent instead of tip
...
This introduces a defaultrev function that chooses
the working dir parent if a revision isn't specified,
and uses it in several places.
2006-09-14 19:24:00 -07:00
Brendan Cully
6222780283
mq: add qdelete --forget option
...
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
2006-09-14 15:35:55 +02:00
Benoit Boissinot
2baab981fb
sshrepo: don't try to validate when creating the repo
...
- This removes the "repo not found" error when cloning or init-ing a remote
repo.
- Since the remote hg will abort if the repo already exists we don't need to
validate it.
2006-09-13 19:57:40 +02:00
Brendan Cully
5ee5b4abae
Make qrename handle directory targets; closes #333 .
2006-09-13 08:57:08 -07:00
Thomas Arendsen Hein
1cff09d393
Added tests for qpush/qpop with index.
2006-09-12 17:26:20 +02:00
Thomas Arendsen Hein
978cbf5cbd
Fixed OSError "No such file or directory: None" and make IOError consistent.
...
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
2006-09-11 10:23:23 +02:00
Thomas Arendsen Hein
005fbb4e58
Include section name and parameter name (if available) in config errors.
...
Added tests for this.
2006-09-08 10:01:45 +02:00
Benoit Boissinot
2ea82386bd
hg merge: fix lookup of branch
...
add some tests for branch usage
2006-09-08 02:16:16 +02:00
Benoit Boissinot
670858c395
git --diff: fix traceback when getting mode change
...
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
2006-09-07 14:12:39 +02:00
Matt Mackall
9ee666d233
merge: use context code to retrieve manifests
2006-08-22 19:32:16 -05:00
Alexis S. L. Carvalho
fa133e9e4f
Only read .hg/hgrc files from trusted users/groups
...
The list of trusted users and groups is specified in the [trusted]
section of a hgrc; the current user is always trusted; "*" can be
used to trust all users/groups.
Global hgrc files are always read.
On Windows (and other systems that don't have the pwd and grp modules),
all .hg/hgrc files are read.
2006-08-22 20:45:03 -03:00
Matt Mackall
b3f3e7896e
merge: combine merge and get lists
2006-08-22 18:06:17 -05:00
Vadim Gelfer
9e5bd16634
merge.
2006-08-23 08:42:21 -07:00
Matt Mackall
656a5f8eb1
merge: simplify working dir manifest generation
2006-08-22 17:08:38 -05:00
Thomas Arendsen Hein
acc2d17e2f
Make test-strict append to $HGRCPATH, like other tests do since e6e7d87cb388.
2006-08-22 10:20:21 +02:00
Thomas Arendsen Hein
dd369da4a5
Merge with tah
2006-08-22 10:18:40 +02:00
Thomas Arendsen Hein
a1f1b33ecb
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
...
and add documentation for this.
2006-08-22 10:08:42 +02:00
Thomas Arendsen Hein
31b1fbbac8
Clear contents of global hgrc for tests before running each test.
...
This fixes running test-mq-qdiff after test-mq, because of changed settings.
2006-08-22 09:55:14 +02:00
Bryan O'Sullivan
24286794a7
Add ui.strict config item.
...
This turns off command matching by unambiguous prefix, and is a good
thing if you want to write future-proof scripts.
This fixes issue 314.
2006-08-21 21:59:29 -07:00
Lee Cantey
2e459ed1d8
Allow for MB/sec transfer rates in test-http
2006-08-21 16:33:43 -07:00
Danek Duvall
3dfcc70c3e
patch queue: portability.notes
2006-08-21 14:13:27 -07:00
Vadim Gelfer
38dd424903
revert: require --all to revert all files.
2006-08-21 09:44:52 -07:00
Matt Mackall
4e0e3a1e78
tag: shorten hash in default commit message
...
Move default message to commands.py
Pass node in binary for consistency
Remove default arguments
Fix up tests
2006-08-20 23:52:52 -05:00
Matt Mackall
ba56a1fdbd
Only show long hashes with --debug, not --verbose
2006-08-20 22:51:56 -05:00
Vadim Gelfer
f72ee79e69
addremove: add -s/--similarity option
...
progress on issue 295.
2006-08-18 22:13:58 -07:00
Vadim Gelfer
5a993ee589
merge.
2006-08-18 21:17:28 -07:00
Vadim Gelfer
853998bf60
fix issue 322.
...
do not allow to add files that shadow files or directories already in dirstate.
2006-08-18 21:03:29 -07:00
Vadim Gelfer
feeb6e59eb
add other dir/file case to test for issue322.
2006-08-18 15:53:14 -07:00
Vadim Gelfer
dfb60a287c
add test for issue 322.
...
no .out file because issue is still live.
2006-08-18 14:49:12 -07:00
Vadim Gelfer
a7a2bb9df7
merge with brendan.
2006-08-18 13:01:40 -07:00
Danek Duvall
c6b9a108d2
Solaris portability fixes
2006-08-18 10:24:04 -07:00
Brendan Cully
f814ae9ab3
sed portability fixes
2006-08-16 19:50:21 -07:00
Brendan Cully
16fb95a415
Teach mq about git patches
2006-08-16 19:49:45 -07:00
Vadim Gelfer
3cd0a9298f
make new tests executable.
2006-08-16 10:53:01 -07:00
Giorgos Keramidas
8b8d11fe4e
tests: new test for the bisect extension
2006-08-15 21:49:49 +03:00
Giorgos Keramidas
1c8f75d525
tests: new test for "hg annotate"
2006-08-15 21:22:26 +03:00
Brendan Cully
2709262462
Unify mq and hg patch invocation.
...
This makes patch a little less verbose by default, so the tests
had to be updated.
2006-08-15 11:28:50 -07:00
Vadim Gelfer
a4297a2ce3
merge.
2006-08-15 11:43:31 -07:00
Vadim Gelfer
f9cef8451f
make test-mq-qdiff executable.
2006-08-15 11:42:50 -07:00
Vadim Gelfer
efefb2e2cb
merge with other head by default, not tip.
...
fixes issue 339.
2006-08-15 11:38:07 -07:00
Giorgos Keramidas
6263e5e98b
tests: new test for mq qdiff command
...
`hg qdiff .' is supposed to work but it is currently broken.
This test should help us verify when it gets fixed.
2006-08-15 20:59:55 +03:00
Thomas Arendsen Hein
d4d1d2313a
Fixed test-extdiff.
...
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
2006-08-15 16:04:47 +02:00
Thomas Arendsen Hein
f7a86f8d81
Adjusted test to changed help output.
2006-08-15 11:47:17 +02:00
Brendan Cully
c18265f47c
Add diff --git option
2006-08-14 22:48:03 -07:00
Vadim Gelfer
ad47ec66c1
extdiff: fix bugs. add test.
2006-08-14 15:51:35 -07:00
Brendan Cully
44847fbcba
Test for log --prune.
2006-08-14 10:27:02 -07:00
Vadim Gelfer
cc643dbb24
make test-diff-subdir executable.
2006-08-13 15:03:48 -07:00
Giorgos Keramidas
cbaa061404
tests: new test for hg diff of a subdirectory only
2006-08-13 23:00:18 +03:00
Vadim Gelfer
00af865078
merge.
2006-08-12 15:43:38 -07:00
Brendan Cully
3d708cb539
grep: add --follow support.
2006-08-12 15:01:46 -07:00
Brendan Cully
3b28d277f1
grep: display correct user/revision for --all in reverse.
...
Also handle multiple occurrences of the same line by storing
linestates in an array instead of a dict, and using difflib
to compute the difference between linestates.
2006-08-12 13:51:14 -07:00
Brendan Cully
8ebc2ba929
Tests for git import
2006-08-11 16:56:31 -07:00
Vadim Gelfer
c21702b07b
fix test output
2006-08-10 17:37:57 -07:00
Vadim Gelfer
cefae5007c
mq: apply patch is any posative guard matches
...
this is like guards command from quilt package.
2006-08-10 17:18:55 -07:00
Vadim Gelfer
375ed90afa
mq: do not allow to push from repo with patches applied
2006-08-10 16:10:59 -07:00
Vadim Gelfer
4bb52754b3
mq: test commit in repo with patches applied
2006-08-10 15:02:18 -07:00
Vadim Gelfer
65c989bccf
qselect: add --pop, --reapply options
2006-08-10 14:58:10 -07:00
Danek Duvall
9c364cbd6e
Fix some tests for portability.
2006-08-09 12:05:40 -07:00
Matt Mackall
76c5adea2f
Merge with crew, fix most tests
2006-08-09 13:55:18 -05:00
Vadim Gelfer
626fbfdeed
mq: make guards more strict, add tests
2006-08-09 09:38:11 -07:00
Vadim Gelfer
594d062505
mq: drop qversion command
2006-08-08 17:11:36 -07:00
Vadim Gelfer
3a361df8d7
tests: forgot to add test-mq-guards.out
2006-08-09 02:04:49 -07:00
Vadim Gelfer
e946d15d30
test-fetch: make output stable
2006-08-08 16:23:02 -07:00
Vadim Gelfer
9b3aa8dfc1
fetch: fix breakage from mpm.
...
add test so will not break again.
2006-08-08 16:09:26 -07:00
Vadim Gelfer
3ea890331f
mq: new commands qselect, qguard
...
implement quilt-style guards for mq.
guards allow to control whether patch can be pushed.
if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed. if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.
use qguard to set/list guards on patches. use qselect to set/list
active guards.
also "qseries -v" prints guarded patches with "G" now.
2006-08-08 21:42:50 -07:00
Vadim Gelfer
f2173a1253
fix permission of test-mq-qsave
2006-08-08 18:14:03 -07:00
Matt Mackall
de047b03ce
Introduce update helper functions: update, merge, clean, and revert
2006-08-07 22:54:33 -05:00
Brendan Cully
e4b5636d59
Add basic qsave/qrestore test.
2006-08-07 14:48:24 -07:00
Vadim Gelfer
8b999d6f47
merge with self.
2006-08-04 10:38:17 -07:00
Vadim Gelfer
f34bef85ce
fix output of test-backout.
2006-08-04 10:37:40 -07:00
Brendan Cully
956d0c4e17
Test suite for log --follow and --follow-first.
2006-08-03 15:12:15 -07:00
Mathieu Clabaut ext:(%22)
dced35893a
Import say a file is not tracked after patching : test case
2006-08-02 09:29:17 +02:00
Vadim Gelfer
45763df4fc
tests: fix output for test-backout
2006-08-02 13:04:36 -07:00
Vadim Gelfer
fb083c6317
fix mq test output.
2006-08-01 15:40:54 -07:00
Brendan Cully
7750dbbb50
New self-explanatory command qrename.
2006-08-01 10:55:06 -07:00
Brendan Cully
7e5a1a4d6a
New mq command qfold: Merge patches into the current patch.
...
Patches should be in the series file but not yet applied.
2006-07-31 20:33:56 -07:00
Brendan Cully
af61c60015
Add command qheader to display the header of a given patch.
2006-07-31 18:39:31 -07:00
Vadim Gelfer
fed53854c7
log: add -f/--follow option, to follow rename/copy
2006-07-31 07:31:31 -07:00
Vadim Gelfer
fc31092ae7
pull: allow to pull from bundle file without need for bundle: syntax
2006-07-30 21:46:38 -07:00
Vadim Gelfer
ab373bc140
merge with crew.
2006-07-30 13:29:19 -07:00
Vadim Gelfer
8bbf3c06db
mq: add basic tests
2006-07-29 11:14:32 -07:00
Thomas Arendsen Hein
fe2792b770
merge with tah
2006-07-29 08:11:41 +02:00
Thomas Arendsen Hein
174db77808
Fix test-mq-qnew-twice exit code and output.
2006-07-28 09:00:30 +02:00
Thomas Arendsen Hein
39f376c06d
Add test mq keeping a reference to localrepo which can't remove journal on exit.
2006-07-28 08:59:06 +02:00
Vadim Gelfer
95c056a904
mq: do not allow to qnew a patch twice
2006-07-27 16:08:56 -07:00
Vadim Gelfer
ee86bed69f
run-tests.py: skip tests that should not run.
...
print message when any test is skipped.
count skipped tests.
2006-07-27 15:53:08 -07:00
Vadim Gelfer
30eef33028
make mq test more portable.
2006-07-27 15:31:04 -07:00
Matt Mackall
f6abe4704e
Fix test permission
2006-07-27 15:20:35 -05:00
Vadim Gelfer
be51fbc3c0
merge with crew.
2006-07-27 12:36:17 -07:00
Mathieu Clabaut ext:(%22)
f056efd753
MQ: uniformise message and logfile option.
...
Possibility to change message in qrefresh option
2006-07-26 20:11:54 +02:00
Thomas Arendsen Hein
4a4c474c02
Fixed confused directory changing in test-http.
2006-07-26 08:42:20 +02:00
Vadim Gelfer
3aac6bf9b9
merge.
2006-07-25 13:50:52 -07:00
Vadim Gelfer
0778999161
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks
...
all repository classes now have url() method that returns url of repo.
2006-07-25 13:50:32 -07:00
Will Maier
d6dfcfff0a
Provide a relevant description for --timeout.
2006-07-25 10:29:43 -05:00
Vadim Gelfer
61cd2f1088
addremove: do not deprecate.
...
command is too useful to drop.
is also best place to try autodetect of rename/copy by content similarity.
2006-07-23 09:04:14 -07:00
Alexis S. L. Carvalho
4fdf56c807
run-tests.py: fix diff output when test-foo.out doesn't exist.
...
Previously, if test-foo.out doesn't exist and test-foo outputs
something, the first line of the diff will look like this:
-+changeset: 0:0acdaf898367
(note the leading "-")
2006-07-21 01:51:17 -03:00
Alexis S. L. Carvalho
874e690312
Allow tests that end in .py and .bat
...
Revision f2f17143efd1 disallowed tests that have a '.' in the name, but
that also disallows tests that end in .py and .bat, even though run-tests.py
has some code to special case them.
2006-07-21 01:51:17 -03:00
Vadim Gelfer
1803b2474b
merge with crew.
2006-07-24 14:36:32 -07:00
Benoit Boissinot
f463f77610
change 'hg tag' to tag the parent rev instead of tip
2006-07-21 01:40:07 +02:00
Vadim Gelfer
9738466350
status: add -c (clean) and -A (all files) options
...
also add new localrepo.status what is more uniform than localrepo.changes.
localrepo.changes is deprecated and will go away soon.
2006-07-20 16:21:07 -07:00
Benoit Boissinot
b06d4a114d
add -r/--rev and --base option to bundle
...
--rev is used to specify a target rev (like pull or clone)
--base REV is used to specify a base instead of a target repo
the target repo is assumed to have all the rev specified in --base
2006-07-20 19:25:11 +02:00
Vadim Gelfer
c70a1efd28
fix tests.
2006-07-19 07:56:40 -07:00
Brendan Cully
3bc42b81ce
Add an option '-C|--copies' to hg status to show the source of copied files.
...
Copied files are displayed in the form:
A newname
oldname
2006-07-19 07:52:16 -07:00
Vadim Gelfer
a7bbf7d88f
rename stream hgrc option to compressed.
2006-07-16 10:04:16 -07:00
Vadim Gelfer
f7b6882acb
clone: disable stream support on server side by default.
...
enable in hgrc like this:
[server]
stream=True
2006-07-15 16:06:35 -07:00
Vadim Gelfer
a5035ce98c
update test-backout.out
2006-07-15 09:19:40 -07:00
Vadim Gelfer
895f59ec1c
backout: allow backout of merge changeset with --parent option.
...
--parent allows to choose which parent of merge to revert to.
2006-07-14 23:19:15 -07:00
Vadim Gelfer
4bc0558c57
clone: do not make streaming default. add --stream option instead.
2006-07-14 14:51:36 -07:00
Vadim Gelfer
9ea4436262
add support for streaming clone.
...
existing clone code uses pull to get changes from remote repo. is very
slow, uses lots of memory and cpu.
new clone code has server write file data straight to client, client
writes file data straight to disk. memory and cpu used are very low,
clone is much faster over lan.
new client can still clone with pull, can still clone from older servers.
new server can still serve older clients.
2006-07-14 11:17:22 -07:00
Lee Cantey
9582336ca9
Add merge to list of required tools.
2006-07-13 09:50:51 -07:00
Lee Cantey
a4ca3efd13
Fix sed expression for OS X and Solaris 2.6.
...
Matches previous fixes in other tests.
2006-07-13 11:19:35 -07:00
Thomas Arendsen Hein
e99c2d8c39
Added tests for local and remote init.
...
This tests the changes done in 974850ade4a1 and 53c61ee4b42e.
2006-07-12 09:01:10 +02:00
Vadim Gelfer
683b313996
add missed tests for diff -b/-B
2006-07-11 15:51:16 -07:00