facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
3,964 Commits 24 Branches 62 Tags 324 MiB
09cc2427b1
Commit Graph

781 Commits

Author SHA1 Message Date
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
Haakon Riiser
7b06333d1a diff: add -b/-B options 2006-06-29 15:16:25 +02:00
Thomas Arendsen Hein
ee260bdfad Changed default timeout for run-tests.py from 30 to 180 seconds. 
As e.g. test-http-proxy already takes quite some time (about a minute here)
and tests usually should clean up after themselves, the timeout should only be
hit in case of other problems.
 2006-07-07 11:23:53 +02:00
Vadim Gelfer
e9e427a8ab tests: record few more daemon pids to be safe 2006-07-06 11:49:19 -07:00
Vadim Gelfer
832c369ab0 tests: add timeouts, make run-tests.py clean up dead daemon processes 
test timeout feature is needed for test with python 2.5 beta.  if test
does not complete in time (30 seconds is default), it is killed.

some times daemon process used in test can be alive after the test
is killed by user or by timeout.  tests now record daemon pids into
$DAEMON_PIDS and run-tests.py kills all living daemons after every test.

final little change is to add newline to end of pid file printed by
"hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.
 2006-07-06 11:45:34 -07:00
Vadim Gelfer
6901c8941f run-tests.py: make tests use same python interpreter as test harness. 
this is wanted because some tests run python interpreter directly.

must use same python interpreter in tests as in main harness or problems
will happen because of e.g. different python abi if run-tests.py run
with python 2.5 but system python is 2.4.

fix is to see if system python is used and is named python.  if no,
put symlink called python at front of shell search path.
 2006-07-06 10:09:24 -07:00
Vadim Gelfer
4538f9a28f help: make "hg help EXTENSION" work 2006-07-03 14:30:24 -07:00
Thomas Arendsen Hein
56992c9012 Adjusted test output to changed abort message of 'hg merge' (from 37579062eb39) 2006-07-03 19:28:31 +02:00
Vadim Gelfer
f5cc524830 test-webraw: do not store hostname in test output 2006-06-30 22:04:02 -07:00
Thomas Arendsen Hein
1a37a0b91c Use more compatible cmd instead of $(cmd) in test-http-proxy 2006-06-30 21:41:24 +02:00
Thomas Arendsen Hein
32b4467310 Don't change $PATH (breaks python in other locations) and $PWD in test-oldcgi 2006-06-30 21:40:56 +02:00
Thomas Arendsen Hein
e7d4218f04 Don't use non-sh declare in test-oldcgi. 2006-06-30 21:40:20 +02:00
Thomas Arendsen Hein
693aaef4a8 Merged WSGI fixes from http://hg.omnifarious.org/~hopper/webmerc/ 2006-06-30 21:36:45 +02:00
Thomas Arendsen Hein
d17f2a589b Merge with crew. 2006-06-30 21:35:28 +02:00
Benoit Boissinot
375c0a2432 add more testcases for date parsing 2006-06-30 18:57:04 +02:00
Jose M. Prieto
9f3a9a5e6e Allow the use of human readable dates (issue 251) 2006-06-30 18:47:35 +02:00
Eric Hopper
9a350e9c92 Fix new tests to be better. In particular, fix webraw test to 
specify a date on commit to be less brittle, and fix test-oldcgi to test
fetching a subdirectory of a webdir instance.
 2006-06-30 08:45:52 -07:00
Benoit Boissinot
11e30052ea add -r/--rev arguments to incoming and outgoing 2006-06-30 16:16:35 +02:00
Eric Hopper
65cb733078 Create a test to make sure old CGI scripts will still work. 2006-06-29 18:31:17 -07:00
Eric Hopper
6ae7c3c284 Add a test for getting raw files via the web UI. 2006-06-29 16:44:23 -07:00
Thomas Arendsen Hein
b4df3308e0 Wait for first pull to be completed before doing verify. 2006-06-28 12:29:48 +02:00
Sascha Wilde
e0f4b826f9 Some systems are slower ... give 'em some time/ 2006-06-27 22:50:33 +02:00
Sascha Wilde
80494ee740 Workaround to work with less sophisticated sed versions. 
For example NetBSD sed doesn't know about '\|'.
 2006-06-27 21:56:11 +02:00
