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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Mads Kiilerich - - Load All Authors

File last commit:

r22293:a970a5c1 default


                r25878:800e090e

stable

Download file

             test-convert-p4.t
        
                    152 lines
            
             | 4.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-p4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require p4

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "convert = " >> $HGRCPATH

      create p4 depot

        $ P4ROOT=`pwd`/depot; export P4ROOT

        $ P4AUDIT=$P4ROOT/audit; export P4AUDIT

        $ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL

        $ P4LOG=$P4ROOT/log; export P4LOG

        $ P4PORT=localhost:$HGPORT; export P4PORT

        $ P4DEBUG=1; export P4DEBUG

      start the p4 server

        $ [ ! -d $P4ROOT ] && mkdir $P4ROOT

        $ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &

        $ echo $! >> $DAEMON_PIDS

        $ trap "echo stopping the p4 server ; p4 admin stop" EXIT

        $ # wait for the server to initialize

        $ while ! p4 ; do

        >    sleep 1

        > done >/dev/null 2>/dev/null

      create a client spec

        $ P4CLIENT=hg-p4-import; export P4CLIENT

        $ DEPOTPATH=//depot/test-mercurial-import/...

        $ p4 client -o | sed '/^View:/,$ d' >p4client

        $ echo View: >>p4client

        $ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client

        $ p4 client -i <p4client

        Client hg-p4-import saved.

      populate the depot

        $ echo a > a

        $ mkdir b

        $ echo c > b/c

        $ p4 add a b/c

        //depot/test-mercurial-import/a#1 - opened for add

        //depot/test-mercurial-import/b/c#1 - opened for add

        $ p4 submit -d initial

        Submitting change 1.

        Locking 2 files ...

        add //depot/test-mercurial-import/a#1

        add //depot/test-mercurial-import/b/c#1

        Change 1 submitted.

      change some files

        $ p4 edit a

        //depot/test-mercurial-import/a#1 - opened for edit

        $ echo aa >> a

        $ p4 submit -d "change a"

        Submitting change 2.

        Locking 1 files ...

        edit //depot/test-mercurial-import/a#2

        Change 2 submitted.

        $ p4 edit b/c

        //depot/test-mercurial-import/b/c#1 - opened for edit

        $ echo cc >> b/c

        $ p4 submit -d "change b/c"

        Submitting change 3.

        Locking 1 files ...

        edit //depot/test-mercurial-import/b/c#2

        Change 3 submitted.

      convert

        $ hg convert -s p4 $DEPOTPATH dst

        initializing destination dst repository

        reading p4 views

        collecting p4 changelists

        1 initial

        2 change a

        3 change b/c

        scanning source...

        sorting...

        converting...

        2 initial

        1 change a

        0 change b/c

        $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'

        rev=2 desc="change b/c" tags="tip" files="b/c"

        rev=1 desc="change a" tags="" files="a"

        rev=0 desc="initial" tags="" files="a b/c"

      change some files

        $ p4 edit a b/c

        //depot/test-mercurial-import/a#2 - opened for edit

        //depot/test-mercurial-import/b/c#2 - opened for edit

        $ echo aaa >> a

        $ echo ccc >> b/c

        $ p4 submit -d "change a b/c"

        Submitting change 4.

        Locking 2 files ...

        edit //depot/test-mercurial-import/a#3

        edit //depot/test-mercurial-import/b/c#3

        Change 4 submitted.

      convert again

        $ hg convert -s p4 $DEPOTPATH dst

        reading p4 views

        collecting p4 changelists

        1 initial

        2 change a

        3 change b/c

        4 change a b/c

        scanning source...

        sorting...

        converting...

        0 change a b/c

        $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'

        rev=3 desc="change a b/c" tags="tip" files="a b/c"

        rev=2 desc="change b/c" tags="" files="b/c"

        rev=1 desc="change a" tags="" files="a"

        rev=0 desc="initial" tags="" files="a b/c"

      interesting names

        $ echo dddd > "d d"

        $ mkdir " e"

        $ echo fff >" e/ f"

        $ p4 add "d d" " e/ f"

        //depot/test-mercurial-import/d d#1 - opened for add

        //depot/test-mercurial-import/ e/ f#1 - opened for add

        $ p4 submit -d "add d e f"

        Submitting change 5.

        Locking 2 files ...

        add //depot/test-mercurial-import/ e/ f#1

        add //depot/test-mercurial-import/d d#1

        Change 5 submitted.

      convert again

        $ hg convert -s p4 $DEPOTPATH dst

        reading p4 views

        collecting p4 changelists

        1 initial

        2 change a

        3 change b/c

        4 change a b/c

        5 add d e f

        scanning source...

        sorting...

        converting...

        0 add d e f

        $ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'

        rev=4 desc="add d e f" tags="tip" files=" e/ f d d"

        rev=3 desc="change a b/c" tags="" files="a b/c"

        rev=2 desc="change b/c" tags="" files="b/c"

        rev=1 desc="change a" tags="" files="a"

        rev=0 desc="initial" tags="" files="a b/c"

      exit trap:

        stopping the p4 server

	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 p4

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "convert = " >> $HGRCPATH

				create p4 depot
				$ P4ROOT=`pwd`/depot; export P4ROOT
				$ P4AUDIT=$P4ROOT/audit; export P4AUDIT
				$ P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
				$ P4LOG=$P4ROOT/log; export P4LOG
				$ P4PORT=localhost:$HGPORT; export P4PORT
				$ P4DEBUG=1; export P4DEBUG

				start the p4 server
				$ [ ! -d $P4ROOT ] && mkdir $P4ROOT
				$ p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &
				$ echo $! >> $DAEMON_PIDS
				$ trap "echo stopping the p4 server ; p4 admin stop" EXIT

				$ # wait for the server to initialize
				$ while ! p4 ; do
				> sleep 1
				> done >/dev/null 2>/dev/null

				create a client spec
				$ P4CLIENT=hg-p4-import; export P4CLIENT
				$ DEPOTPATH=//depot/test-mercurial-import/...
				$ p4 client -o \| sed '/^View:/,$ d' >p4client
				$ echo View: >>p4client
				$ echo " $DEPOTPATH //$P4CLIENT/..." >>p4client
				$ p4 client -i <p4client
				Client hg-p4-import saved.

				populate the depot
				$ echo a > a
				$ mkdir b
				$ echo c > b/c
				$ p4 add a b/c
				//depot/test-mercurial-import/a#1 - opened for add
				//depot/test-mercurial-import/b/c#1 - opened for add
				$ p4 submit -d initial
				Submitting change 1.
				Locking 2 files ...
				add //depot/test-mercurial-import/a#1
				add //depot/test-mercurial-import/b/c#1
				Change 1 submitted.

				change some files
				$ p4 edit a
				//depot/test-mercurial-import/a#1 - opened for edit
				$ echo aa >> a
				$ p4 submit -d "change a"
				Submitting change 2.
				Locking 1 files ...
				edit //depot/test-mercurial-import/a#2
				Change 2 submitted.

				$ p4 edit b/c
				//depot/test-mercurial-import/b/c#1 - opened for edit
				$ echo cc >> b/c
				$ p4 submit -d "change b/c"
				Submitting change 3.
				Locking 1 files ...
				edit //depot/test-mercurial-import/b/c#2
				Change 3 submitted.

				convert
				$ hg convert -s p4 $DEPOTPATH dst
				initializing destination dst repository
				reading p4 views
				collecting p4 changelists
				1 initial
				2 change a
				3 change b/c
				scanning source...
				sorting...
				converting...
				2 initial
				1 change a
				0 change b/c
				$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
				rev=2 desc="change b/c" tags="tip" files="b/c"
				rev=1 desc="change a" tags="" files="a"
				rev=0 desc="initial" tags="" files="a b/c"

				change some files
				$ p4 edit a b/c
				//depot/test-mercurial-import/a#2 - opened for edit
				//depot/test-mercurial-import/b/c#2 - opened for edit
				$ echo aaa >> a
				$ echo ccc >> b/c
				$ p4 submit -d "change a b/c"
				Submitting change 4.
				Locking 2 files ...
				edit //depot/test-mercurial-import/a#3
				edit //depot/test-mercurial-import/b/c#3
				Change 4 submitted.

				convert again
				$ hg convert -s p4 $DEPOTPATH dst
				reading p4 views
				collecting p4 changelists
				1 initial
				2 change a
				3 change b/c
				4 change a b/c
				scanning source...
				sorting...
				converting...
				0 change a b/c
				$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
				rev=3 desc="change a b/c" tags="tip" files="a b/c"
				rev=2 desc="change b/c" tags="" files="b/c"
				rev=1 desc="change a" tags="" files="a"
				rev=0 desc="initial" tags="" files="a b/c"

				interesting names
				$ echo dddd > "d d"
				$ mkdir " e"
				$ echo fff >" e/ f"
				$ p4 add "d d" " e/ f"
				//depot/test-mercurial-import/d d#1 - opened for add
				//depot/test-mercurial-import/ e/ f#1 - opened for add
				$ p4 submit -d "add d e f"
				Submitting change 5.
				Locking 2 files ...
				add //depot/test-mercurial-import/ e/ f#1
				add //depot/test-mercurial-import/d d#1
				Change 5 submitted.

				convert again
				$ hg convert -s p4 $DEPOTPATH dst
				reading p4 views
				collecting p4 changelists
				1 initial
				2 change a
				3 change b/c
				4 change a b/c
				5 add d e f
				scanning source...
				sorting...
				converting...
				0 add d e f
				$ hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'
				rev=4 desc="add d e f" tags="tip" files=" e/ f d d"
				rev=3 desc="change a b/c" tags="" files="a b/c"
				rev=2 desc="change b/c" tags="" files="b/c"
				rev=1 desc="change a" tags="" files="a"
				rev=0 desc="initial" tags="" files="a b/c"

				exit trap:
				stopping the p4 server