##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True"...
dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True" Before this patch, shell alias may be executed by abbreviated command name unexpectedly, even if abbreviated command name matches also against the command provided by extension. For example, "rebate" shell alias is executed by "hg reba", even if rebase extension (= "rebase" command) is enabled. In this case, "hg reba" should be aborted because of command name ambiguity. This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()" always with "strict=True" (default value). If abbreviated command name matches against only one shell alias even after loading extensions, such shell alias will be executed via "_parse()". This patch doesn't remove "_checkshellalias()" invocation itself, because it may prevent shell alias from loading extensions uselessly.
Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable
r20328:03d345da stable
Show More
test-clone-update-order.t
105 lines | 3.2 KiB | text/troff | Tads3Lexer
/ tests / test-clone-update-order.t
History | Annotation | Raw |Copy content |Copy permalink
$ hg init
$ echo foo > bar
$ hg commit -Am default
adding bar
$ hg up -r null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg branch mine
marked working directory as branch mine
(branches are permanent and global, did you want a bookmark?)
$ echo hello > world
$ hg commit -Am hello
adding world
$ hg up -r null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg branch other
marked working directory as branch other
(branches are permanent and global, did you want a bookmark?)
$ echo good > bye
$ hg commit -Am other
adding bye
$ hg up -r mine
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
abort: cannot specify both --noupdate and --updaterev
[255]
$ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
$ rm -rf ../b
$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch mine
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch mine
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
Test -r mine ... mine is ignored:
$ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone .#other ../b -b default -b mine
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone .#other ../b
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
$ hg clone -U . ../c -r 1 -r 2 > /dev/null
$ hg clone ../c ../b
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b ../c