Matt Mackall
d95a37b8f2
tests: unify test-template-engine
2010-09-26 13:44:49 -05:00
Matt Mackall
1d248a919b
tests: unify test-strip-cross
2010-09-26 13:44:49 -05:00
Matt Mackall
9d8af499bd
tests: unify test-static-http
2010-09-26 13:44:49 -05:00
Matt Mackall
c81487116d
tests: unify test-ssh-clone-r
2010-09-26 13:44:49 -05:00
Matt Mackall
092e9a2cb5
tests: unify test-ssh
2010-09-26 13:44:49 -05:00
Matt Mackall
7e3ddf47b5
tests: unify test-simplemerge-cmd
2010-09-26 13:44:49 -05:00
Matt Mackall
89a918b5da
tests: unify test-share
2010-09-26 13:44:49 -05:00
Matt Mackall
68c0c156e4
tests: unify test-schemes
2010-09-26 13:44:49 -05:00
Matt Mackall
18d4a2f14c
tests: unify test-rollback
2010-09-26 13:44:49 -05:00
Matt Mackall
c4877b48a6
tests: unify test-rename-merge2
2010-09-26 13:44:49 -05:00
Matt Mackall
835ef7f5b6
tests: unify test-push-http
2010-09-26 13:44:49 -05:00
Matt Mackall
8f1a396c5b
tests: unify test-pull-pull-corruption2
2010-09-26 13:44:49 -05:00
Matt Mackall
288dacfe0c
tests: unify test-pull-pull-corruption
2010-09-26 13:44:49 -05:00
Matt Mackall
b6427e2043
tests: unify test-pull-http
2010-09-26 13:44:49 -05:00
Matt Mackall
5cf7b705da
tests: unify test-progress
2010-09-26 13:44:49 -05:00
Matt Mackall
eaf44b6090
tests: unify test-profile
2010-09-26 13:44:49 -05:00
Matt Mackall
8eb9149e28
tests: unify test-patch-offset
2010-09-26 13:44:49 -05:00
Matt Mackall
908997b892
tests: unify test-parseindex
2010-09-26 13:44:49 -05:00
Matt Mackall
b8ac6be918
tests: unify test-parentrevspec
2010-09-26 13:44:49 -05:00
Matt Mackall
598f022860
tests: unify test-notify-changegroup
2010-09-26 13:44:49 -05:00
Matt Mackall
2c5903de9c
tests: unify test-notify
2010-09-26 13:44:42 -05:00
Matt Mackall
e72d74ff6f
tests: unify test-oldcgi
2010-09-26 13:43:21 -05:00
Matt Mackall
e43a0a8d41
tests: unify test-newercgi
2010-09-26 13:43:21 -05:00
Matt Mackall
fc52a2522d
tests: unify test-newcgi
2010-09-26 13:43:21 -05:00
Matt Mackall
3d1216fcbd
tests: unify test-mv-cp-st-diff
2010-09-26 13:43:21 -05:00
Matt Mackall
f54c1c0030
tests: unify test-mq-qrefresh-replace-log-message
2010-09-26 13:43:21 -05:00
Matt Mackall
6f39334d7e
tests: unify test-mq-qpush-fail
2010-09-26 13:43:21 -05:00
Matt Mackall
0daacba06d
tests: unify test-mq-qnew
2010-09-26 13:43:21 -05:00
Matt Mackall
d77f34e36c
tests: unify test-mq-qimport-fail-cleanup
2010-09-26 13:43:21 -05:00
Matt Mackall
b5561218c7
tests: unify test-mq-qimport
2010-09-26 13:43:21 -05:00
Matt Mackall
1ce94c5cc2
tests: unify test-mq-qclone-http
2010-09-26 13:43:21 -05:00
Matt Mackall
22c4e194f2
tests: unify test-mq-header-from
2010-09-26 13:43:21 -05:00
Matt Mackall
fab65c3e1b
tests: unify test-mq-header-date
2010-09-26 13:43:21 -05:00
Matt Mackall
40e826de5c
tests: unify test-merge-tools
2010-09-26 13:43:21 -05:00
Matt Mackall
3405f1e40a
tests: unify test-merge-symlinks
2010-09-26 13:43:21 -05:00
Matt Mackall
92e256d74f
tests: unify test-mactext
2010-09-26 13:43:21 -05:00
Matt Mackall
d9dad8a1dd
tests: unify test-inotify-lookup
2010-09-26 13:43:21 -05:00
Matt Mackall
82fe16d228
tests: unify test-inotify-issue1556
2010-09-26 13:43:21 -05:00
Matt Mackall
435d16107f
tests: unify test-inotify-issue1542
2010-09-26 13:43:21 -05:00
Matt Mackall
14ae48049d
tests: unify test-inotify-issue1371
2010-09-26 13:43:21 -05:00
Matt Mackall
56def4ddeb
tests: unify test-inotify-issue1208
2010-09-26 13:43:21 -05:00
Matt Mackall
5afb2ea07e
tests: unify test-inotify-dirty-dirstate
2010-09-26 13:43:21 -05:00
Matt Mackall
14e132f79f
tests: unify test-inotify-debuginotify
2010-09-26 13:43:21 -05:00
Matt Mackall
bf32ce9bfe
tests: unify test-inotify
2010-09-26 13:43:21 -05:00
Matt Mackall
ba3e09fa61
tests: unify test-http-proxy
2010-09-26 13:43:21 -05:00
Matt Mackall
1bce7d5d55
tests: unify test-http-clone-r
2010-09-26 13:43:21 -05:00
Matt Mackall
6124b16aa6
tests: unify test-http-branchmap
2010-09-26 13:43:08 -05:00
Matt Mackall
692a52d686
tests: unify test-http
2010-09-26 13:41:32 -05:00
Matt Mackall
48ba08be0f
tests: unify test-highlight
2010-09-26 13:41:32 -05:00
Matt Mackall
c3c099cc1c
tests: unify test-hgwebdirsym
2010-09-26 13:41:32 -05:00
Matt Mackall
45ed2f6bf8
tests: unify test-hgwebdir
2010-09-26 13:41:32 -05:00
Matt Mackall
eebee9e8b6
tests: unify test-hgweb-removed
2010-09-26 13:41:32 -05:00
Matt Mackall
a8e19fc65a
tests: unify test-hgweb-raw
2010-09-26 13:41:32 -05:00
Matt Mackall
aa59a56f47
tests: unify test-hgweb-non-interactive
2010-09-26 13:41:32 -05:00
Matt Mackall
757e43c6b1
tests: unify test-hgweb-no-request-uri
2010-09-26 13:41:32 -05:00
Matt Mackall
731bea8c37
tests: unify test-hgweb-no-path-info
2010-09-26 13:41:32 -05:00
Matt Mackall
ca4b75e508
tests: unify test-hgweb-filelog
2010-09-26 13:41:32 -05:00
Matt Mackall
fc835388a9
tests: unify test-hgweb-empty
2010-09-26 13:41:32 -05:00
Matt Mackall
fb736725c6
tests: unify test-hgweb-diffs
2010-09-26 13:41:32 -05:00
Matt Mackall
f2ac74fdb2
tests: unify test-hgweb-descend-empties
2010-09-26 13:41:32 -05:00
Matt Mackall
78c88b19f8
tests: unify test-hgweb-commands
2010-09-26 13:41:32 -05:00
Matt Mackall
b83e39df28
tests: unify test-hgweb
2010-09-26 13:41:32 -05:00
Matt Mackall
661bd03f12
tests: unify test-hgk
2010-09-26 13:41:32 -05:00
Matt Mackall
8043d43725
tests: unify test-hghave
2010-09-26 13:41:32 -05:00
Matt Mackall
e54acc7061
tests: unify test-hgcia
2010-09-26 13:41:32 -05:00
Matt Mackall
dcc1587922
tests: unify test-gpg
2010-09-26 13:41:32 -05:00
Matt Mackall
a5658319f3
tests: unify test-gendoc
2010-09-26 13:41:32 -05:00
Matt Mackall
7e404c1bcc
tests: unify test-fetch
2010-09-26 13:41:32 -05:00
Matt Mackall
17dbdccf9a
tests: unify test-eolfilename
2010-09-26 13:41:32 -05:00
Matt Mackall
c0b56d138a
tests: unify test-eol-update
2010-09-26 13:41:32 -05:00
Matt Mackall
7b5f9a10ba
tests: unify test-eol-hook
2010-09-26 13:41:32 -05:00
Matt Mackall
cbb7ec7a2d
tests: unify test-eol-clone
2010-09-26 13:41:32 -05:00
Matt Mackall
08bab54997
tests: unify test-eol-add
2010-09-26 13:41:32 -05:00
Matt Mackall
43943f2ecb
tests: unify test-eol-patch
2010-09-26 13:41:32 -05:00
Matt Mackall
eb2a743084
tests: unify test-eol
2010-09-26 13:41:32 -05:00
Matt Mackall
589dbb9433
tests: unify test-encoding-align
2010-09-26 13:41:32 -05:00
Matt Mackall
048deb9ab0
tests: unify test-encoding
2010-09-26 13:41:32 -05:00
Matt Mackall
0d2bcd1b2a
tests: unify test-encode
2010-09-26 13:41:32 -05:00
Matt Mackall
6c4eda22f1
tests: unify test-diff-color
2010-09-26 13:41:32 -05:00
Matt Mackall
49a96309a7
tests: unify test-ssh
2010-09-26 13:41:32 -05:00
Matt Mackall
6df5dbf1c0
tests: unify test-hup
2010-09-26 13:41:32 -05:00
Matt Mackall
cd62df7450
tests: unify test-clone-pull-corruption
2010-09-26 13:41:32 -05:00
Matt Mackall
1801bd1e27
tests: unify test-clone-failure
2010-09-26 13:41:17 -05:00
Matt Mackall
91dd5557d4
tests: unify test-clone-cgi
2010-09-26 13:11:52 -05:00
Brodie Rao
e7c754957b
test-ssh: test absolute paths in SSH URLs
2010-09-24 15:50:57 -05:00
Brodie Rao
2104af5ee2
revset: support raw string literals
...
This adds support for r'...' and r"..." as string literals. Strings
with the "r" prefix will not have their escape characters interpreted.
This is especially useful for grep(), where, with regular string
literals, \number is interpreted as an octal escape code, and \b is
interpreted as the backspace character (\x08).
2010-09-24 15:36:53 -05:00
Matt Mackall
04e06cefd9
tests: fold darcs test repository into a bundle
2010-09-26 13:11:31 -05:00
Mads Kiilerich
ea28311c45
tests: avoid checking the exitcode of false
...
Solaris false returns 255 instead of 1, so we remove one unneeded instance and
replaces another with (exit 1) as suggested by Brodie Rao.
2010-09-25 21:52:17 +02:00
Mads Kiilerich
f8b22bcaa0
test-rename: accept solaris diff
...
Solaris diff gives
@@ -1,1 +1,1 @@
instead of
@@ -1 +1 @@
2010-09-25 02:35:36 +02:00
Mads Kiilerich
9d449710b0
test-subrepo-svn: restore expr functionality for solaris
...
Cleanup in 131a3b518403 removed a syntactically incorrect and apparently
unnecessary escape of / for expr - but solaris needs it.
2010-09-25 02:35:35 +02:00
Mads Kiilerich
ed06ff3f48
test-serve: fix test for binding to low named port on solaris
...
Solaris do not know the service called http, so we use echo instead.
Trying to define KILLQUIETLY when running the hgserve function didn't set the
value within the function. Now we set the variable before calling the function.
2010-09-25 02:35:32 +02:00
Erik Zielke
ddbd88fdcf
incoming/outgoing: Fix recursion on sub repositories
...
Incoming and outgoing are fixed so they go through the whole three of
repositories instead of only visiting first level of sub repositories.
2010-09-24 12:00:55 +02:00
Martin Geisler
3d112b3042
tests: added a short description to issue numbers
...
Many tests already had a short line to describe what IssueXXX is
about. I find that quite useful when reading a test.
2010-09-24 10:13:49 +02:00
Mads Kiilerich
4f78ca6825
merge with stable
2010-09-24 03:04:14 +02:00
Patrick Mezard
bb3259c957
Merge with stable
2010-09-24 00:17:04 +02:00
Christian Ebert
3fb88c8dbb
Use more note admonitions in help texts
2010-09-23 16:31:38 +02:00
Erik Zielke
c732a9771b
Use note admonition
2010-09-22 16:23:55 +02:00
Erik Zielke
208cfeec63
minirst: Support for admonitions
...
The old asciidoc format supported something like this,
this is why there is NOTE: scattered here and there.
2010-09-22 15:51:59 +02:00
Mads Kiilerich
82136a3aba
merge with stable
2010-09-23 01:59:02 +02:00
Matt Mackall
b05cd46be9
merge with stable
2010-09-22 18:29:41 -05:00
Matt Mackall
430e769c2b
tests: various fixes for new unified test pattern format
2010-09-22 18:20:47 -05:00
Brodie Rao
b5fe0d906e
tests: add glob matching for unified tests
...
This adds a " (glob)" marker that works like a simpler version of
(re): "*" is converted to ".*", and "?" is converted to ".".
Both special characters can be escaped using "\", and the backslash
itself can be escaped as well.
Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
supported.
2010-09-22 16:06:02 -05:00
Brodie Rao
7d7d96bd74
tests: require regexes in unified tests to be marked with " (re)"
...
Consider this test:
$ hg glog --template '{rev}:{node|short} "{desc}"\n'
@ 2:20c4f79fd7ac "3"
|
| o 1:38f24201dcab "2"
|/
o 0:2a18120dc1c9 "1"
Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.
Similarly:
$ echo foo
The blank output line can be compiled as a regular expression and will
also match any output.
With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.
Lines are still matched literally first, so the following will pass:
$ echo 'foo (re)'
foo (re)
2010-09-22 16:06:00 -05:00
Brodie Rao
548fb65104
tests: ensure regexes match to the end of the string
...
Regular expressions in the test suite are currently written assuming
that you need a trailing ".*" to avoid matching to the end.
Instead of matching regular expressions using "^pattern", this patch
makes matching more restrictive by matching "^pattern$".
2010-09-22 16:05:59 -05:00
Brodie Rao
94cd8c2067
tests: don't match blank output lines as regexes in unified tests
...
Currently, the following unified test will pass:
$ echo foo
A blank output line (a line containing just two spaces) will match any
output.
The patch modifies the unified test runner to ignore empty strings
strings when do regular expression matching.
2010-09-22 16:05:59 -05:00
Brodie Rao
3ed54dfa3d
tests: improve regexes in unified tests
2010-09-22 16:05:58 -05:00
Dan Villiom Podlaski Christiansen
9c066c24dc
tests: unify test-convert-svn-*
2010-09-21 18:40:33 +02:00
Matt Mackall
dcc838ad18
tests: fix touch -t with RHEL
2010-09-22 15:33:08 -05:00
Dan Villiom Podlaski Christiansen
8e99053714
tests: compatibility fix.
...
'touch -d *' doesn't work on Mac OS X. In order to prevent this from
occuring again, a check for the case is added to 'check-code.py'.
2010-09-21 18:36:23 +02:00
Matt Mackall
5d9fc42983
tests: drop a bunch of sed calls from unified tests
2010-09-21 16:44:13 -05:00
Matt Mackall
ac660e9f65
tests: cleanup exit code handling in unified tests
2010-09-21 16:00:02 -05:00
Patrick Mezard
b416e95b1a
test-subrepo-recursion: sort archive output for portability
2010-09-21 23:58:32 +02:00
Patrick Mezard
44b002a617
Merge with stable
2010-09-21 23:37:47 +02:00
Matt Mackall
add9355590
tests: fix hgweb template change
2010-09-20 17:01:12 -05:00
Matt Mackall
f764dbce14
merge with crew
2010-09-20 16:56:44 -05:00
Patrick Mezard
614db673f4
Merge with stable
2010-09-20 22:29:13 +02:00
Martin Geisler
34af0cf109
subrepo: add support for 'hg archive'
2010-09-20 15:46:17 +02:00
Martin Geisler
989dda555a
merge with stable
2010-09-20 15:42:58 +02:00
Steve Borho
d990f5561b
Merge with stable
2010-09-17 12:45:13 -05:00
Matt Mackall
08439e0f2d
tests: add exit codes to unified tests
2010-09-16 17:51:32 -05:00
Brodie Rao
4be7b3bfc3
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
...
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
2010-09-12 18:05:53 -05:00
Adrian Buehlmann
3cc83c1b44
tests: unify test-hgignore
2010-09-15 22:18:46 +02:00
Adrian Buehlmann
9b6356a565
tests: unify test-hardlinks-safety
2010-09-15 20:41:14 +02:00
Adrian Buehlmann
e339f22cb2
tests: unify test-extra-filelog-entry
2010-09-15 18:00:09 +02:00
Adrian Buehlmann
8f0c161e55
tests: unify test-extdiff
2010-09-15 16:27:39 +02:00
Will Maier
8775baf673
tests: add test for bookmark push/pull
2010-09-14 22:26:43 -05:00
Adrian Buehlmann
5ff414e3b0
tests: unify test-username-newline
2010-09-14 16:52:32 +02:00
Adrian Buehlmann
b6aa039052
tests: unify test-url-rev
2010-09-14 16:42:02 +02:00
Adrian Buehlmann
2a5371e76b
tests: unify test-update-renames
2010-09-14 15:37:10 +02:00
Adrian Buehlmann
e5136472fc
tests: unify test-rename-merge1
2010-09-14 13:43:05 +02:00
Adrian Buehlmann
a3504b4a15
tests: unify test-default-push
2010-09-14 22:54:04 +02:00
Adrian Buehlmann
5c33744442
tests: unify test-clone-update-order
2010-09-14 18:43:24 +02:00
Adrian Buehlmann
fba2780eec
tests: unify test-debugrename
2010-09-14 21:41:06 +02:00
Adrian Buehlmann
005b52c999
tests: unify test-confused-revert
2010-09-14 21:26:05 +02:00
Adrian Buehlmann
f7441a3667
tests: unify test-command-template
2010-09-14 19:31:00 +02:00
Sune Foldager
843894f4b3
tests: remove exec bit from .t files
2010-09-14 16:03:10 +02:00
Adrian Buehlmann
79059e20c1
combine tests
2010-09-14 12:20:51 +02:00
Martin Geisler
2fe1ef135d
test-subrepo-recursion: test missing subrepo
2010-09-13 15:13:30 +02:00
Martin Geisler
d37ba034d5
incoming: recurse into subrepositories with --subrepos/-S flag
...
As with push and outgoing, the optional source path is ignored for the
subrepositories. Fixing this is Issue1852.
2010-09-13 13:09:31 +02:00
Martin Geisler
2346ea8e9e
outgoing: recurse into subrepositories with --subrepos/-S flag
...
As with push, the optional destination path is ignored for the
subrepositories, i.e., they are always compared with their default
push path. Fixing this is Issue1852.
2010-09-13 13:09:26 +02:00
Martin Geisler
cb93a10b9b
add: recurse into subrepositories with --subrepos/-S flag
2010-09-13 13:09:20 +02:00
Martin Geisler
28afb23368
merge with stable
2010-09-12 14:00:40 +02:00
Adrian Buehlmann
b48212d057
tests: unify test-merge-remove
2010-09-12 12:11:39 +02:00
Adrian Buehlmann
9e07266e5a
tests: unify test-merge-prompt
2010-09-12 11:52:13 +02:00
Adrian Buehlmann
ee5b09a053
tests: unify test-merge-local
2010-09-11 21:19:12 +02:00
Adrian Buehlmann
6fa6d14d98
tests: unify test-merge-internal-tools-pattern
2010-09-11 20:04:35 +02:00
Adrian Buehlmann
010ea362c8
tests: unify test-merge-force
2010-09-11 17:58:37 +02:00
Adrian Buehlmann
278c3f123f
tests: unify test-merge-default
2010-09-11 11:44:53 +02:00
Adrian Buehlmann
98a82d2c4e
tests: unify test-merge-commit
2010-09-11 11:18:47 +02:00
Adrian Buehlmann
074eafe83e
tests: unify test-manifest*
2010-09-10 23:13:59 +02:00
Dirkjan Ochtman
5ec1a29d90
tests: fix incompatibility with python-2.4 in test-hgweb
...
Thanks to lcantey for catching it.
2010-09-11 10:57:35 +02:00
Patrick Mezard
30bd1afde3
subrepos: handle diff nodeids in subrepos, not before
...
Subversion nodeids are integer revisions.
2010-09-10 22:52:00 +02:00
Adrian Buehlmann
84909492b7
tests: unify test-locate
2010-09-10 19:41:45 +02:00
Adrian Buehlmann
587c075c2b
tests: unify test-journal-exists
2010-09-10 19:05:49 +02:00
Adrian Buehlmann
5e9c898892
tests: unify test-issue1438 and test-issue2137
2010-09-10 17:59:17 +02:00
Martin Geisler
964567ee35
convert: move -A option to --authormap
2010-09-10 20:11:42 +02:00
Christian Ebert
57eed7cac3
patchbomb: add --confirm option to show series details and ask for confirmation
...
--confirm presents same prompt as --diffstat, but does not write
a diffstat to the messages' bodies.
A simple test simulating a negative response is included.
2010-09-10 15:32:22 +02:00
Christian Ebert
c4731e2be5
patchbomb: let diffstat prompt only once with complete summary
...
This changes the behaviour of --diffstat.
Before the user was asked for confirmation of each patch with its
description and diffstat, and a final summary.
Now there is only one prompt right before sending with a final
summary which does not include the patch descriptions, but the
message details and the diffstats:
Final summary:
From: sender
To: recipient(s)
Cc: (if present)
Bcc: (if present)
Reply-To: (if present)
Subject: [patch 0 of x [flags]] intro (if present)
a | 28 ++++++++++++++++++++++++++++
b | 15 +++++++++++++++
Subject: [patch 1 of x [flags]] subject
a | 28 ++++++++++++++++++++++++++++
[ ... ]
are you sure you want to send (yn)?
2010-09-10 15:32:14 +02:00
Martin Geisler
0447137bce
convert: deprecate --authors in preference for --authormap
...
This aligns the authormap option with the other three mapping options.
The old --authors option is still supported and 'hg help convert -v'
will still show it.
2010-09-10 01:34:14 +02:00
Christian Ebert
c71ec4c740
patchbomb: show prompt and selection in non-interactive mode
...
Akin to 023d1310d8a4 for the custom patchbomb prompt.
2010-09-08 08:31:07 +02:00
Christian Ebert
c44df41dfd
patchbomb: use ui.promptchoice for diffstat to allow localization of choices
...
The extra check for ui.interacive from patchbomb's prompt function is not
needed here.
Format boolean prompt as in filemerge.py.
2010-09-08 08:31:07 +02:00
Adrian Buehlmann
c7fe62171f
tests: unify test-issue*
2010-09-03 23:34:37 +02:00
Adrian Buehlmann
f45079fc9b
tests: unify test-globalopts
2010-09-03 22:10:08 +02:00
Adrian Buehlmann
0d0466ee3f
tests: unify test-git-*
2010-09-03 14:29:28 +02:00
Adrian Buehlmann
d53524bb44
tests: unify test-filebranch
2010-09-03 11:47:24 +02:00
Adrian Buehlmann
58d4a9dd14
tests: unify test-extension
2010-09-03 11:19:50 +02:00
Adrian Buehlmann
c3854fec44
tests: unify test-execute-bit
2010-09-03 09:46:17 +02:00
Adrian Buehlmann
65803ce2e2
tests: unify test-empty-group
2010-09-03 09:12:36 +02:00
Martin Geisler
77e923da30
merge with stable
2010-09-10 01:04:32 +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
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
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
Dan Villiom Podlaski Christiansen
f0900519c1
test-convert-hg-startrev: enable convert.hg.saverev.
2010-09-02 15:00:45 +02:00
Matt Mackall
32de98afbd
tests: drop final true command from unified tests
2010-09-20 16:00:15 -05:00
Matt Mackall
89bcf054c9
tests: fixup tests using unzip -l
2010-09-20 15:50:36 -05:00
Matt Mackall
82d0edffe9
tests: add hack to avoid problem with graphlog in unified tests
2010-09-20 14:36:36 -05:00
Matt Mackall
200e89394d
tests: fix a bunch of pointless #s in unified tests
2010-09-17 17:03:08 -05:00
Matt Mackall
bf9417da11
tests: exit 0 no longer needed on unified tests
2010-09-17 17:03:04 -05:00
Matt Mackall
04833e5383
tests: update debugcomplete output
2010-09-20 15:33:12 -05:00
Matt Mackall
6f3e841677
merge with abuehl
2010-09-20 15:31:48 -05:00
Adrian Buehlmann
a8ea57a0d0
tests: unify some of test-mq*
2010-09-19 23:42:18 +02: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
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
Nicolas Dumazet
2791c58004
tests: unify test-incoming-outgoing
2010-08-30 14:10:31 +09:00
Nicolas Dumazet
4f017eca36
tests: unify test-resolve
2010-08-30 14:06:18 +09:00
Nicolas Dumazet
2ec81e3bb7
tests: unify test-requires
2010-08-30 14:04:38 +09:00
Nicolas Dumazet
63f38bebe4
tests: unify test-relink
2010-08-30 14:01:57 +09:00
Nicolas Dumazet
719b544f84
tests: merge the two test-rename-dir-merge* into one
2010-08-30 13:55:57 +09:00
Nicolas Dumazet
fad1120717
tests: unify test-rename-dir-merge2
2010-08-30 13:51:27 +09:00
Nicolas Dumazet
8a7510a223
tests: unify test-rename-dir-merge
2010-08-30 13:49:40 +09:00
Nicolas Dumazet
6599b98e1b
tests: unify test-revert-unknown
2010-08-30 13:46:57 +09:00
Nicolas Dumazet
838fb38eed
tests: unify test-revert-flags
2010-08-30 13:45:24 +09:00
Nicolas Dumazet
4842cb2bc0
tests: remove useless sed in test-hgrc
2010-08-30 13:43:34 +09:00
Nicolas Dumazet
a40a3fa6f2
tests: mq-safety: use regular expression instead of sed
2010-08-30 13:41:03 +09:00
Nicolas Dumazet
eb3e63466b
tests: use regular expression instead of sed in test-subrepo-deep-nested-change
2010-08-30 13:37:12 +09:00
Nicolas Dumazet
a0476898ab
tests: unify test-revert
2010-08-30 13:32:37 +09:00
Nicolas Dumazet
90787c08f9
util: get rid of extra trailing whitespace in parsedate abort message
2010-08-30 13:29:44 +09:00
Nicolas Dumazet
77b77244a8
tests: unify test-revset
2010-08-30 13:23:32 +09:00
Nicolas Dumazet
cb1b78b184
test-revset: remove trailing whitespaces
2010-08-30 13:18:19 +09:00
Nicolas Dumazet
b211179181
test-keyword: use regular expressions instead of grepping
2010-08-30 13:15:30 +09:00
Nicolas Dumazet
fc08569136
tests: remove useless grep -v in test-mq.t
2010-08-30 13:11:32 +09:00
Nicolas Dumazet
22f9ec3e3a
tests: unify test-remove-new
2010-08-30 13:08:18 +09:00
Nicolas Dumazet
789cb13602
tests: unify test-remove
2010-08-30 13:02:54 +09:00
Nicolas Dumazet
c78d8b3cfb
tests: unify test-rename
2010-08-30 12:58:43 +09:00
Nicolas Dumazet
cba0a6764b
tests: unify test-strict
2010-08-30 12:48:17 +09:00
Nicolas Dumazet
d6c7f98ff2
tests: unify test-inherit-mode
2010-08-30 12:46:19 +09:00
Nicolas Dumazet
fc46cf6cbe
tests: unify test-churn
2010-08-30 12:41:43 +09:00
Nicolas Dumazet
72eb746e29
tests: convert test-bisect
2010-08-30 12:02:31 +09:00
Martin Geisler
c3c7fa090f
Merge with stable
2010-08-30 13:00:22 +02:00
Adrian Buehlmann
00dce4164d
tests: unify test-config-case
2010-08-30 11:39:43 +02:00
Brodie Rao
d1905b7d87
mail/hgweb: support service names for ports (issue2350)
...
This adds util.getport(port) which tries to parse port as an int, and
failing that, looks it up using socket.getservbyname(). Thus, the
following will work:
[smtp]
port = submission
[web]
port = http
This does not apply to ports in URLs used in clone, pull, etc.
2010-08-28 12:31:07 -04:00
Dan Villiom Podlaski Christiansen
f84e31bda1
tests: unify test-qrecord
2010-08-27 16:25:47 +02:00
Dan Villiom Podlaski Christiansen
52c63d3a07
tests: unify test-record
2010-08-27 16:25:47 +02:00
Dan Villiom Podlaski Christiansen
ab941f68a0
tests: unify test-help
2010-08-27 16:25:47 +02:00
Adrian Buehlmann
60a5b5bf67
tests: unify test-bheads
2010-08-27 00:27:40 +02:00
Adrian Buehlmann
e3a15e43a7
tests: unify test-lock-badness
2010-08-26 12:41:00 +02:00
Martin Geisler
cb36142754
Merge with stable
2010-08-29 22:55:37 +02:00
Matt Mackall
60627b799a
bundlerepo: remove duplication of bundle decompressors
2010-08-25 16:55:54 -05:00
Matt Mackall
aad5cb0594
merge with stable
2010-08-25 15:20:25 -05:00
Dan Villiom Podlaski Christiansen
5e79668de4
mq: extend support for the --mq argument to extension commands
...
This allows commands like `purge' to accept the --mq option.
2010-08-13 16:05:08 +02:00
Adrian Buehlmann
a612b24fe8
tests: unify test-export
2010-08-24 15:13:11 +02:00
Martin Geisler
2d00197a3e
Merge with stable
2010-08-25 13:40:46 +02:00
Brodie Rao
bf4b0442af
tests: unify test-hgrc
2010-08-21 23:24:52 -04:00
Patrick Mezard
6bd03fa85b
tests: remove test-log.out, useless after unification
2010-08-22 12:04:15 +02:00
Matt Mackall
5fd0f613e6
merge with stable
2010-08-21 10:48:49 -05:00
Matt Mackall
7d97cdbd5f
tests: fix up bisect test output
2010-08-21 10:44:57 -05:00
Matt Mackall
e1ce51099d
bisect: add test for unrelated starting revisions
2010-08-20 21:28:14 -05:00
Matt Mackall
fa11c5cbae
debuginstall: report installpath
2010-08-20 15:31:05 -05:00
Adrian Buehlmann
4cdbf9aebe
tests: unify test-glog
2010-08-20 18:26:20 +02:00
Steve Losh
51f95d13a2
aliases: provide more flexible ways to work with shell alias arguments
...
This patch changes the functionality of shell aliases to add more powerful
options for working with shell alias arguments.
First: the alias name + arguments to a shell alias are set as an HG_ARGS
environment variable, delimited by spaces. This matches the behavior of hooks.
Second: any occurrences of "$@" (without quotes) are replaced with the
arguments, separated by spaces. This happens *before* the alias gets to the shell.
Third: any positive numeric variables ("$1", "$2", etc) are replaced with the
appropriate argument, indexed from 1. "$0" is replaced with the name of the
alias. Any "extra" numeric variables are replaced with an empty string. This
happens *before* the alias gets to the shell.
These changes allow for more flexible shell aliases:
[alias]
echo = !echo $@
count = !hg log -r "$@" --template='.' | wc -c | sed -e 's/ //g'
qqueuemv = !mv "`hg root`/.hg/patches-$1" "`hg root`/.hg/patches-$2"
In action:
$ hg echo foo
foo
$ hg count 'branch(default)'
901
$ hg count 'branch(stable) and keyword(fixes)'
102
$ hg qqueuemv myfeature somefeature
2010-08-18 18:56:44 -04:00
Pradeepkumar Gayam
d61915d69f
tests: unify test-merge10
2010-08-18 06:05:09 +05:30
Pradeepkumar Gayam
ce042a6ed8
tests: unify test-merge9
2010-08-18 06:02:08 +05:30
Pradeepkumar Gayam
7a05fc9b04
tests: unify test-merge8
2010-08-18 05:55:56 +05:30
Pradeepkumar Gayam
7f986f9b54
tests: unify test-merge7
2010-08-18 05:54:00 +05:30
Pradeepkumar Gayam
e412644de2
tests: unify test-merge6
2010-08-18 05:21:07 +05:30
Pradeepkumar Gayam
fa663e4e0e
tests: unify test-merge5
2010-08-18 05:15:49 +05:30
Pradeepkumar Gayam
df091a14a5
tests: unify test-merge4
2010-08-18 05:12:44 +05:30
Pradeepkumar Gayam
030faa8bc9
tests: unify test-merge2
2010-08-18 05:09:58 +05:30
Pradeepkumar Gayam
5dff28e667
tests: unify test-merge1
2010-08-18 05:05:51 +05:30
Pradeepkumar Gayam
2840623b78
tests: unify test-excessive-merge
2010-08-18 04:37:06 +05:30
Pradeepkumar Gayam
eec29150ab
tests: unify test-double-merge
2010-08-18 04:30:27 +05:30
Pradeepkumar Gayam
a8b5e99b7e
tests: unify test-copy-move-merge
2010-08-18 04:26:20 +05:30
Pradeepkumar Gayam
fa4a583db8
tests: unify test-merge-closedheads
2010-08-18 04:21:10 +05:30
Yuya Nishihara
f6cfbe6d14
templatefilters: use \uxxxx style escape for JSON string
...
It's embeddable in plain javascript, and also conforms to JSON standard.
2010-08-11 01:06:21 +09:00
Dan Villiom Podlaski Christiansen
8933f2e981
test-notify: make it pass on Mac OS X (again)
...
Changeset 372e3cb2c9bf (from 2008) introduced a hack to handle the
very long values of $TMPDIR typically seen on Mac OS X. This hack
expected continuation lines to begin with a tab. However, as a result
of a change in Python 2.7, changeset 025d0ea4305a made it so
continuation lines began with a tab. Since then, `test-notify' has
been broken on Mac OS X.
Merely replacing the tab in the regular expression with a space will
not work: not only do tab continuations still occur in the message, but
other lines -- in the body of the message -- also start with a
space. Luckily, all broken up lines appear to end with either a colon
or an n, so we can match those, and reinsert them in the replacement.
2010-08-13 17:21:06 +02:00
Wagner Bruna
a056b85166
revset: fix outgoing argument handling
2010-08-12 20:54:34 -03:00
Benoit Boissinot
21c145b776
rebase: recompute the set of skipped rev when using --continue (issue2330)
2010-08-13 18:02:02 +02:00
Jeremy Whitlock
0a6d3a397f
color: enable branches support
...
This commit updates the branches command to use ui.label for the branch names
and the changeset. This implementation allows assigning colors to the four
states of a branch: active, closed, current and inactive. While you can
configure color for the four states, only current and closed have default colors
of green and black bold respectively.
2010-07-28 23:05:03 -06:00
Yann E. MORIN
87f9cf5483
mq/qqueue: add --purge option to delete a queue and its patch dir
...
qqueue --delete only deletes the reference to the queue, and leaves
the associated patch directory behind. There is no Mercurial-way of
getting rid of that patch directory afterward.
This patch adds the --purge option to qqueue, that deletes the queue
from the list, and also removes the associated patch dir. If the queue
was non-existant, but the patch dir was, it is removed nonetheless.
This is to avoid manual intervention in the .hg directory.
2010-08-18 23:37:19 +02:00
Martin Geisler
ef593ac2ea
test-subrepo-paths: use printf instead of echo
...
Different shells have different opinions on how to backslashes must be
escaped for echo, but printf is consistent across zsh, dash, bash,
tcsh, and csh.
2010-08-19 16:34:12 +02:00
Martin Geisler
9c87025d80
subrepos: handle backslashes in subpaths
2010-08-19 13:25:46 +02:00
Martin Geisler
e46d654194
test-subrepo-paths: moved comment lines to where they belong
2010-08-18 11:59:35 +02:00
Pradeepkumar Gayam
b10bf9f64c
tests: unify test-copy2
2010-08-17 08:38:31 +05:30
Yann E. MORIN
087fc5dff2
mq/qqueue: enable renaming of active queue
2010-08-15 13:29:46 +02:00
Adrian Buehlmann
9e497d8fac
tests: unify test-clone-r
2010-08-15 20:36:49 +02:00
Pradeepkumar Gayam
73ddda7459
tests: unify test-debugcomplete
2010-08-17 18:07:05 +05:30
Pradeepkumar Gayam
2c038276c3
tests: unify tests-debugindexdot
2010-08-17 18:04:04 +05:30
Pradeepkumar Gayam
b0537b21ae
tests: unify test-debugbuilddag
2010-08-17 18:02:13 +05:30
Pradeepkumar Gayam
1d04e0eea7
tests: unify test-diffdir
2010-08-17 17:57:48 +05:30
Pradeepkumar Gayam
a9987690b9
tests: unify test-children
2010-08-17 17:56:26 +05:30
Pradeepkumar Gayam
68dbc5b812
tests: unify test-revlog-packentry
2010-08-17 17:54:32 +05:30
Pradeepkumar Gayam
49e1d53fdc
tests: unify test-revlog-group-emptyiter
2010-08-17 17:53:11 +05:30