Commit Graph

3519 Commits

Author SHA1 Message Date
Martin Geisler
77e923da30 merge with stable 2010-09-10 01:04:32 +02:00
Martin Geisler
074f6b21a9 convert: help string cleanups 2010-09-10 00:36:01 +02:00
Martin Geisler
6765286f85 convert: better quoting in help text 2010-09-10 00:30:36 +02:00
Martin Geisler
e1be8b3f05 convert: show example splice, author, and branch map entries in help
Also document that

- empty lines are skipped and comment are supported in author map

- whitespace is not allowed in branch map entries since we split on it
  when parsing the file
2010-09-10 00:22:46 +02:00
Martin Geisler
e783fa28e6 convert: better grouping of command line flags in help
We normally put related command line flags after one another.
2010-09-10 00:07:38 +02:00
Dirkjan Ochtman
fcd515c23a hgweb: support very simple caching model (issue1845) 2010-09-08 15:23:48 +02:00
Dirkjan Ochtman
ea62f97a35 tests: extend get-with-headers to support cache testing 2010-09-08 15:11:35 +02:00
Dirkjan Ochtman
e0920e95c8 tests: fix test output for test-hgweb-no* tests 2010-09-08 15:19:35 +02:00
Dirkjan Ochtman
88a33c641e tests: rename test for better grouping 2010-09-08 15:18:33 +02:00
Dirkjan Ochtman
7846080481 bisect: warn about ending on a merge with only one side marked 2010-09-08 13:48:25 +02:00
Dirkjan Ochtman
fe46f658e0 bisect: allow revsets in addition to single revs (issue2360) 2010-09-08 12:53:15 +02:00
Martin Geisler
5cb4b1f5eb subrepos: handle modified but uncommitted .hgsub 2010-09-07 16:23:55 +02:00
Thomas Arendsen Hein
3dfb90c158 merge with stable 2010-09-06 07:14:18 +02:00
Thomas Arendsen Hein
48cd219ead verify: fix "missing revlog!" errors for revlog format v0 and add test
With revlog format v0 the .d files are empty if the only revision stored is an
empty file. Since Mercurial can no longer create format v0 repositories, but
still use it, add a script which creates a repository with a single empty file.
This can be used in other tests if wanted.
2010-09-05 22:32:11 +02:00
Martin Geisler
e9c2a20771 diff: recurse into subrepositories with --subrepos/-S flag 2010-09-03 12:58:51 +02:00
Martin Geisler
f2188b5b90 status: recurse into subrepositories with --subrepos/-S flag 2010-09-03 12:58:51 +02:00
Martin Geisler
e0e3bf4835 match: add narrowmatcher class
This class can be used to adapt an existing match object to a new
match object that only cares about paths within a certain
subdirectory.
2010-09-03 12:58:51 +02:00
Martin Geisler
8d9b4bc19b tests: remove unneeded -u flags 2010-09-02 23:45:47 +02:00
Martin Geisler
ae274ea65e merge with stable 2010-09-02 23:36:43 +02:00
Mads Kiilerich
953f8baea9 test-convert-cvs: add a sleep to make test more stable
The recent addition of fuzzy tests introduced a new cvs commit which sometimes
fails.

This adds a sleep to make sure that cvs notices that the file has changed,
similar to how it is done in other tests.
2010-09-02 22:38:12 +02:00
Adrian Buehlmann
07c9e9c502 tests: unify test-empty-file 2010-09-02 18:12:07 +02:00
Adrian Buehlmann
14ddfc9daf tests: unify test-empty-dir 2010-09-02 17:32:22 +02:00
Adrian Buehlmann
9686dc8dba tests: unify test-dispatch 2010-09-02 17:13:23 +02:00
Martin Geisler
cc612c476f tests: remove unneeded -d flags
Many tests fixed the commit date of their changesets at '1000000 0' or
similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
the default run-tests.py installs.