Vadim Gelfer
958489deb9 import: added tests, fixed bugs found by tests and asak. 2006-06-27 09:30:50 -07:00
Benoit Boissinot
518dc48563 clone: simplifying dest repo creation 
since creating a repo raises an exception if the repo already
exists, there's no need to try to create one.
add some test for repo creation when the destination exists
 2006-09-02 23:26:10 +02:00
Benoit Boissinot
45f114cbf2 sshrepo: flush stderr before connecting to the hg server 2006-09-02 21:08:54 +02:00
Brendan Cully
b733859249 Call patch.diff directly instead of printdiff - this also saves an 
extra walk of the working directory.
 2006-08-29 17:08:55 -07:00
Benoit Boissinot
f3c38aa003 Add a hint for revert --all when aborting 2006-08-29 19:02:57 +02:00
Benoit Boissinot
5e11bd63c0 fix incorrect warning when walking on a particular rev 
when a directory was given instead of a file it reported
incorrectly 'No such file or directory in rev <rev>'
we test if the file is a prefix directory
 2006-08-28 21:49:02 +02:00
Lee Cantey
3f812d11f2 Allow for MB/sec transfer rates in test-http-proxy and test-ssh. 
Also make the test more specific in test-http.
 2006-08-21 10:46:58 -07:00
Alexis S. L. Carvalho
16c4d42a8d load extensions only after the ui object has been completely initialized 
This fixes a traceback printed when hg tries to print another traceback
after an extension fails to be loaded.  Add a test for that.
 2006-08-22 22:49:30 -03:00
Thomas Arendsen Hein
609fc3aa7b Allow using default values with ui.configlist, too, and add a test for this. 2006-06-26 22:44:48 +02:00
Thomas Arendsen Hein
b1e9507c44 Fixed [web] allow_archive for comma separated parameters by using ui.configlist. 
Changed tests/test-archive to use allow_archive instead of the deprecated
allowzip, allowgz and allowbz2.
 2006-06-26 14:56:14 +02:00
Vadim Gelfer
aaa7510117 add test for default-push. 2006-06-23 18:23:42 -07:00
Vadim Gelfer
b283318ce4 print message after backout that tells that backout adds new head. 2006-06-23 17:33:10 -07:00
Brendan Cully
15cb23906a Test case for #295 2006-06-23 17:21:04 -07:00
Brendan Cully
a8557bc216 Test case for #294 2006-06-23 08:10:06 +02:00
Vadim Gelfer
7a916fce8b add tests for push over http. 2006-06-21 17:55:11 -07:00
Vadim Gelfer
29a0efc318 fix -I/-X when relative paths used or in subdir 2006-06-21 17:30:31 -07:00
Vadim Gelfer
ed8f9c5fd3 archive: make "hg archive -t XXX -" to write to stdout 2006-06-21 15:15:06 -07:00
Alexis S. L. Carvalho
30e9b6e2d4 Update keepalive.py to current CVS version of urlgrabber. 
This fixes a bug where the output of test-bad-pull would differ
between python 2.3 and 2.4.  Also update the expected output of
this test.
 2006-06-16 10:00:37 -03:00
Vadim Gelfer
b853885582 merge with self. 2006-06-15 16:38:23 -07:00
Vadim Gelfer
9117f9f380 extend network protocol to stop clients from locking servers 
now all repositories have capabilities slot, tuple with list of names.

if 'unbundle' capability present, repo supports push where client does
not need to lock server.  repository classes that have unbundle capability
also have unbundle method.

implemented for ssh now, will be base for push over http.

unbundle protocol acts this way.  server tells client what heads it
has during normal negotiate step.  client starts unbundle by repeat
server's heads back to it.  if server has new heads, abort immediately.
otherwise, transfer changes to server.  once data transferred, server
locks and checks heads again.  if heads same, changes can be added.
else someone else added heads, and server aborts.

if client wants to force server to add heads, sends special heads list of
'force'.
 2006-06-15 16:37:23 -07:00
