Adrian Buehlmann <adrian@cadifra.com> [Sun, 26 Sep 2010 23:48:30 +0200] rev 12537
tests: fix tabs/indentation in test-strip-cross.t
Steve Losh <steve@stevelosh.com> [Tue, 24 Aug 2010 18:25:33 -0400] rev 12536
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
Matt Mackall <mpm@selenic.com> [Mon, 27 Sep 2010 10:39:22 -0500] rev 12535
tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:20:24 -0500] rev 12534
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:18:53 -0500] rev 12533
tests: unify test-convert-tla
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:18:28 -0500] rev 12532
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:17:19 -0500] rev 12531
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:16:46 -0500] rev 12530
tests: unify test-convert-git
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:14:35 -0500] rev 12529
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:54:28 -0500] rev 12528
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:53:06 -0500] rev 12527
tests: unify test-convert-hg-svn
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:48:57 -0500] rev 12526
tests: unify test-convert-hg-source
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:47:59 -0500] rev 12525
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:45:51 -0500] rev 12524
tests: unify test-convert-darcs
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:43:48 -0500] rev 12523
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:39:52 -0500] rev 12522
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 15:42:48 -0500] rev 12521
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 15:33:09 -0500] rev 12520
tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:50:58 -0500] rev 12519
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:39:34 -0500] rev 12518
tests: unify test-convert-clonebranches
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:37:47 -0500] rev 12517
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:37:30 -0500] rev 12516
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:36:49 -0500] rev 12515
tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:36:32 -0500] rev 12514
tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:35:43 -0500] rev 12513
tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:35:24 -0500] rev 12512
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:33:08 -0500] rev 12511
tests: unify test-convert-authormap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:32:13 -0500] rev 12510
tests: unify test-convert
Steve Losh <steve@stevelosh.com> [Sun, 26 Sep 2010 20:43:43 -0400] rev 12509
contrib/vim: add a syntax file for unified tests
This syntax file adds:
* Highlighting of comments, output, and commands (with sh highlighting
in commands).
* Folding for output and blocks of commands+output.
* Setting tab/indent settings to 2 spaces, because that's what's defined by the
unified test file format.
Martin Geisler <mg@aragost.com> [Mon, 27 Sep 2010 10:20:19 +0200] rev 12508
merge with stable