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

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Matt Harbison - - Load All Authors

File last commit:

r39743:5abc47d4 default


                r41198:0101a35d

default

Download file

             test-convert-hg-svn.t
        
                    122 lines
            
             | 3.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-hg-svn.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require svn svn-bindings

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        timeless
    
tests: stabilize svn output...

              r28469
            
        $ filter_svn_output () {

        FUJIWARA Katsunori
    
tests: make tests for convert with svn portable...

              r28533
            
        >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true

        timeless
    
tests: stabilize svn output...

              r28469
            
        > }

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > convert =

        > mq =

        > EOF

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ SVNREPOPATH=`pwd`/svn-repo

      #if windows

        Matt Harbison
    
tests: quote PYTHON usage...

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

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
      #else

        Matt Harbison
    
tests: quote PYTHON usage...

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

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
      #endif

        $ svnadmin create "$SVNREPOPATH"

        $ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        > #!/bin/sh

        > 

        > REPOS="$1"

        > REV="$2"

        > USER="$3"

        > PROPNAME="$4"

        > ACTION="$5"

        > 

        > if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi

        > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi

        > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi

        > 

        > echo "Changing prohibited revision property" >&2

        > exit 1

        > EOF

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change

        $ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        Checked out revision 0.

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ cd "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        $ echo a > a

        $ svn add a

        A         a

        timeless
    
tests: stabilize svn output...

              r28469
            
        $ svn ci -m'added a' a | filter_svn_output

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        Adding         a

        Transmitting file data .

        Committed revision 1.

        $ cd ..

      initial roundtrip

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg | grep -v initializing

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

        0 added a

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

      second roundtrip should do nothing

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

      new hg rev

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ cd "$SVNREPOPATH"-work

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        $ echo b > b

        $ hg add b

        $ hg ci -mb

      adding an empty revision

        $ hg qnew -m emtpy empty

        $ hg qfinish -a

        $ cd ..

      echo hg to svn

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work

        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

        1 b

        0 emtpy

      svn back to hg should do nothing

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

      hg back to svn should do nothing

        Mads Kiilerich
    
tests: cleanup of svn url handling...

              r17033
            
        $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc

        Matt Mackall
    
tests: unify test-convert-hg-svn

              r12527
            
        scanning source...

        sorting...

        converting...

        Mads Kiilerich
    
convert: make subversion revsplit more stable when meeting revisions without @...

              r20419
            
      verify which shamap format we are storing and must be able to handle

        $ cat svn-repo-hg/.hg/shamap

        svn:????????-????-????-????-????????????@1 ???????????????????????????????????????? (glob)

        svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)

        svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)

        $ cat svn-repo-wc/.svn/hg-shamap

        ???????????????????????????????????????? 1 (glob)

        ???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)

        ???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require svn svn-bindings
Matt Mackall tests: unify test-convert-hg-svn	r12527
timeless tests: stabilize svn output...	r28469	$ filter_svn_output () {
FUJIWARA Katsunori tests: make tests for convert with svn portable...	r28533	> egrep -v 'Committing\|Updating\|(^$)' \| sed -e 's/done$//' \|\| true
timeless tests: stabilize svn output...	r28469	> }

Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> convert =
		> mq =
		> EOF
Mads Kiilerich tests: cleanup of svn url handling...	r17033
		$ SVNREPOPATH=`pwd`/svn-repo
		#if windows
Matt Harbison tests: quote PYTHON usage...	r39743	$ SVNREPOURL=file:///`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich tests: cleanup of svn url handling...	r17033	#else
Matt Harbison tests: quote PYTHON usage...	r39743	$ SVNREPOURL=file://`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich tests: cleanup of svn url handling...	r17033	#endif

		$ svnadmin create "$SVNREPOPATH"
		$ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF
Matt Mackall tests: unify test-convert-hg-svn	r12527	> #!/bin/sh
		>
		> REPOS="$1"
		> REV="$2"
		> USER="$3"
		> PROPNAME="$4"
		> ACTION="$5"
		>
		> if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
		> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi
		> if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi
		>
		> echo "Changing prohibited revision property" >&2
		> exit 1
		> EOF
Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change
		$ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	Checked out revision 0.
Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ cd "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	$ echo a > a
		$ svn add a
		A a
timeless tests: stabilize svn output...	r28469	$ svn ci -m'added a' a \| filter_svn_output
Matt Mackall tests: unify test-convert-hg-svn	r12527	Adding a
		Transmitting file data .
		Committed revision 1.
		$ cd ..

		initial roundtrip

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg \| grep -v initializing
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...
		0 added a
Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...

		second roundtrip should do nothing

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...
Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...

		new hg rev

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work
Matt Mackall tests: unify test-convert-hg-svn	r12527	updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ cd "$SVNREPOPATH"-work
Matt Mackall tests: unify test-convert-hg-svn	r12527	$ echo b > b
		$ hg add b
		$ hg ci -mb

		adding an empty revision

		$ hg qnew -m emtpy empty
		$ hg qfinish -a
		$ cd ..

		echo hg to svn

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work
		$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...
		1 b
		0 emtpy

		svn back to hg should do nothing

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...

		hg back to svn should do nothing

Mads Kiilerich tests: cleanup of svn url handling...	r17033	$ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
Matt Mackall tests: unify test-convert-hg-svn	r12527	scanning source...
		sorting...
		converting...
Mads Kiilerich convert: make subversion revsplit more stable when meeting revisions without @...	r20419
		verify which shamap format we are storing and must be able to handle

		$ cat svn-repo-hg/.hg/shamap
		svn:????????-????-????-????-????????????@1 ???????????????????????????????????????? (glob)
		svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
		svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
		$ cat svn-repo-wc/.svn/hg-shamap
		???????????????????????????????????????? 1 (glob)
		???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)
		???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)