Vadim Gelfer
c59aedf89c test-bad-pull: fix change in error output. 2006-06-15 15:42:16 -07:00
Benoit Boissinot
6eff6b4069 replace old-http:// syntax by static-http:// and deprecate the redundant hg:// 2006-06-14 21:53:42 +02:00
Thomas Arendsen Hein
56a3c0876e Report on push/pull if heads are merged, too, like for new heads. 
Use case: If a remote repo has two heads and I _want_ to merge them, I merge
and push. Meanwhile someone else pushed on top of one of the heads. He won't
get a warning, because he doesn't create a new head, I won't notice that I
don't close a head, because I don't get a message telling me.
 2006-06-10 17:39:29 +02:00
Vadim Gelfer
c2a4ad5200 update test-help output after new options. 2006-06-09 09:14:52 -07:00
Thomas Arendsen Hein
49f57f33db Fix diff header (line endings) for failed test output in run-tests.py. 2006-06-08 15:06:31 +02:00
Thomas Arendsen Hein
a7d6f68122 Don't run tests with dots in their name (e.g. test-foo.orig) 2006-06-08 14:56:40 +02:00
Vadim Gelfer
aa92622634 revert: better fix for not printing 'reverting' message 2006-06-07 13:16:25 -07:00
Benoit Boissinot
ba6fa6a223 document and fix findincoming 
- add documentation about what the function does, notably
  the fact that it updates 'base'
- transform the workflow to a more simple 'if elif elif else'
- do not call remote.branches if not necessary
- some nodes where missing in 'base' (from what I understand,
  if the root of a branch is missing but one parent is present,
  the parent should be in 'base')
- add a testcase for an incorrect outgoing that is fixed by
  this cset
- add a testcase for an empty group bug, it needs fixing
 2006-05-23 10:44:40 +02:00
Vadim Gelfer
46bfa5a813 http: fix many problems with url parsing and auth. added proxy test. 
problems fixed:

- https scheme handled properly for real and proxy urls.

- url of form "http://user:password@host:port/path" now ok.

- no-proxy check uses proper host names.
 2006-05-22 15:42:49 -07:00
Vadim Gelfer
5eb540c338 fix parsing of tags. make parse errors useful. add new tag tests. 
old code read every head of .hgtags. delete and recreate of .hgtags gave
new head, but if error in deleted rev, .hgtags had error messages every
time it was parsed. this was very hard to fix, because deleted revs hard
to get back and update, needed merges too.

new code reads .hgtags on every head. advantage is if parse error
happens with new code, is possible to fix them by editing .hgtags on a
head and committing.

NOTE: new code uses binary search of manifest of each head to be fast,
but still much slower than old code. best thing would be to have delete
record stored in filelog so we never touch manifest. could find live
heads directly from filelog. this is more work than i want now.

new tests check for parse of tags on different heads, and inaccessible
heads created by delete and recreate of .hgtags.
 2006-05-18 23:31:12 -07:00
Vadim Gelfer
89a3f5af78 test-globalopts: make sed expression better. 2006-05-18 23:02:24 -07:00
Vadim Gelfer
a7019f377d remove: rewrite to be ~400x faster, bit more friendly 
old remove code called localrepo.changes for each file.
was very expensive:

  $ hg --time rm arch>/dev/null
  Time: real 1066.120 secs (user 1014.450+0.000 sys 18.090+0.000)

new code, same files:

  $ hg --time rm arch>/dev/null
  Time: real 2.770 secs (user 2.190+0.000 sys 0.580+0.000)

also mention "-f" if not removing files. also allow "-f" to forget
added files.

make test a bit better.
 2006-05-18 13:48:12 -07:00
Thomas Arendsen Hein
730a790e89 Corrected tests for commit now consistently stripping last newline. 2006-05-17 19:59:15 +02:00
Thomas Arendsen Hein
17b5742156 Corrected test for date in output of 'hg export'. 2006-05-17 19:58:22 +02:00
Vadim Gelfer
bbb33944e9 add --config global option. allows to set hgrc option on command line. 
syntax: --config section.name=value

also add new test-globalopts to test all global options in one place.
 2006-05-15 11:16:32 -07:00
