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

Angel Ezquerra - - Load All Authors

File last commit:

r20319:427d672c stable


                r20328:03d345da

stable

Download file

             test-subrepo-missing.t
        
                    102 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-missing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ hg init subrepo

        $ echo a > subrepo/a

        $ hg -R subrepo ci -Am adda

        adding a

        $ echo 'subrepo = subrepo' > .hgsub

        $ hg ci -Am addsubrepo

        adding .hgsub

        $ echo b > subrepo/b

        $ hg -R subrepo ci -Am addb

        adding b

        $ hg ci -m updatedsub

      ignore blanklines in .hgsubstate

        >>> file('.hgsubstate', 'wb').write('\n\n   \t \n   \n')

        $ hg st --subrepos

        M .hgsubstate

        $ hg revert -qC .hgsubstate

      abort more gracefully on .hgsubstate parsing error

        $ cp .hgsubstate .hgsubstate.old

        >>> file('.hgsubstate', 'wb').write('\ninvalid')

        $ hg st --subrepos

        abort: invalid subrepository revision specifier in .hgsubstate line 2

        [255]

        $ mv .hgsubstate.old .hgsubstate

      delete .hgsub and revert it

        $ rm .hgsub

        $ hg revert .hgsub

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

      delete .hgsubstate and revert it

        $ rm .hgsubstate

        $ hg revert .hgsubstate

      delete .hgsub and update

        $ rm .hgsub

        $ hg up 0

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

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

        $ hg st

        warning: subrepo spec file .hgsub not found

        ! .hgsub

        $ ls subrepo

        a

      delete .hgsubstate and update

        $ hg up -C

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

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

        $ rm .hgsubstate

        $ hg up 0

        remote changed .hgsubstate which local deleted

        use (c)hanged version or leave (d)eleted? c

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

        $ hg st

        $ ls subrepo

        a

      Enable obsolete

        $ cat > ${TESTTMP}/obs.py << EOF

        > import mercurial.obsolete

        > mercurial.obsolete._enabled = True

        > EOF

        $ cat >> $HGRCPATH << EOF

        > [ui]

        > logtemplate= {rev}:{node|short} {desc|firstline}

        > [phases]

        > publish=False

        > [extensions]'

        > obs=${TESTTMP}/obs.py

        > EOF

      check that we can update parent repo with missing (amended) subrepo revision

        $ hg up --repository subrepo -r tip

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

        $ hg ci -m "updated subrepo to tip"

        created new head

        $ cd subrepo

        $ hg update -r tip

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

        $ echo foo > a

        $ hg commit --amend -m "addb (amended)"

        $ cd ..

        $ hg update --clean .

        revision 102a90ea7b4a in subrepo subrepo is hidden

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

        $ 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

				$ hg init repo
				$ cd repo
				$ hg init subrepo
				$ echo a > subrepo/a
				$ hg -R subrepo ci -Am adda
				adding a
				$ echo 'subrepo = subrepo' > .hgsub
				$ hg ci -Am addsubrepo
				adding .hgsub
				$ echo b > subrepo/b
				$ hg -R subrepo ci -Am addb
				adding b
				$ hg ci -m updatedsub

				ignore blanklines in .hgsubstate

				>>> file('.hgsubstate', 'wb').write('\n\n \t \n \n')
				$ hg st --subrepos
				M .hgsubstate
				$ hg revert -qC .hgsubstate

				abort more gracefully on .hgsubstate parsing error

				$ cp .hgsubstate .hgsubstate.old
				>>> file('.hgsubstate', 'wb').write('\ninvalid')
				$ hg st --subrepos
				abort: invalid subrepository revision specifier in .hgsubstate line 2
				[255]
				$ mv .hgsubstate.old .hgsubstate

				delete .hgsub and revert it

				$ rm .hgsub
				$ hg revert .hgsub
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found

				delete .hgsubstate and revert it

				$ rm .hgsubstate
				$ hg revert .hgsubstate

				delete .hgsub and update

				$ rm .hgsub
				$ hg up 0
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				warning: subrepo spec file .hgsub not found
				! .hgsub
				$ ls subrepo
				a

				delete .hgsubstate and update

				$ hg up -C
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hgsubstate
				$ hg up 0
				remote changed .hgsubstate which local deleted
				use (c)hanged version or leave (d)eleted? c
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				$ ls subrepo
				a

				Enable obsolete

				$ cat > ${TESTTMP}/obs.py << EOF
				> import mercurial.obsolete
				> mercurial.obsolete._enabled = True
				> EOF
				$ cat >> $HGRCPATH << EOF
				> [ui]
				> logtemplate= {rev}:{node\|short} {desc\|firstline}
				> [phases]
				> publish=False
				> [extensions]'
				> obs=${TESTTMP}/obs.py
				> EOF

				check that we can update parent repo with missing (amended) subrepo revision

				$ hg up --repository subrepo -r tip
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg ci -m "updated subrepo to tip"
				created new head
				$ cd subrepo
				$ hg update -r tip
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo > a
				$ hg commit --amend -m "addb (amended)"
				$ cd ..
				$ hg update --clean .
				revision 102a90ea7b4a in subrepo subrepo is hidden
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd ..