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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r24995:0579b0c2

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