Vadim Gelfer
882aea035d merge with crew. 2006-05-15 09:27:27 -07:00
Vadim Gelfer
e5df462a15 deprecate 'update -m'. use 'merge' instead. 2006-05-14 21:07:34 -07:00
Alexis S. L. Carvalho
5ceb7770c1 add test for revlog.parseindex 2006-05-14 18:37:50 -03:00
Benoit Boissinot
8a3548f72d tests for bundles and bundlerepo 2006-05-12 18:39:37 +02:00
Vadim Gelfer
cd6ded15df revert: fix corner case found by faheem mitha. 
if file not in dest manifest, remove only if in source manifest.
 2006-05-11 22:10:47 -07:00
Vadim Gelfer
c278e6a6c4 merge with crew. 2006-05-11 14:46:24 -07:00
Vadim Gelfer
5c38728103 fix coding style of backout editor change. 2006-05-11 14:41:52 -07:00
Vadim Gelfer
1f1118a083 hooks: add preupdate and update hooks. 
preupdate run before working dir updated. can prevent update.
update run after working dir updated.
 2006-05-11 10:14:48 -07:00
Benoit Boissinot
8c5a16ed05 add tests for incoming and outgoing 2006-05-11 16:19:44 +02:00
Benoit Boissinot
fa32bf3c8d catch KeyboardInterrupt in run-tests 2006-05-11 14:06:18 +02:00
Vadim Gelfer
c440466a54 fix diffs containing embedded "\r". 
add test to make sure fix stays fixed.
 2006-05-10 10:31:54 -07:00
Vadim Gelfer
c9bc017f74 run-tests.py: fix handling of newlines. 
old code could not handle embedded "\r" or files that ended without newline.
 2006-05-10 10:31:22 -07:00
Vadim Gelfer
21204c6bb3 run-tests.py: print diff if reference output not existing. 2006-05-10 10:07:53 -07:00
Vadim Gelfer
79f11ff2dd hide deprecated undo command by making it an alias for debugundo. 2006-05-09 20:56:13 -07:00
Vadim Gelfer
daf27b2d40 merge with mainline. 2006-05-08 14:20:37 -07:00
Vadim Gelfer
c0d2c42c9f deprecate undo command, replace with rollback command. 2006-05-08 14:19:05 -07:00
Vadim Gelfer
0401f2bd35 fix test-help output. 2006-05-08 14:18:19 -07:00
Matt Mackall
350d21b04e Update tests for revlogng 2006-05-08 14:32:43 -05:00
Vadim Gelfer
41eb4e2c6e reverse sense of return value from python hooks. 
old scheme (False/None/0/'' == fail) made coding style
unnatural, did not allow use of mercurial commands as hooks.

new scheme (False/None/0 == pass) is pythonic, does not require peculiar
"return True" at ends of hooks, allows hooks like this:

[hooks]
# update working dir after push into this repo
changegroup.update = python:mercurial.commands.update
 2006-05-08 10:59:58 -07:00
Thomas Arendsen Hein
9be2b594a2 Fixed tests for changed help output 2006-05-06 16:43:16 +02:00
Vadim Gelfer
9522c700f4 revert: remove word "modified" from description. 2006-05-05 11:07:29 -07:00
Vadim Gelfer
89c7098b13 make test-confused-revert check working dir with two parents. 2006-05-05 10:45:08 -07:00
Vadim Gelfer
e1962a5447 run-tests.py must print changed test output no matter what exit code is. 2006-05-05 10:41:38 -07:00
Stephen Darnell
fb04fe7b4b Delete the shell version of run-tests 
Use the python version instead
 2006-05-04 15:47:18 -07:00
Vadim Gelfer
9c9dc84168 update test-help.out after fixing revert docs. 2006-05-04 15:25:24 -07:00
TK Soh
c82e4c7ed7 tests: support older version of bunzip2 and, possibly, gunzip too 2006-05-03 11:25:36 +02:00
TK Soh
fbc7092173 tests: fix compatibility on Solaris 2006-05-03 11:25:25 +02:00
Thomas Arendsen Hein
dc3e204fa1 Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'. 
Add an explicit description of 'hg commit --addremove'.
 2006-05-03 10:53:51 +02:00
