Adrian Buehlmann
1f4e98cf76
tests: unify test-rebase*
2010-10-01 16:10:06 +02:00
Martin Geisler
1edc738611
test-url: refactor with shorter lines
2010-10-01 16:39:55 +02:00
Brodie Rao
7356b10618
tests: unify test-casefolding
2010-09-27 13:13:34 -05:00
Mads Kiilerich
2fcbe3473c
merge with stable
2010-10-01 00:54:03 +02:00
Erik Zielke
4217887b02
test-subrepo-recursion: remove empty defaults section
2010-09-30 13:38:21 +02:00
Erik Zielke
5709d44003
test-subrepo-recursion: deleted default arguments
...
Deleted default arguments from test-sub-repo-recursion. Rationale is
that it is confusing to read, when the arguments aren't at each
command in the test
2010-09-28 13:09:22 +02:00
Erik Zielke
512d0992fc
tests: removed test names in tests
...
The name of the test files is replaced with a glob * expression,
thereby the tests does not depend on the filename of the file they are
in.
2010-09-30 09:49:40 +02:00
Adrian Buehlmann
86b1980ab6
tests: fix ff6b740114fc merge error in test-git-import.t
2010-09-28 19:29:14 +02:00
Mads Kiilerich
0bec1958b5
test-convert-cvs-detectmerge: add sleep so cvs notices changes
2010-09-29 01:33:31 +02:00
Mads Kiilerich
11c8cc29c9
init: expand destination url as a configured paths
...
Most commands expands configured paths when repositories are specified, just as
the urls help says. Clone also expands the destination path. Clone is morally
equivalent to init + push/pull, so init should also expand the destination path
- and that is what this patch makes it do.
There is no really good usecases for this and in most cases it doesn't matter,
but consistency is nice, and otherwise we would have to document the exception.
2010-09-29 01:32:51 +02:00
Mads Kiilerich
982aefe1cc
test-convert-cvs-branch: add sleep so cvs notices changes
2010-09-28 03:01:35 +02:00
Mads Kiilerich
edf2794bd1
graphlog: style with header and footer (issue2395)
...
The glog command didn't emit header and footer from the style, as demonstrated
by "hg glog --style xml". Asciiart combined with xml markup hardly makes sense,
but header and footer might however be useful for adding for example html pre
tags around the graph.
2010-09-28 02:58:00 +02:00
Mads Kiilerich
a9146eb8c4
test-serve: use service that works on more platforms
...
Follow-up to 40a2055abf6d: echo is ambiguous on OS/X, and Solaris have neither
http nor gopher. daytime seems to be available everywhere.
2010-09-28 02:57:59 +02:00
Patrick Mezard
df877501f1
Merge with stable
2010-09-28 01:11:24 +02:00
Thomas Arendsen Hein
a05671580d
tests: show skip reason instead of "irrelevant" with unified tests, too
...
parsehghaveoutput expects just the test output, not the merged test/output,
so for skipped unified tests e.g.:
Skipped test-convert-darcs.t: missing feature: irrelevant
was shown instead of:
Skipped test-convert-darcs.t: missing feature: darcs client
2010-09-27 22:49:30 +02:00
Adrian Buehlmann
057c054947
tests: fix tabs/indentation in test-strip-cross.t
2010-09-26 23:48:30 +02:00
Steve Losh
0ec78824a3
alias: only allow global options before a shell alias, pass later ones through
...
This patch refactors the dispatch code to change how arguments to shell aliases
are handled.
A separate "pass" to determine whether a command is a shell alias has been
added. The rough steps dispatch now performs when a command is given are these:
* Parse all arguments up to the command name.
* If any arguments such as --repository or --cwd are given (which could change
the config file used, and therefore the definition of aliases), they are
taken into account.
* We determine whether the command is a shell alias.
* If so, execute the alias. The --repo and --cwd arguments are still in effect.
Any arguments *after* the command name are passed unchanged through to the
shell command (and interpolated as normal.
* If the command is *not* a shell alias, the dispatching is effectively "reset"
and reparsed as normal in its entirety.
The net effect of this patch is to make shell alias commands behave as you
would expect.
Any arguments you give to a shell alias *after* the alias name are passed
through unchanged. This lets you do something like the following:
[alias]
filereleased = !$HG log -r 'descendants(adds("$1")) and tagged()' -l1 $2 $3 $4 $5
$ hg filereleased hgext/bookmarks.py --style compact
Previously the `--style compact` part would fail because Mercurial would
interpret those arguments as arguments to the alias command itself (which
doesn't take any arguments).
Also: running something like `hg -R ~/src/hg-crew filereleased
hgext/bookmarks.py` when `filereleased` is only defined in that repo's config
will now work.
These global arguments can *only* be given to a shell alias *before* the alias
name. For example, this will *not* work in the above situation:
$ hg filereleased -R ~/src/hg-crew hgext/bookmarks.py
The reason for this is that you may want to pass arguments like --repository to
the alias (or, more likely, their short versions like -R):
[alias]
own = !chown $@ `$HG root`
$ hg own steve
$ hg own -R steve
2010-08-24 18:25:33 -04:00
Matt Mackall
66f303811f
tests: fix test-fetch port number variability
2010-09-27 10:39:22 -05:00
Matt Mackall
a83179e82c
tests: unify test-convert-tagsbranch-topology
2010-09-26 17:20:24 -05:00
Matt Mackall
8ae5ecd1af
tests: unify test-convert-tla
2010-09-26 17:18:53 -05:00
Matt Mackall
b2af7a3e51
tests: unify test-convert-mtn
2010-09-26 17:18:28 -05:00
Matt Mackall
4a721be0fe
tests: unify test-convert-splicemap
2010-09-26 17:17:19 -05:00
Matt Mackall
75c074ba2e
tests: unify test-convert-git
2010-09-26 17:16:46 -05:00
Matt Mackall
50d09c4529
tests: unify test-convert-filemap
2010-09-26 17:14:35 -05:00
Matt Mackall
e4c062e907
tests: unify test-convert-datesort
2010-09-26 16:54:28 -05:00
Matt Mackall
c88a328e4f
tests: unify test-convert-hg-svn
2010-09-26 16:53:06 -05:00
Matt Mackall
2066e73671
tests: unify test-convert-hg-source
2010-09-26 16:48:57 -05:00
Matt Mackall
0691b72c3c
tests: unify test-convert-hg-sink
2010-09-26 16:47:59 -05:00
Matt Mackall
6edfd1dac8
tests: unify test-convert-darcs
2010-09-26 16:45:51 -05:00
Matt Mackall
d1eea2f57b
tests: unify test-convert-cvsnt-mergepoints
2010-09-26 16:43:48 -05:00
Matt Mackall
f8167456f4
tests: unify test-convert-cvs-synthetic
2010-09-26 16:39:52 -05:00
Matt Mackall
164446c4ff
tests: unify test-convert-cvs-detectmerge
2010-09-26 15:42:48 -05:00
Matt Mackall
a2ca33dda2
tests: unify test-convert-cvs-branch
2010-09-26 15:33:09 -05:00
Matt Mackall
c1e84a96d4
tests: unify test-convert-cvs
2010-09-26 14:50:58 -05:00
Matt Mackall
04110ded40
tests: unify test-convert-clonebranches
2010-09-26 14:39:34 -05:00
Matt Mackall
0e01c3e732
tests: unify test-convert-bzr-treeroot
2010-09-26 14:37:47 -05:00
Matt Mackall
0d19ecca74
tests: unify test-convert-bzr-merges
2010-09-26 14:37:30 -05:00
Matt Mackall
9bc614322b
tests: unify test-convert-bzr-ghosts
2010-09-26 14:36:49 -05:00
Matt Mackall
13dbf6f0f8
tests: unify test-convert-bzr-directories
2010-09-26 14:36:32 -05:00
Matt Mackall
2d08a28bd1
tests: unify test-convert-bzr-114
2010-09-26 14:35:43 -05:00
Matt Mackall
a3dced962f
tests: unify test-convert-bzr
2010-09-26 14:35:24 -05:00
Matt Mackall
1094885dbb
tests: unify test-convert-authormap
2010-09-26 14:33:08 -05:00
Matt Mackall
5516e0259e
tests: unify test-convert
2010-09-26 14:32:13 -05:00
Brodie Rao
b469322e9a
test-pull: convert regexes to globs
2010-09-26 16:01:13 -05:00
Brodie Rao
709f38fa67
test-ssh: test absolute path that exists
2010-09-26 14:35:52 -05:00
Wagner Bruna
141644d96f
subrepo: improve lookup error messages
2010-09-13 10:33:49 -03:00
Martin Geisler
7313d940be
run-tests: move build/ directory to HGTMP
...
Before, running a test would give you a build/ directory in the root
of your Mercurial source tree. The directory had a full copy of the
the source, so a grep in '**/*.py' would find files inside build/.
2010-09-26 22:22:59 +02:00
Christian Ebert
405806c3f9
keyword: support rollback by restoring expansion to previous values
...
Prevent spurious differences in the working directory
after a rollback.
Add tests for several rollback situations.
2010-09-26 19:18:41 +02:00
Christian Ebert
0e483b0cbe
test-keyword: fix typo, rephrase
2010-09-26 19:18:41 +02:00
Matt Mackall
9a63c93203
tests: unify test-win32text
2010-09-26 13:44:49 -05:00
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