Removing the unnecessary flag removes some clutter and will hopefully
make it clearer what the tests are really trying to test. Some tests
did not even change their output when the dates were changed, in which
case the -d flag was truly irrelevant.

Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
since they may make the test easier to understand.
2010-09-02 23:22:51 +02:00
Martin Geisler
e8c36ac440 test-merge5: removed unnecessary parts of test
- no need to initialize a new directory
- no need to fix the commit time, already done by run-tests
- no need to exit 0, use exit code from hg instead
- better spacing around comments
2010-09-02 22:17:22 +02:00
Brodie Rao
c28a67789d test-merge5: ensure updating to tip across branches is tested
When doing "hg update" across branches (without any revision
specified), hg will abort and ask the user to merge or do hg update
-c. This tests for that error.
2010-09-02 12:48:46 -04:00
Adrian Buehlmann
615bb78528 tests: unify test-diff-binary-file 2010-09-02 14:45:16 +02:00
Adrian Buehlmann
1997176994 tests: unify test-diff-copy-depth 2010-09-02 15:08:36 +02:00
Adrian Buehlmann
7fa54291a7 tests: unify test-diff-upgrade 2010-09-02 15:39:55 +02:00
Dan Villiom Podlaski Christiansen
6ba6fcecca tests: unify test-convert-hg-startrev. 2010-09-02 14:58:47 +02:00
Adrian Buehlmann
6a17e48e91 tests: unify test-diffstat 2010-09-02 16:29:04 +02:00
Adrian Buehlmann
6902104374 tests: unify test-diff-newlines 2010-09-02 11:20:23 +02:00
Adrian Buehlmann
e7268dbf77 tests: unify test-diff-unified 2010-08-31 11:57:02 +02:00
Adrian Buehlmann
f0866737e5 tests: unify test-diff-subdir 2010-08-31 11:14:48 +02:00
Adrian Buehlmann
cd9378dae4 tests: unify test-diff-reverse 2010-08-31 10:21:24 +02:00
Adrian Buehlmann
84dc4ff5aa tests: unify test-diff-ignore-whitespace 2010-08-30 23:13:52 +02:00
Brodie Rao
16ed03215d remove: properly set return code when warnings are issued
This removes the warn() function in favor of issuing warnings directly
for each kind of file that Mercurial won't remove.

This also uses three separate translatable strings instead of using
string formatting to build the message. This should make it easier to
localize.
2010-08-30 20:27:25 -04:00
Adrian Buehlmann
d95072cb35 tests: unify test-diff-hashes 2010-08-30 16:52:21 +02:00
Adrian Buehlmann
eb3a2da1b5 tests: unify test-diff-change 2010-08-30 14:38:15 +02:00
Brodie Rao
d1c9097d78 test-serve: ensure KILLQUIETLY is only used once
31d8c647c08d introduced a feature to the hgserve() function that
suppresses errors from kill(1). It wrongly assumed that setting an
environment variable when calling a function would make it local to
the function. It ended up suppressing kill errors for every call
thereafter.

This patch sets KILLQUIETLY=N after use.
2010-08-30 11:16:21 -04:00
Martin Geisler
516e74e526 merge with stable 2010-09-01 12:28:34 +02:00
Martin Geisler
6a3762a95e commit: sort subrepos before committing for stable test output 2010-08-31 16:36:31 +02:00
Nicolas Dumazet
c78ce594b9 tests: unify test-interhg 2010-08-30 19:05:13 +09:00
Nicolas Dumazet
38080b9530 test-custom-filter: heredoc is not required for single line operations 2010-08-31 15:47:13 +09:00
Nicolas Dumazet
6677993ce8 tests: unify test-custom-filters 2010-08-30 18:57:48 +09:00
Nicolas Dumazet
0c1ae173a8 tests: unify test-parse-date 2010-08-30 18:55:00 +09:00
Nicolas Dumazet
918135815e tests: unify test-purge 2010-08-30 18:50:44 +09:00
Nicolas Dumazet
4f9a67f2a4 tests: unify test-rebuildstate 2010-08-30 18:47:02 +09:00
Nicolas Dumazet
ef34c90305 tests: unify test-up-local-change 2010-08-30 14:16:56 +09:00
Nicolas Dumazet
7510c5056a tests: unify test-impexp-branch 2010-08-30 14:13:36 +09:00