upstream/mercurial-mirror Files · tests/test-merge6.t

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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r20328:03d345da

stable

Download file

             test-merge6.t
        
                    70 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge6.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF > merge

        > import sys, os

        > print "merging for", os.path.basename(sys.argv[1])

        > EOF

        $ HGMERGE="python ../merge"; export HGMERGE

        $ hg init A1

        $ cd A1

        $ echo This is file foo1 > foo

        $ echo This is file bar1 > bar

        $ hg add foo bar

        $ hg commit -m "commit text"

        $ cd ..

        $ hg clone A1 B1

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd A1

        $ rm bar

        $ hg remove bar

        $ hg commit -m "commit test"

        $ cd ../B1

        $ echo This is file foo22 > foo

        $ hg commit -m "commit test"

        $ cd ..

        $ hg clone A1 A2

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg clone B1 B2

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd A1

        $ hg pull ../B1

        pulling from ../B1

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg commit -m "commit test"

      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        $ cd ../B2

        $ hg pull ../A2

        pulling from ../A2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg commit -m "commit test"

      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ cat <<EOF > merge
				> import sys, os
				> print "merging for", os.path.basename(sys.argv[1])
				> EOF
				$ HGMERGE="python ../merge"; export HGMERGE

				$ hg init A1
				$ cd A1
				$ echo This is file foo1 > foo
				$ echo This is file bar1 > bar
				$ hg add foo bar
				$ hg commit -m "commit text"

				$ cd ..
				$ hg clone A1 B1
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd A1
				$ rm bar
				$ hg remove bar
				$ hg commit -m "commit test"

				$ cd ../B1
				$ echo This is file foo22 > foo
				$ hg commit -m "commit test"

				$ cd ..
				$ hg clone A1 A2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg clone B1 B2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd A1
				$ hg pull ../B1
				pulling from ../B1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "commit test"
				bar should remain deleted.
				$ hg manifest --debug
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

				$ cd ../B2
				$ hg pull ../A2
				pulling from ../A2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg merge
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "commit test"
				bar should remain deleted.
				$ hg manifest --debug
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

				$ cd ..