Thomas Arendsen Hein
6db6f6dbbc Always clean the build directory before installing for running the tests. 
Otherwise tests might run an old version, when e.g. commands.py.orig is
moved back after a revert (old timestamp).
 2006-05-03 10:45:20 +02:00
Thomas Arendsen Hein
26b0a124c3 Corrected test output for deprecated addremove command. 2006-05-03 10:18:52 +02:00
Vadim Gelfer
6e0d4ab1da deprecate addremove command. 2006-05-02 21:50:53 -07:00
Vadim Gelfer
fe13882a8a make test-remove check some more cases. 2006-05-02 21:45:53 -07:00
Thomas Arendsen Hein
46d0753ec7 Make hg update more verbose by default (issue12) 
(including small changes to revert and backout to not show these stats
 with the exception of backout --merge)

Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved

Inform the user what to do after a merge:
(branch merge, don't forget to commit)

Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
  hg update -C X
  hg merge Y

Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
 2006-05-02 18:44:02 +02:00
Thomas Arendsen Hein
cdfafa43cf Applied $PWD fix (changeset bf1fa3097e92) to tests/test-hook, too. 2006-04-30 19:30:59 +02:00
Sascha Wilde
4877d2aad6 SunOS fix: Replaced $PWD with pwd 
under certain conditioins $PWD isn't up to date,
observed on SunOS 5.8
 2006-04-30 19:29:57 +02:00
Vadim Gelfer
1975d41da8 add backout command. 
command undoes effect of an earlier commit, commits new changeset
as result.
 2006-04-29 20:56:46 -07:00
Vadim Gelfer
f04cb6342b make test-revert check executable bit. 2006-04-29 20:39:28 -07:00
Vadim Gelfer
3459035f6b merge with crew. 2006-04-28 15:50:56 -07:00
Vadim Gelfer
2607813e53 support hooks written in python. 
to write hook in python, create module with hook function inside.
make sure mercurial can import module (put it in $PYTHONPATH or load it
as extension).  hook function should look like this:

def myhook(ui, repo, hooktype, **kwargs):
   if hook_passes:
      return True
   elif hook_explicitly_fails:
      return False
   elif some_other_failure:
      import util
      raise util.Abort('helpful failure message')
   else:
      return
      # implicit return of None makes hook fail!

then in .hgrc, add hook with "python:" prefix:

[hooks]
commit = python:mymodule.myhook
 2006-04-28 15:50:22 -07:00
Thomas Arendsen Hein
cc2267150a Show repo's revlog format on verify only if it doesn't match the default format. 
This makes it easier to run the tests with different revlog formats.
 2006-04-28 21:52:08 +02:00
Vadim Gelfer
edbe962e76 merge with crew. 2006-04-27 22:10:45 -07:00
Vadim Gelfer
e92eac82af run-tests.py: remove trailing white space 2006-04-27 22:01:57 -07:00
Vadim Gelfer
d35c28164f make indentation of coverage code in run-tests.py nicer. 2006-04-27 22:01:28 -07:00
Stephen Darnell
4c0fdc2a17 Add code coverage to the python version of run-tests (inc. annotation) 
Also include a minor work-around to coverage.py to avoid errors about /<string>
 2006-04-27 21:59:44 -07:00
Thomas Arendsen Hein
f48347c44f Show repo's revlog format on verify. Warn if some files use a different format. 2006-04-27 21:58:47 +02:00
Thomas Arendsen Hein
995ddadce4 Make the deprecated forget an alias of debugforget. 
This way it doesn't show up in the non-debug help.
 2006-04-27 13:11:23 +02:00
Thomas Arendsen Hein
6274feab61 Fixed test output for not using the deprecated 'hg forget'. 2006-04-27 13:05:02 +02:00
Vadim Gelfer
f90efb1f0f mke test-nested-repo use "revert" instead of "forget" 2006-04-26 12:06:21 -07:00
Vadim Gelfer
184aae8b48 mark forget command as deprecated. 
will be removed after 0.9 released.
 2006-04-26 12:05:16 -07:00