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

Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default


                r20328:03d345da

stable

Download file

             test-convert-svn-branches.t
        
                    98 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-svn-branches.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        $ "$TESTDIR/hghave" svn svn-bindings || exit 80

        Martin Geisler
    
tests: don't overwrite HGRCPATH...

              r13519
            
        $ cat >> $HGRCPATH <<EOF

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        > [extensions]

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on continued lines too...

              r17347
            
        > convert =

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        > EOF

        $ svnadmin create svn-repo

        $ svnadmin load -q svn-repo < "$TESTDIR/svn/branches.svndump"

      Convert trunk and branches

        $ cat > branchmap <<EOF

        > old3 newbranch

        Mads Kiilerich
    
check-code: fix check for trailing whitespace on continued lines too...

              r17347
            
        > 

        Patrick Mezard
    
convert: ignore blank lines in mapfiles (issue3286)

              r16190
            
        > 

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        > EOF

        $ hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg

        initializing destination A-hg repository

        scanning source...

        sorting...

        converting...

        10 init projA

        9 hello

        8 branch trunk, remove c and dir

        7 change a

        6 change b

        5 move and update c

        4 move and update c

        3 change b again

        2 move to old2

        1 move back to old

        0 last change to a

        Patrick Mezard
    
convert: add svnrev, svnpath and svnuuid template keywords...

              r13691
            
      Test template keywords

        $ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n'

        10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10

        9 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@9

        8 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old2@8

        7 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@7

        6 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@6

        5 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@6

        4 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@5

        3 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@4

        2 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@3

        1 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@2

        0 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@1

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
      Convert again

        $ hg convert --branchmap=branchmap --datesort svn-repo A-hg

        scanning source...

        sorting...

        converting...

        0 branch trunk@1 into old3

        $ cd A-hg

        Martin Geisler
    
tests: don't load unnecessary graphlog extension...

              r20117
            
        $ hg log -G --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        o  branch=newbranch 11 branch trunk@1 into old3 files:

        |

        | o  branch= 10 last change to a files: a

        | |

        | | o  branch=old 9 move back to old files:

        | | |

        | | o  branch=old2 8 move to old2 files:

        | | |

        | | o  branch=old 7 change b again files: b

        | | |

        | o |  branch= 6 move and update c files: b

        | | |

        | | o  branch=old 5 move and update c files: c

        | | |

        | | o  branch=old 4 change b files: b

        | | |

        | o |  branch= 3 change a files: a

        | | |

        | | o  branch=old 2 branch trunk, remove c and dir files: c

        | |/

        | o  branch= 1 hello files: a b c dir/e

        |/

        o  branch= 0 init projA files:

        $ hg branches

        Peter Arrenbrecht
    
localrepo: reuse parent manifest in commitctx if no files have changed...

              r14162
            
        newbranch                     11:a6d7cc050ad1

        default                       10:6e2b33404495

        old                            9:93c4b0f99529

        old2                           8:b52884d7bead (inactive)

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        $ hg tags -q

        tip

        $ cd ..

      Test hg failing to call itself

        Patrick Mezard
    
test-convert-svn-branches.t: fix self call failure on Windows...

              r17447
            
        $ HG=foobar hg convert svn-repo B-hg 2>&1 | grep abort

        Dan Villiom Podlaski Christiansen
    
tests: unify test-convert-svn-*

              r12370
            
        abort: Mercurial failed to run itself, check hg executable is in PATH

	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

Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370
		$ "$TESTDIR/hghave" svn svn-bindings \|\| exit 80

Martin Geisler tests: don't overwrite HGRCPATH...	r13519	$ cat >> $HGRCPATH <<EOF
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	> [extensions]
Mads Kiilerich check-code: fix check for trailing whitespace on continued lines too...	r17347	> convert =
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	> EOF

		$ svnadmin create svn-repo
		$ svnadmin load -q svn-repo < "$TESTDIR/svn/branches.svndump"

		Convert trunk and branches

		$ cat > branchmap <<EOF
		> old3 newbranch
Mads Kiilerich check-code: fix check for trailing whitespace on continued lines too...	r17347	>
Patrick Mezard convert: ignore blank lines in mapfiles (issue3286)	r16190	>
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	> EOF
		$ hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
		initializing destination A-hg repository
		scanning source...
		sorting...
		converting...
		10 init projA
		9 hello
		8 branch trunk, remove c and dir
		7 change a
		6 change b
		5 move and update c
		4 move and update c
		3 change b again
		2 move to old2
		1 move back to old
		0 last change to a

Patrick Mezard convert: add svnrev, svnpath and svnuuid template keywords...	r13691	Test template keywords

		$ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n'
		10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10
		9 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@9
		8 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old2@8
		7 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@7
		6 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@6
		5 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@6
		4 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@5
		3 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@4
		2 644ede6c-2b81-4367-9dc8-d786514f2cde/branches/old@3
		1 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@2
		0 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@1

Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	Convert again

		$ hg convert --branchmap=branchmap --datesort svn-repo A-hg
		scanning source...
		sorting...
		converting...
		0 branch trunk@1 into old3

		$ cd A-hg
Martin Geisler tests: don't load unnecessary graphlog extension...	r20117	$ hg log -G --template 'branch={branches} {rev} {desc\|firstline} files: {files}\n'
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	o branch=newbranch 11 branch trunk@1 into old3 files:
		\|
		\| o branch= 10 last change to a files: a
		\| \|
		\| \| o branch=old 9 move back to old files:
		\| \| \|
		\| \| o branch=old2 8 move to old2 files:
		\| \| \|
		\| \| o branch=old 7 change b again files: b
		\| \| \|
		\| o \| branch= 6 move and update c files: b
		\| \| \|
		\| \| o branch=old 5 move and update c files: c
		\| \| \|
		\| \| o branch=old 4 change b files: b
		\| \| \|
		\| o \| branch= 3 change a files: a
		\| \| \|
		\| \| o branch=old 2 branch trunk, remove c and dir files: c
		\| \|/
		\| o branch= 1 hello files: a b c dir/e
		\|/
		o branch= 0 init projA files:


		$ hg branches
Peter Arrenbrecht localrepo: reuse parent manifest in commitctx if no files have changed...	r14162	newbranch 11:a6d7cc050ad1
		default 10:6e2b33404495
		old 9:93c4b0f99529
		old2 8:b52884d7bead (inactive)
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	$ hg tags -q
		tip
		$ cd ..

		Test hg failing to call itself

Patrick Mezard test-convert-svn-branches.t: fix self call failure on Windows...	r17447	$ HG=foobar hg convert svn-repo B-hg 2>&1 \| grep abort
Dan Villiom Podlaski Christiansen tests: unify test-convert-svn-*	r12370	abort: Mercurial failed to run itself, check hg executable is in PATH