upstream/mercurial-mirror Files · tests/test-diff-copy-depth.t

mq: use dirstateguard instead of dirstate.invalidate (qrefresh)...

mq: use dirstateguard instead of dirstate.invalidate (qrefresh) Before this patch, "mq.queue.refresh()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Adrian Buehlmann - - Load All Authors

File last commit:

r12150:bca69641 default


                r24997:12f3c714

default

Download file

             test-diff-copy-depth.t
        
                    51 lines
            
             | 795 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-copy-depth.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ for i in aaa zzz; do

        >     hg init t

        >     cd t

        > 

        >     echo

        >     echo "-- With $i"

        > 

        >     touch file

        >     hg add file

        >     hg ci -m "Add"

        > 

        >     hg cp file $i

        >     hg ci -m "a -> $i"

        > 

        >     hg cp $i other-file

        >     echo "different" >> $i

        >     hg ci -m "$i -> other-file"

        > 

        >     hg cp other-file somename

        > 

        >     echo "Status":

        >     hg st -C

        >     echo

        >     echo "Diff:"

        >     hg diff -g

        > 

        >     cd ..

        >     rm -rf t

        > done

        -- With aaa

        Status:

        A somename

          other-file

        Diff:

        diff --git a/other-file b/somename

        copy from other-file

        copy to somename

        -- With zzz

        Status:

        A somename

          other-file

        Diff:

        diff --git a/other-file b/somename

        copy from other-file

        copy to somename

	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

				$ for i in aaa zzz; do
				> hg init t
				> cd t
				>
				> echo
				> echo "-- With $i"
				>
				> touch file
				> hg add file
				> hg ci -m "Add"
				>
				> hg cp file $i
				> hg ci -m "a -> $i"
				>
				> hg cp $i other-file
				> echo "different" >> $i
				> hg ci -m "$i -> other-file"
				>
				> hg cp other-file somename
				>
				> echo "Status":
				> hg st -C
				> echo
				> echo "Diff:"
				> hg diff -g
				>
				> cd ..
				> rm -rf t
				> done

				-- With aaa
				Status:
				A somename
				other-file

				Diff:
				diff --git a/other-file b/somename
				copy from other-file
				copy to somename

				-- With zzz
				Status:
				A somename
				other-file

				Diff:
				diff --git a/other-file b/somename
				copy from other-file
				copy to somename