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

Patrick Mezard - - Load All Authors

File last commit:

r17539:bc737716 default


                r20328:03d345da

stable

Download file

             test-subrepo-relative-path.t
        
                    105 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-relative-path.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" killdaemons || exit 80

      Preparing the subrepository 'sub'

        $ hg init sub

        $ echo sub > sub/sub

        $ hg add -R sub

        adding sub/sub (glob)

        $ hg commit -R sub -m "sub import"

      Preparing the 'main' repo which depends on the subrepo 'sub'

        $ hg init main

        $ echo main > main/main

        $ echo "sub = ../sub" > main/.hgsub

        $ hg clone sub main/sub

        updating to branch default

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

        $ hg add -R main

        adding main/.hgsub (glob)

        adding main/main (glob)

        $ hg commit -R main -m "main import"

      Cleaning both repositories, just as a clone -U

        $ hg up -C -R sub null

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

        $ hg up -C -R main null

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

        $ rm -rf main/sub

      hide outer repo

        $ hg init

      Serving them both using hgweb

        $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf

        $ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \

        >    -A /dev/null -E /dev/null --pid-file hg.pid -d

        $ cat hg.pid >> $DAEMON_PIDS

      Clone main from hgweb

        $ hg clone "http://localhost:$HGPORT/main" cloned

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        updating to branch default

        cloning subrepo sub from http://localhost:$HGPORT/sub

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

      Checking cloned repo ids

        $ hg id -R cloned

        fdfeeb3e979e tip

        $ hg id -R cloned/sub

        863c1745b441 tip

      subrepo debug for 'main' clone

        $ hg debugsub -R cloned

        path sub

         source   ../sub

         revision 863c1745b441bd97a8c4a096e87793073f4fb215

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

      subrepo paths with ssh urls

        $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        updating to branch default

        cloning subrepo sub from ssh://user@dummy/sub

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

        $ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned

        pushing to ssh://user@dummy/$TESTTMP/cloned

        pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub

        searching for changes

        no changes found

        searching for changes

        no changes found

        [1]

        $ cat dummylog

        Got arguments 1:user@dummy 2:hg -R cloned serve --stdio

        Got arguments 1:user@dummy 2:hg -R sub serve --stdio

        Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio

        Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio

	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

				$ "$TESTDIR/hghave" killdaemons \|\| exit 80

				Preparing the subrepository 'sub'

				$ hg init sub
				$ echo sub > sub/sub
				$ hg add -R sub
				adding sub/sub (glob)
				$ hg commit -R sub -m "sub import"

				Preparing the 'main' repo which depends on the subrepo 'sub'

				$ hg init main
				$ echo main > main/main
				$ echo "sub = ../sub" > main/.hgsub
				$ hg clone sub main/sub
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg add -R main
				adding main/.hgsub (glob)
				adding main/main (glob)
				$ hg commit -R main -m "main import"

				Cleaning both repositories, just as a clone -U

				$ hg up -C -R sub null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg up -C -R main null
				0 files updated, 0 files merged, 3 files removed, 0 files unresolved
				$ rm -rf main/sub

				hide outer repo
				$ hg init

				Serving them both using hgweb

				$ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
				$ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
				> -A /dev/null -E /dev/null --pid-file hg.pid -d
				$ cat hg.pid >> $DAEMON_PIDS

				Clone main from hgweb

				$ hg clone "http://localhost:$HGPORT/main" cloned
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				updating to branch default
				cloning subrepo sub from http://localhost:$HGPORT/sub
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Checking cloned repo ids

				$ hg id -R cloned
				fdfeeb3e979e tip
				$ hg id -R cloned/sub
				863c1745b441 tip

				subrepo debug for 'main' clone

				$ hg debugsub -R cloned
				path sub
				source ../sub
				revision 863c1745b441bd97a8c4a096e87793073f4fb215

				$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

				subrepo paths with ssh urls

				$ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				updating to branch default
				cloning subrepo sub from ssh://user@dummy/sub
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned
				pushing to ssh://user@dummy/$TESTTMP/cloned
				pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
				searching for changes
				no changes found
				searching for changes
				no changes found
				[1]

				$ cat dummylog
				Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
				Got arguments 1:user@dummy 2:hg -R sub serve --stdio
				Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio
				Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio