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

r17033:0413f68d default


                r20328:03d345da

stable

Download file

             test-mq-subrepo-svn.t
        
                    54 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-subrepo-svn.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ echo "[diff]" >> $HGRCPATH

        $ echo "nodates=1" >> $HGRCPATH

      fn to create new repository, and cd into it

        $ mkrepo() {

        >     hg init $1

        >     cd $1

        >     hg qinit

        > }

      handle svn subrepos safely

        $ svnadmin create svn-repo-2499

        $ SVNREPOPATH=`pwd`/svn-repo-2499/project

      #if windows

        $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #else

        $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`

      #endif

        $ mkdir -p svn-project-2499/trunk

        $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"

        Adding         svn-project-2499/trunk (glob)

        Committed revision 1.

      qnew on repo w/svn subrepo

        $ mkrepo repo-2499-svn-subrepo

        $ svn co "$SVNREPOURL"/trunk sub

        Checked out revision 1.

        $ echo 'sub = [svn]sub' >> .hgsub

        $ hg add .hgsub

        $ hg status -S -X '**/format'

        A .hgsub

        $ hg qnew -m0 0.diff

        $ cd sub

        $ echo a > a

        $ svn add a

        A         a

        $ svn st

        A*    a (glob)

        $ cd ..

        $ hg status -S        # doesn't show status for svn subrepos (yet)

        $ hg qnew -m1 1.diff

        abort: uncommitted changes in subrepository sub

        [255]

        $ 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

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

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH
				$ echo "[diff]" >> $HGRCPATH
				$ echo "nodates=1" >> $HGRCPATH

				fn to create new repository, and cd into it
				$ mkrepo() {
				> hg init $1
				> cd $1
				> hg qinit
				> }


				handle svn subrepos safely

				$ svnadmin create svn-repo-2499

				$ SVNREPOPATH=`pwd`/svn-repo-2499/project
				#if windows
				$ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#else
				$ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
				#endif

				$ mkdir -p svn-project-2499/trunk
				$ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"
				Adding svn-project-2499/trunk (glob)

				Committed revision 1.

				qnew on repo w/svn subrepo
				$ mkrepo repo-2499-svn-subrepo
				$ svn co "$SVNREPOURL"/trunk sub
				Checked out revision 1.
				$ echo 'sub = [svn]sub' >> .hgsub
				$ hg add .hgsub
				$ hg status -S -X '**/format'
				A .hgsub
				$ hg qnew -m0 0.diff
				$ cd sub
				$ echo a > a
				$ svn add a
				A a
				$ svn st
				A* a (glob)
				$ cd ..
				$ hg status -S # doesn't show status for svn subrepos (yet)
				$ hg qnew -m1 1.diff
				abort: uncommitted changes in subrepository sub
				[255]

				$ cd ..