facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
461732b80c
sapling/tests
History
Alexis S. L. Carvalho a345c2c9da merge: forcefully mark files that we get from the second parent as dirty 
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history.  To make them visible to hg commit, we try to mark them as dirty.

Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.

This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:

Right now we use a negative file size to indicate we don't have valid
stat data for this entry.  In practice, this size is always -1.

This patch uses -2 to indicate that the entry is dirty.  Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.

The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.

This should fix issue522.

[1] - well, we could put them in state 'm', but that state has a
different meaning.
2007-08-23 01:48:29 -03:00
..
binfile.bin Add test for git binary diff support 2006-10-12 09:17:16 -07:00
coverage.py Use isinstance instead of type == type 2007-07-06 12:02:43 +02:00
get-with-headers.py Add a test for getting raw files via the web UI. 2006-06-29 16:44:23 -07:00
hghave hghave: test hotshot dependencies (debian does not provide profile) 2007-08-14 19:25:49 +02:00
legacy-encoding.hg Fixes test-encoding for python2.3 and minor cleanups: 2006-12-09 11:16:27 +01:00
md5sum.py Unified #! paths for python scripts and removed them for test modules. 2007-03-01 22:15:17 +01:00
printenv.py Kill trailing spaces 2007-06-21 09:25:49 +02:00
README Move test suite docs to the wiki 2006-12-19 16:38:14 -06:00
run-tests.py run-tests.py: pass --install-scripts to setup.py 2007-08-17 22:43:38 -03:00
test-586 commit: fix bug where dirstate for removed file is confused 2007-06-10 21:16:58 -05:00
test-586.out commit: fix bug where dirstate for removed file is confused 2007-06-10 21:16:58 -05:00
test-abort-checkin test-abort-checkin: use a hook to abort the commit 2007-03-04 14:35:11 -03:00
test-abort-checkin.out Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
test-acl make test-acl a bit more digestable for windows 2007-03-04 14:04:42 -03:00
test-acl.out Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
test-add make hg add of a removed file unremove the file 2007-08-21 02:13:32 +02:00
test-add.out make hg add of a removed file unremove the file 2007-08-21 02:13:32 +02:00
test-addremove Corrected similarity parameter used in test-addremove 2007-06-01 16:02:49 +02:00
test-addremove-similar addremove: print meaningful error message if --similar not numeric 2007-07-21 19:07:18 -07:00
test-addremove-similar.out addremove: print meaningful error message if --similar not numeric 2007-07-21 19:07:18 -07:00
test-addremove.out addremove: add -s/--similarity option 2006-08-18 22:13:58 -07:00
test-alias Add alias extension 2007-07-04 13:38:49 -07:00
test-alias.out Add alias extension 2007-07-04 13:38:49 -07:00
test-annotate Add --line-number option to hg annotate (issue506) 2007-07-08 19:59:02 +02:00
test-annotate.out Add --line-number option to hg annotate (issue506) 2007-07-08 19:59:02 +02:00
test-archive merge with crew-stable 2007-07-11 20:15:03 -03:00
test-archive-symlinks Skip test-archive-symlinks if symlinks are not available 2007-08-06 09:57:23 +02:00
test-archive-symlinks.out archive: add symlink support 2007-07-11 17:40:41 -03:00
test-archive.out merge with crew-stable 2007-07-11 20:15:03 -03:00
test-audit-path Make audit_path more stringent. 2007-08-10 10:46:03 -07:00
test-audit-path.out Make audit_path more stringent. 2007-08-10 10:46:03 -07:00
test-backout Fix and test 'hg backout' without or with too many revisions. 2007-06-26 15:28:17 +02:00
test-backout.out Fix and test 'hg backout' without or with too many revisions. 2007-06-26 15:28:17 +02:00
test-backwards-remove Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 2006-03-13 13:05:41 +01:00
test-backwards-remove.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-bad-extension test-bad-extension: avoid printing the file name 2007-03-04 14:09:29 -03:00
test-bad-extension.out Update expected test output 2007-07-30 20:48:50 -07:00
test-bad-pull test-bad-pull: try to avoid timing-related failures 2007-04-07 04:27:55 -03:00
test-bad-pull.out Update keepalive.py to current CVS version of urlgrabber. 2006-06-16 10:00:37 -03:00
test-basic make manifest friendlier 2006-11-30 22:38:48 -06:00
test-basic.out Show repo's revlog format on verify only if it doesn't match the default format. 2006-04-28 21:52:08 +02:00
test-bdiff Add a fast binary diff extension (not yet used) 2005-06-21 17:27:58 -08:00
test-bdiff.out Add a fast binary diff extension (not yet used) 2005-06-21 17:27:58 -08:00
test-bheads Add option to heads to show only heads for current branch. 2007-06-19 08:37:43 -07:00
test-bheads.out Small fixes for 3acdabb0ef1d (hg heads branch) 2007-06-20 17:53:11 -07:00
test-bisect Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 2006-08-22 10:08:42 +02:00
test-bisect.out tests: new test for the bisect extension 2006-08-15 21:49:49 +03:00
test-branches Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 10:40:09 -07:00
test-branches.out Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 10:40:09 -07:00
test-bundle unbundle: accept multiple file arguments 2007-06-24 10:08:38 -05:00
test-bundle-r switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-bundle-r.out transactions: avoid late tear-down (issue641) 2007-07-22 14:53:57 -05:00
test-bundle.out unbundle: accept multiple file arguments 2007-06-24 10:08:38 -05:00
test-cat Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 2006-03-13 13:05:41 +01:00
test-cat.out Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 2006-03-13 13:05:41 +01:00
test-children Add extension to provide the 'hg children' command (with tests) 2007-07-03 12:14:25 +02:00
test-children.out children extension: Don't abort when looking at the null revision. 2007-07-03 12:50:05 +02:00
test-clone changes by John Levon to standardize some erroroutput 2006-02-22 15:57:43 +01:00
test-clone-failure test-clone-failure: fake output upon fifo unavailabity 2007-08-06 09:57:23 +02:00
test-clone-failure.out Show the destionation for clone if not specified manually. 2006-12-09 14:19:52 +01:00
test-clone-pull-corruption Added test cases for repo corruption fixed in e2b47039575f (issue132) 2006-02-22 07:45:14 +01:00
test-clone-pull-corruption.out Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
test-clone-r switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-clone-r.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-clone.out Show the destionation for clone if not specified manually. 2006-12-09 14:19:52 +01:00
test-command-template hg log: Move filtering implicit parents to own method and use it in templater. 2007-07-08 12:52:08 +02:00
test-command-template.out hg log: Move filtering implicit parents to own method and use it in templater. 2007-07-08 12:52:08 +02:00
test-commit tests: expand test-commit a bit to test 'hg commit .' too 2007-03-18 22:49:05 +02:00
test-commit-copy switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-commit-copy.out Revert almost all of 0ab603017f82; add a test 2006-11-18 19:44:42 -02:00
test-commit.out transactions: avoid late tear-down (issue641) 2007-07-22 14:53:57 -05:00
test-committer Abort on empty username so specifying a username can be forced. 2007-01-24 23:04:51 +01:00
test-committer.out Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
test-config-case test-config-case: print only the Section we're interested in. 2007-06-08 23:49:12 -03:00
test-config-case.out Use a case-sensitive version of SafeConfigParser everywhere 2006-10-16 15:38:53 -03:00
test-conflict run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-conflict.out run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-confused-revert revert: require --all to revert all files. 2006-08-21 09:44:52 -07:00
test-confused-revert.out cat: default to working dir parent instead of tip 2006-09-14 19:24:00 -07:00
test-context.py test-context.py: Don't create second repo instance (fixed since 3300640607e3) 2007-08-11 13:17:24 +02:00
test-context.py.out Fixed workingfilectx.date() (found by Thomas Waldmann) with test. 2007-02-23 17:31:00 +01:00
test-convert test-convert: Hide warning about missing subversion bindings. 2007-07-29 19:32:55 +02:00
test-convert.out convert: add test 2007-07-26 13:34:36 -07:00
test-copy switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-copy2 Make hg add foo; hg mv foo bar work. 2007-07-03 03:06:40 -03:00
test-copy2.out improve warning for hg add foo; hg mv foo bar 2007-07-11 19:56:16 -03:00
test-copy-move-merge merge: avoid double deletion mentioned in issue636 2007-08-02 12:29:10 -05:00
test-copy-move-merge.out merge: avoid double deletion mentioned in issue636 2007-08-02 12:29:10 -05:00
test-copy.out switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-debugcomplete fix bash completion of debug commands; add test for debugcomplete 2006-10-08 20:27:23 -03:00
test-debugcomplete.out Fix test-debugcomplete for new --certificate option 2007-07-09 22:35:10 -07:00
test-debugrename Add test for debugrename 2007-06-20 00:09:32 +02:00
test-debugrename.out Add test for debugrename 2007-06-20 00:09:32 +02:00
test-default-push add test for default-push. 2006-06-23 18:23:42 -07:00
test-default-push.out add test for default-push. 2006-06-23 18:23:42 -07:00
test-demandimport test-demandimport: match upper-case hexadecimal 2007-07-05 19:11:38 +02:00
test-demandimport.out demandimport: fix issue579 and add a test 2007-06-18 19:43:26 -05:00
test-diff-binary-file add test for diffing identical binary files 2007-02-17 09:54:58 -02:00
test-diff-binary-file.out git binary patches: don't print the header for identical files 2007-02-17 09:55:00 -02:00
test-diff-hashes use short hashes with diff -v 2006-10-13 15:34:35 -03:00
test-diff-hashes.out use short hashes with diff -v 2006-10-13 15:34:35 -03:00
test-diff-ignore-whitespace diff: correctly handle combinations of whitespace options 2007-07-14 12:44:47 -05:00
test-diff-ignore-whitespace.out diff: correctly handle combinations of whitespace options 2007-07-14 12:44:47 -05:00
test-diff-newlines fix diffs containing embedded "\r". 2006-05-10 10:31:54 -07:00
test-diff-newlines.out fix diffs containing embedded "\r". 2006-05-10 10:31:54 -07:00
test-diff-subdir Add -D/--nodates options to hg diff/export that removes dates from diff headers 2006-09-26 00:05:24 +01:00
test-diff-subdir.out tests: new test for hg diff of a subdirectory only 2006-08-13 23:00:18 +03:00
test-diffdir Remove dummy branch hack from tests 2007-03-13 18:53:23 -05:00
test-diffdir.out Remove dummy branch hack from tests 2007-03-13 18:53:23 -05:00
test-dispatch Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-dispatch.out Fix dispatch error message when not in a repo 2007-06-20 20:13:31 -07:00
test-dispatch.py dispatch: move command dispatching into its own module 2007-08-15 16:55:13 -05:00
test-dispatch.py.out Added test for commands.dispatch (especially 88803a69b24) 2007-08-11 13:34:19 +02:00
test-doctest.py httprepo: quote the path part of the URL 2007-08-06 00:35:06 -03:00
test-double-merge The >| redirection does not exist in plain sh. 2007-08-02 14:51:49 +02:00
test-double-merge.out merge: do early copy to deal with issue636 2007-08-01 12:33:12 -05:00
test-empty Add empty repo test 2005-09-23 17:52:15 -07:00
test-empty-dir Don't use test -e in tests - sh doesn't like it on Solaris 2006-10-18 18:47:50 -03:00
test-empty-dir.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-empty-file Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-empty-file.out Test that we notice the empty files from the second parent during a merge 2006-10-25 02:51:27 -03:00
test-empty-group Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-empty-group.out incoming/outgoing: print the name of the other repo 2007-03-07 15:26:03 -03:00
test-empty.out Show repo's revlog format on verify only if it doesn't match the default format. 2006-04-28 21:52:08 +02:00
test-encode switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-encode.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-encoding Use UTF-8 in .hg/branch 2006-12-10 20:35:28 -02:00
test-encoding.out transactions: avoid late tear-down (issue641) 2007-07-22 14:53:57 -05:00
test-excessive-merge switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-excessive-merge.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-export Make sequence number on hg export start at 1 (as documented for %n). Add test. 2006-12-15 19:09:10 +01:00
test-export.out Don't use node length for calculating revision number length. 2006-12-15 19:30:20 +01:00
test-extdiff Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
test-extdiff.out extdiff: do single file diffs from the wc with no copy 2007-08-06 14:50:57 -07:00
test-extension help: avoid traceback if an extension has only debug commands 2007-07-19 19:43:25 -03:00
test-extension.out help: avoid traceback if an extension has only debug commands 2007-07-19 19:43:25 -03:00
test-extra-filelog-entry Avoid extra filelogs entries. 2007-06-09 01:04:28 -03:00
test-extra-filelog-entry.out Avoid extra filelogs entries. 2007-06-09 01:04:28 -03:00
test-fetch Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 2006-08-22 10:08:42 +02:00
test-fetch.out test-fetch: make output stable 2006-08-08 16:23:02 -07:00
test-filebranch test-filebranch: avoid a shell script 2007-03-27 01:41:16 -03:00
test-filebranch.out merge: shortcircuit filemerge for identical files 2006-10-10 01:16:06 -05:00
test-flags Make sure the changelog mentions files whose flags changed 2007-06-09 01:04:28 -03:00
test-flags.out Avoid extra filelogs entries. 2007-06-09 01:04:28 -03:00
test-git-export git patches: correct handling of filenames with spaces 2007-06-22 19:06:04 -03:00
test-git-export.out git patches: correct handling of filenames with spaces 2007-06-22 19:06:04 -03:00
test-git-import test-git-import: fake executable permissions. 2007-08-06 10:38:07 +02:00
test-git-import.out git patches: correct handling of filenames with spaces 2007-06-22 19:06:04 -03:00
test-globalopts Abort if earlygetopt fails to detect an option. 2007-06-28 16:03:45 +02:00
test-globalopts.out Abort if earlygetopt fails to detect an option. 2007-06-28 16:03:45 +02:00
test-glog Make hg glog abort if unused arguments are given. 2007-06-28 16:18:09 +02:00
test-glog.out Make hg glog abort if unused arguments are given. 2007-06-28 16:18:09 +02:00
test-grep test-grep: use lowercase hg command 2007-08-15 15:30:33 -05:00
test-grep.out test-grep: test issue 685 2007-08-15 16:18:40 +02:00
test-help Further help improvements: 2005-08-06 15:43:12 +01:00
test-help.out unbundle: accept multiple file arguments 2007-06-24 10:08:38 -05:00
test-hgignore Fix re: and glob: patterns in .hgignore (reported by Brad Schick) 2007-07-30 20:01:16 +02:00
test-hgignore.out Fix re: and glob: patterns in .hgignore (reported by Brad Schick) 2007-07-30 20:01:16 +02:00
test-hgrc Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-hgrc.out Add missing test output 2005-10-27 13:48:00 -07:00
test-hgweb hgweb: simple tests 2006-12-19 17:14:45 -08:00
test-hgweb.out hgweb: simple tests 2006-12-19 17:14:45 -08:00
test-hook Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-hook.out Use a weakref for recursive transactions 2007-07-21 16:02:10 -05:00
test-http test-http: use printenv.py 2007-03-26 23:50:01 -03:00
test-http-clone-r switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-http-clone-r.out Testing the new changegroupsubset remote function in the ssh 2006-10-18 02:14:26 -05:00
test-http-proxy Allow for MB/sec transfer rates in test-http-proxy and test-ssh. 2006-08-21 10:46:58 -07:00
test-http-proxy.out Allow for MB/sec transfer rates in test-http-proxy and test-ssh. 2006-08-21 10:46:58 -07:00
test-http.out test-http: use printenv.py 2007-03-26 23:50:01 -03:00
test-hup Fix test-hup for different output of ls on at least MacOS X and Solaris 8. 2006-12-16 23:24:30 +01:00
test-hup.out transactions: avoid late tear-down (issue641) 2007-07-22 14:53:57 -05:00
test-imerge imerge: gussy up dispatcher to support subcommand opts. 2007-08-04 12:26:48 -07:00
test-imerge.out imerge: gussy up dispatcher to support subcommand opts. 2007-08-04 12:26:48 -07:00
test-impexp-branch Alter test to test import --exact to make sure it works with branches. 2007-05-17 20:09:49 -07:00
test-impexp-branch.out Fix up tests for new branch message 2007-06-18 11:13:16 -07:00
test-import Added import test for [PATCH] subject and message body with subject 2007-07-02 22:45:58 +02:00
test-import.out Added import test for [PATCH] subject and message body with subject 2007-07-02 22:45:58 +02:00
test-incoming-outgoing Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm. 2006-12-26 14:17:48 +01:00
test-incoming-outgoing.out merge with stable 2007-06-01 19:49:09 +02:00
test-init test-init: avoid a shell script 2007-03-27 01:41:21 -03:00
test-init.out test-init: avoid a shell script 2007-03-27 01:41:21 -03:00
test-install change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
test-install.out Add some remedies and a username check to debuginstall 2006-12-10 01:05:00 -06:00
test-issue322 Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-issue322.out update tests output 2007-08-02 01:56:08 -03:00
test-issue352 test-issue352: skip tests if platform does not support EOL in paths. 2007-08-06 09:57:23 +02:00
test-issue352.out Leave normalization of patterns to util._matcher 2007-03-10 23:00:46 -03:00
test-issue433 Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-issue433.out add test for issue433 2006-11-28 11:28:45 +01:00
test-issue436 additional fixes for issue436 2006-12-01 16:18:16 -02:00
test-issue522 merge: forcefully mark files that we get from the second parent as dirty 2007-08-23 01:48:29 -03:00
test-issue522.out merge: forcefully mark files that we get from the second parent as dirty 2007-08-23 01:48:29 -03:00
test-issue612 merge: fix adding untracked files on directory rename (issue612) 2007-07-05 16:01:07 -05:00
test-issue612.out merge: fix adding untracked files on directory rename (issue612) 2007-07-05 16:01:07 -05:00
test-issue619 merge: make test for fast-forward merge stricter (issue619) 2007-07-05 13:34:18 -05:00
test-issue619.out merge: make test for fast-forward merge stricter (issue619) 2007-07-05 13:34:18 -05:00
test-issue672 merge: fix a copy detection bug (issue672) 2007-08-12 12:15:10 -03:00
test-issue672.out merge: fix a copy detection bug (issue672) 2007-08-12 12:15:10 -03:00
test-locate locate: don't print "file not found" messages. 2007-04-04 04:22:06 -03:00
test-locate.out locate: don't print "file not found" messages. 2007-04-04 04:22:06 -03:00
test-lock-badness switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-lock-badness.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-log Issue a warning if "-r ." is used with two working directory parents. 2007-06-06 19:05:18 +02:00
test-log.out Issue a warning if "-r ." is used with two working directory parents. 2007-06-06 19:05:18 +02:00
test-manifest manifest: accept -r for rev specification 2007-08-09 19:42:33 -07:00
test-manifest-merging Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm. 2006-12-26 14:17:48 +01:00
test-manifest-merging.out make manifest-merging test reproduceable 2006-10-11 15:52:08 -05:00
test-manifest.out manifest: accept -r for rev specification 2007-08-09 19:42:33 -07:00
test-merge1 test-merge1: avoid a shell script 2007-03-27 01:41:17 -03:00
test-merge1.out Clarify untracked file merge message 2006-11-01 21:47:55 -06:00
test-merge2 Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm. 2006-12-26 14:17:48 +01:00
test-merge2.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-merge3 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 2006-03-13 13:05:41 +01:00
test-merge3.out transitive copy/rename 2006-02-18 07:37:59 -08:00
test-merge4 deprecate 'update -m'. use 'merge' instead. 2006-05-14 21:07:34 -07:00
test-merge4.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-merge5 Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130 2006-10-31 13:02:49 +01:00
test-merge5.out Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130 2006-10-31 13:02:49 +01:00
test-merge6 test-merge6: avoid a shell script 2007-03-27 01:41:18 -03:00
test-merge6.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-merge7 run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-merge7.out run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-merge8 Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates) 2006-10-14 10:53:29 +02:00
test-merge8.out merge: fix spurious merges for copies in linear updates 2007-05-08 02:59:13 -05:00
test-merge9 merge: fix small bug with a failed merge across a rename 2007-06-22 20:44:40 -03:00
test-merge9.out merge: do early copy to deal with issue636 2007-08-01 12:33:12 -05:00
test-merge10 tests: add merge test for changeset 32f6be9c37df 2007-06-23 22:43:46 -05:00
test-merge10.out tests: add merge test for changeset 32f6be9c37df 2007-06-23 22:43:46 -05:00
test-merge-commit change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
test-merge-commit.out filecommit: don't forget the local parent on a merge with a local rename 2007-01-30 19:09:08 -02:00
test-merge-default merge with other head by default, not tip. 2006-08-15 11:38:07 -07:00
test-merge-default.out merge with other head by default, not tip. 2006-08-15 11:38:07 -07:00
test-merge-local change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
test-merge-local.out Merge with stable 2007-05-08 11:42:48 -05:00
test-merge-revert change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
test-merge-revert2 run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-merge-revert2.out run-tests.py: pass -L/--label to simplemerge 2007-04-28 17:55:45 -03:00
test-merge-revert.out merge: if filemerge skips merge, report as updated 2006-10-15 16:18:09 -05:00
test-mq Fix bashism and remove useless use of cat. 2007-07-29 18:53:09 +02:00
test-mq-caches Move branches.cache to branch.cache 2007-03-13 15:18:10 -05:00
test-mq-caches.out Move branches.cache to branch.cache 2007-03-13 15:18:10 -05:00
test-mq-guards Test qtop breaking when series ends with guarded patches. 2007-05-06 18:19:25 +02:00
test-mq-guards.out Test qtop breaking when series ends with guarded patches. 2007-05-06 18:19:25 +02:00
test-mq-merge Make mergepatch save queue now that qpush isn't. 2007-05-13 19:15:54 -07:00
test-mq-merge.out Make mergepatch save queue now that qpush isn't. 2007-05-13 19:15:54 -07:00
test-mq-qdelete mq: require patch argument or revision for qdelete 2007-06-28 08:42:43 -07:00
test-mq-qdelete.out mq: more qdelete help text tweaks 2007-06-28 09:19:08 -07:00
test-mq-qdiff Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 2006-08-22 10:08:42 +02:00
test-mq-qdiff.out tests: new test for mq qdiff command 2006-08-15 20:59:55 +03:00
test-mq-qgoto mq: add qgoto command. 2007-05-08 13:10:27 -07:00
test-mq-qgoto.out mq: add qgoto command. 2007-05-08 13:10:27 -07:00
test-mq-qnew-twice Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 2006-08-22 10:08:42 +02:00
test-mq-qnew-twice.out Fix test-mq-qnew-twice exit code and output. 2006-07-28 09:00:30 +02:00
test-mq-qpush-fail mq: test that qpush cleans things up when it fails 2007-06-21 00:34:14 -03:00
test-mq-qpush-fail.out mq: test that qpush cleans things up when it fails 2007-06-21 00:34:14 -03:00
test-mq-qrefresh tests: add new test; test-mq-qrefresh 2006-09-20 21:44:35 +02:00
test-mq-qrefresh-replace-log-message Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-mq-qrefresh-replace-log-message.out MQ: uniformise message and logfile option. 2006-07-26 20:11:54 +02:00
test-mq-qrefresh.out tests: add new test; test-mq-qrefresh 2006-09-20 21:44:35 +02:00
test-mq-qrename Make qrename handle directory targets; closes #333. 2006-09-13 08:57:08 -07:00
test-mq-qrename.out Make qrename handle directory targets; closes #333. 2006-09-13 08:57:08 -07:00
test-mq-qsave Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc 2006-08-22 10:08:42 +02:00
test-mq-qsave.out Add basic qsave/qrestore test. 2006-08-07 14:48:24 -07:00
test-mq-symlinks mq: teach qpop about symlinks 2007-08-09 20:16:00 -07:00
test-mq-symlinks.out mq: teach qpop about symlinks 2007-08-09 20:16:00 -07:00
test-mq.out Test qnew --git 2007-07-28 20:15:54 +02:00
test-nested-repo path_auditor: cache names of audited directories 2007-08-18 21:36:10 -03:00
test-nested-repo.out path_auditor: cache names of audited directories 2007-08-18 21:36:10 -03:00
test-newbranch Add fast-forward branch merging 2007-05-06 20:27:45 -07:00
test-newbranch.out Change branches to sort 'active' branches first, and add an option to show only active branches. 2007-06-21 10:40:09 -07:00
test-no-symlinks Hide absolute path from test-no-symlinks output. 2007-08-11 12:36:04 +02:00
test-no-symlinks.hg test-no-symlinks: rename .bundle into .hg for consistency. 2007-08-09 23:14:50 +02:00
test-no-symlinks.out Hide absolute path from test-no-symlinks output. 2007-08-11 12:36:04 +02:00
test-notfound Addes test for error messages when operating on non-existing files. 2005-08-15 06:58:25 +01:00
test-notfound.out Fix up failing tests. 2005-09-01 07:37:49 -07:00
test-notify ui: make readsections() abort when configuration cannot be read. 2007-06-03 22:11:25 +02:00
test-notify.out ui: make readsections() abort when configuration cannot be read. 2007-06-03 22:11:25 +02:00
test-oldcgi test-oldcgi: replace shebangs with explicit python calls to help pysh. 2007-08-06 09:57:23 +02:00
test-oldcgi.out Fix new tests to be better. In particular, fix webraw test to 2006-06-30 08:45:52 -07:00
test-parentrevspec Quote ^ and ~ chars in test-parentrevspec. 2007-08-18 20:21:14 +02:00
test-parentrevspec.out Add parentrevspec extension 2007-08-17 17:33:27 -03:00
test-parents hg parents: don't pass an OS-specific path to repo.filectx 2007-07-17 09:08:29 -03:00
test-parents.out hg parents: don't pass an OS-specific path to repo.filectx 2007-07-17 09:08:29 -03:00
test-parse-date util.strdate: assume local time when no timezone specified 2006-10-03 12:33:18 +02:00
test-parse-date.out transactions: avoid late tear-down (issue641) 2007-07-22 14:53:57 -05:00
test-parseindex switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-parseindex.out add test for revlog.parseindex 2006-05-14 18:37:50 -03:00
test-patch Add tests for ui.patch regression. 2007-06-20 23:32:31 +02:00
test-patch.out Add tests for ui.patch regression. 2007-06-20 23:32:31 +02:00
test-patchbomb test-patchbomb: fix non-existing --date parameter and filtering regexps. 2007-06-17 19:39:47 +02:00
test-patchbomb.out Merge with crew-stable 2007-06-17 20:08:06 +02:00
test-permissions switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-permissions.out Show repo's revlog format on verify only if it doesn't match the default format. 2006-04-28 21:52:08 +02:00
test-profile test-profile: fix grep, check hotshot availability 2007-08-14 18:53:45 +02:00
test-profile.out Test --time, --profile and --lsprof 2007-08-14 16:27:35 +02:00
test-pull issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
test-pull-permission switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-pull-permission.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-pull-pull-corruption Added test cases for repo corruption fixed in e2b47039575f (issue132) 2006-02-22 07:45:14 +01:00
test-pull-pull-corruption2 Wait for first pull to be completed before doing verify. 2006-06-28 12:29:48 +02:00
test-pull-pull-corruption2.out Show repo's revlog format on verify only if it doesn't match the default format. 2006-04-28 21:52:08 +02:00
test-pull-pull-corruption.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-pull-update Update on pull -u when heads were closed (fixes issue666). 2007-08-06 20:25:50 +02:00
test-pull-update.out Update on pull -u when heads were closed (fixes issue666). 2007-08-06 20:25:50 +02:00
test-pull.out issue 622: pull/unbundle -u updates to default branch if repo was empty 2007-07-16 18:01:20 -07:00
test-purge purge: don't delete ignored files if --all is not specified 2007-06-06 22:17:35 +02:00
test-purge.out purge: don't delete ignored files if --all is not specified 2007-06-06 22:17:35 +02:00
test-push-hook-lock Create local ui object per repository, so .hg/hgrc don't get mixed. 2006-03-06 17:47:41 +01:00
test-push-hook-lock.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-push-http test-push-http: use printenv.py 2007-03-26 23:50:00 -03:00
test-push-http.out test-push-http: use printenv.py 2007-03-26 23:50:00 -03:00
test-push-r switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-push-r.out Make hg update more verbose by default (issue12) 2006-05-02 18:44:02 +02:00
test-push-warn fix calculation of new heads added during push with -r 2006-12-17 05:00:22 +01:00
test-push-warn.out fix calculation of new heads added during push with -r 2006-12-17 05:00:22 +01:00
test-rawcommit1 make manifest friendlier 2006-11-30 22:38:48 -06:00
test-rawcommit1.out Don't show empty list of files in hg log -v. 2006-10-18 12:26:12 +02:00
test-rebuildstate dirstate: fix rebuild; add a test 2007-08-05 23:04:56 -03:00
test-rebuildstate.out merge with crew-stable 2007-08-06 01:00:10 -03:00
test-record record: improve docs, improve prompts 2007-08-09 17:29:16 -07:00
test-record.out record: improve docs, improve prompts 2007-08-09 17:29:16 -07:00
test-remove Also restore old rm -A behavior for inexact patterns 2007-04-30 09:32:44 -07:00
test-remove.out Also restore old rm -A behavior for inexact patterns 2007-04-30 09:32:44 -07:00
test-rename test-rename: use hg status -C; don't use hg debugstate | grep copy 2007-07-03 03:06:40 -03:00
test-rename-dir-merge Fix test-rename-dir-merge for different implementations of ls. 2006-12-01 15:40:23 +01:00
test-rename-dir-merge2 merge: fix renaming of subdirectories under renamed directories 2007-02-27 16:20:06 -06:00
test-rename-dir-merge2.out merge: fix spurious merges for copies in linear updates 2007-05-08 02:59:13 -05:00
test-rename-dir-merge.out merge: fix spurious merges for copies in linear updates 2007-05-08 02:59:13 -05:00
test-rename-merge1 switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
test-rename-merge1.out merge: do early copy to deal with issue636 2007-08-01 12:33:12 -05:00
test-rename-merge2 Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-rename-merge2.out merge: do early copy to deal with issue636 2007-08-01 12:33:12 -05:00
test-rename.out test-rename: use hg status -C; don't use hg debugstate | grep copy 2007-07-03 03:06:40 -03:00
test-requires add "requires" file to the repo, specifying the requirements 2006-12-10 00:06:59 +01:00
test-requires.out add "requires" file to the repo, specifying the requirements 2006-12-10 00:06:59 +01:00
test-revert Merge some matcher fixes/cleanups and add some more hg locate tests 2007-03-16 22:58:49 -03:00
test-revert-unknown revert: require --all to revert all files. 2006-08-21 09:44:52 -07:00
test-revert-unknown.out small changes to revert command. 2006-04-03 10:02:09 -07:00
test-revert.out Merge some matcher fixes/cleanups and add some more hg locate tests 2007-03-16 22:58:49 -03:00
test-ro-message deprecate 'update -m'. use 'merge' instead. 2006-05-14 21:07:34 -07:00
test-ro-message.out Fixed OSError "No such file or directory: None" and make IOError consistent. 2006-09-11 10:23:23 +02:00
test-rollback deprecate undo command, replace with rollback command. 2006-05-08 14:19:05 -07:00
test-rollback.out deprecate undo command, replace with rollback command. 2006-05-08 14:19:05 -07:00
test-serve serve: respect settings from .hg/hgrc 2007-07-11 19:56:16 -03:00
test-serve.out serve: respect settings from .hg/hgrc 2007-07-11 19:56:16 -03:00
test-simple-update make manifest friendlier 2006-11-30 22:38:48 -06:00
test-simple-update.out addremove: do not deprecate. 2006-07-23 09:04:14 -07:00
test-simplemerge-cmd Use python instead of shell printf with \x for test-simplemerge-cmd 2007-04-19 12:47:55 +02:00
test-simplemerge-cmd.out Remove trailing spaces 2007-08-07 10:24:33 +02:00
test-simplemerge.py Cleanup of whitespace, indentation and line continuation. 2007-06-19 08:06:37 +02:00
test-simplemerge.py.out actually port simplemerge to hg 2007-04-16 20:17:39 -03:00
test-ssh test-ssh: avoid a shell script 2007-03-27 01:41:22 -03:00
test-ssh-clone-r test-ssh-clone-r: avoid a shell script 2007-03-27 01:41:23 -03:00
test-ssh-clone-r.out Testing the new changegroupsubset remote function in the ssh 2006-10-18 02:14:26 -05:00
test-ssh.out dispatch: use the repo path found by early parsing 2007-06-11 21:09:24 -05:00
test-static-http test-static-http: use printenv.py 2007-03-26 23:50:03 -03:00
test-static-http.out test-static-http: use printenv.py 2007-03-26 23:50:03 -03:00
test-status Removed unknown option -t in test-status 2006-12-08 23:33:32 +01:00
test-status.out Removed unknown option -t in test-status 2006-12-08 23:33:32 +01:00
test-strict Make test-strict append to $HGRCPATH, like other tests do since e6e7d87cb388. 2006-08-22 10:20:21 +02:00
test-strict.out Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output 2007-04-07 04:27:55 -03:00
test-symlink-basic test-symlink-basic: require symlinks availability 2007-07-15 14:09:56 +02:00
test-symlink-basic.out commands.commit: symlinks are supported 2007-06-13 19:15:58 -03:00
test-symlink-root test-symlink-basic: require symlinks availability 2007-07-15 14:09:56 +02:00
test-symlink-root.out Fix accessing the repo through a symlink. 2007-02-15 05:18:23 -02:00
test-symlinks patch: add git symlink support 2007-08-04 23:07:52 -07:00
test-symlinks.out patch: add git symlink support 2007-08-04 23:07:52 -07:00
test-tag fix test-tag on Solaris 2007-07-18 16:41:45 +02:00
test-tag.out tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) 2007-07-16 20:15:03 -07:00
test-tags Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-tags.out identify: show nullid for empty repo 2007-06-21 11:42:39 -05:00
test-transplant transplant: test non-local source 2007-01-30 11:40:17 -08:00
test-transplant.out Update test output to reflect small changes in patch chattiness. 2007-07-17 09:39:30 -07:00
test-trusted.py Removed trailing whitespace and tabs from python files 2007-06-06 20:22:52 +02:00
test-trusted.py.out save settings from untrusted config files in a separate configparser 2006-10-26 19:25:45 +02:00
test-ui-config dispatch: move command dispatching into its own module 2007-08-15 16:55:13 -05:00
test-ui-config.out Catch illegal boolean values in hgrc nicely. 2007-06-26 20:37:15 +02:00
test-ui-verbosity ui.py: untangle updateopts 2006-10-10 18:43:20 -03:00
test-ui-verbosity.out update ui.quiet/verbose/debug/interactive every time the config changes 2006-10-10 18:43:20 -03:00
test-unrelated-pull update test for unrelated repo. 2006-03-14 23:00:45 -08:00
test-unrelated-pull.out Fix up parent display in logging 2006-11-07 14:04:15 -06:00
test-up-local-change Kill trailing spaces 2007-06-21 09:25:49 +02:00
test-up-local-change.out Backed out changeset 0fc94973be4ffeb0b5ace8a920dec676a9a51130 2006-10-31 13:02:49 +01:00
test-update-reverse Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 2006-03-13 13:05:41 +01:00
test-update-reverse.out merge: various tidying 2006-10-10 02:15:20 -05:00
test-walk Merge last few matcher/locate fixes. 2007-04-04 04:22:08 -03:00
test-walk.out Removed trailing \n in calls to util.Abort() 2007-06-09 13:25:54 +02:00
test-webraw tests: add timeouts, make run-tests.py clean up dead daemon processes 2006-07-06 11:45:34 -07:00
test-webraw.out test-webraw: do not store hostname in test output 2006-06-30 22:04:02 -07:00
tinyproxy.py http: fix many problems with url parsing and auth. added proxy test. 2006-05-22 15:42:49 -07:00

README 

To run the tests, do:

cd tests/
python run-tests.py

See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
more information on writing tests.