upstream/mercurial-mirror Files · tests/test-convert-svn-branches.t

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r25590:183965a0

default

Download file

             test-convert-svn-branches.t
        
                    129 lines
            
             | 3.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-svn-branches.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require svn svn-bindings

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > convert =

        > EOF

        $ svnadmin create svn-repo

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

      Convert trunk and branches

        $ cat > branchmap <<EOF

        > old3 newbranch

        > 

        > 

        > 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

      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

      Convert again

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

        scanning source...

        sorting...

        converting...

        0 branch trunk@1 into old3

        $ cd A-hg

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

        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

        newbranch                     11:a6d7cc050ad1

        default                       10:6e2b33404495

        old                            9:93c4b0f99529

        old2                           8:b52884d7bead (inactive)

        $ hg tags -q

        tip

        $ cd ..

      Test hg failing to call itself

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

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

      Convert 'trunk' to branch other than 'default'

        $ cat > branchmap <<EOF

        > None hgtrunk

        > 

        > 

        > EOF

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

        initializing destination C-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

        $ cd C-hg

        $ hg branches

        hgtrunk                       10:745f063703b4

        old                            9:aa50d7b8d922

        old2                           8:c85a22267b6e (inactive)

        $ 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 svn svn-bindings

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> convert =
				> EOF

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

				Convert trunk and branches

				$ cat > branchmap <<EOF
				> old3 newbranch
				>
				>
				> 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

				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

				Convert again

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

				$ cd A-hg
				$ hg log -G --template 'branch={branches} {rev} {desc\|firstline} files: {files}\n'
				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
				newbranch 11:a6d7cc050ad1
				default 10:6e2b33404495
				old 9:93c4b0f99529
				old2 8:b52884d7bead (inactive)
				$ hg tags -q
				tip
				$ cd ..

				Test hg failing to call itself

				$ HG=foobar hg convert svn-repo B-hg 2>&1 \| grep abort
				abort: Mercurial failed to run itself, check hg executable is in PATH

				Convert 'trunk' to branch other than 'default'

				$ cat > branchmap <<EOF
				> None hgtrunk
				>
				>
				> EOF
				$ hg convert --branchmap=branchmap --datesort -r 10 svn-repo C-hg
				initializing destination C-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

				$ cd C-hg
				$ hg branches
				hgtrunk 10:745f063703b4
				old 9:aa50d7b8d922
				old2 8:c85a22267b6e (inactive)
				$ cd ..