upstream/mercurial-mirror Files · tests/test-merge5.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.

Siddharth Agarwal - - Load All Authors

File last commit:

r19801:41abe2e3 default


                r20328:03d345da

stable

Download file

             test-merge5.t
        
                    44 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ echo This is file b1 > b

        $ hg add a b

        $ hg commit -m "commit #0"

        $ echo This is file b22 > b

        $ hg commit -m "comment #1"

        $ hg update 0

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

        $ rm b

        $ hg commit -A -m "comment #2"

        removing b

        created new head

        $ hg update 1

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

        $ hg update

        abort: not a linear update

        (merge or update --check to force update)

        [255]

        $ rm b

        $ hg update -c

        abort: uncommitted changes

        [255]

        $ hg revert b

        $ hg update -c

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

        $ mv a c

      In theory, we shouldn't need the "-y" below, but it prevents this test

      from hanging when "hg update" erroneously prompts the user for "keep

      or delete".

      Should abort:

        $ hg update -y 1

        abort: uncommitted changes

        (commit or update --clean to discard changes)

        [255]

        $ mv c a

      Should succeed:

        $ hg update -y 1

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

	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

				$ hg init
				$ echo This is file a1 > a
				$ echo This is file b1 > b
				$ hg add a b
				$ hg commit -m "commit #0"
				$ echo This is file b22 > b
				$ hg commit -m "comment #1"
				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm b
				$ hg commit -A -m "comment #2"
				removing b
				created new head
				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg update
				abort: not a linear update
				(merge or update --check to force update)
				[255]
				$ rm b
				$ hg update -c
				abort: uncommitted changes
				[255]
				$ hg revert b
				$ hg update -c
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mv a c

				In theory, we shouldn't need the "-y" below, but it prevents this test
				from hanging when "hg update" erroneously prompts the user for "keep
				or delete".

				Should abort:

				$ hg update -y 1
				abort: uncommitted changes
				(commit or update --clean to discard changes)
				[255]
				$ mv c a

				Should succeed:

				$ hg update -y 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved