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

Kevin Bullock - - Load All Authors

File last commit:

r18743:70e2a22f default


                r20328:03d345da

stable

Download file

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

      http://mercurial.selenic.com/bts/issue1175

        $ hg init

        $ touch a

        $ hg ci -Am0

        adding a

        $ hg mv a a1

        $ hg ci -m1

        $ hg co 0

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

        $ hg mv a a2

        $ hg up

        note: possible conflict - a was renamed multiple times to:

         a2

         a1

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

        $ hg ci -m2

        $ touch a

        $ hg ci -Am3

        adding a

        $ hg mv a b

        $ hg ci -Am4 a

        $ hg ci --debug --traceback -Am5 b

        b

         b: searching for copy revision for a

         b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db

        committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        4 files, 6 changesets, 4 total revisions

        $ hg export --git tip

        # HG changeset patch

        # User test

        # Date 0 0

        #      Thu Jan 01 00:00:00 1970 +0000

        # Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95

        # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f

        5

        diff --git a/b b/b

        new file mode 100644

	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

				http://mercurial.selenic.com/bts/issue1175

				$ hg init
				$ touch a
				$ hg ci -Am0
				adding a

				$ hg mv a a1
				$ hg ci -m1

				$ hg co 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg mv a a2
				$ hg up
				note: possible conflict - a was renamed multiple times to:
				a2
				a1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg ci -m2

				$ touch a
				$ hg ci -Am3
				adding a

				$ hg mv a b
				$ hg ci -Am4 a

				$ hg ci --debug --traceback -Am5 b
				b
				b: searching for copy revision for a
				b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
				committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				4 files, 6 changesets, 4 total revisions

				$ hg export --git tip
				# HG changeset patch
				# User test
				# Date 0 0
				# Thu Jan 01 00:00:00 1970 +0000
				# Node ID 732aafbecb501a198b3cc9323ad3899ff04ccf95
				# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
				5

				diff --git a/b b/b
				new file mode 100644