upstream/mercurial-mirror Files · tests/test-mq-subrepo-svn.t

scmutil: make shortest() respect disambiguation revset...

scmutil: make shortest() respect disambiguation revset The previous patch would let you use a shorter prefix if the prefix is unique within a configured revset. However, that's not very useful if there's no simple way of knowing what that shorter prefix is. This patch adapts the shortest() template function to use the shorter prefixes for nodes in the configured revset. This is currently extremely slow, because it calculates the revset for each call to shortest(). To make this faster, the next patch will start caching the revset instance. Ideally we'd cache a prefix tree instance instead. Differential Revision: https://phab.mercurial-scm.org/D4038

Gregory Szorc - - Load All Authors

File last commit:

r34990:1a314176 stable


                r38879:6f7c9527

default

Download file

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

      #require svn13

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq =

        > [diff]

        > nodates = 1

        > [subrepos]

        > allowed = true

        > svn:allowed = true

        > EOF

      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 -qm 'init project' svn-project-2499 "$SVNREPOURL"

      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

				#require svn13

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> mq =
				> [diff]
				> nodates = 1
				> [subrepos]
				> allowed = true
				> svn:allowed = true
				> EOF

				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 -qm 'init project' svn-project-2499 "$SVNREPOURL"

				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 ..