upstream/mercurial-mirror Files · tests/test-diff-change.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:

r16913:f2719b38 default


                r25878:800e090e

stable

Download file

             test-diff-change.t
        
                    93 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-change.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing diff --change

        $ hg init a

        $ cd a

        $ echo "first" > file.txt

        $ hg add file.txt

        $ hg commit -m 'first commit' # 0

        $ echo "second" > file.txt

        $ hg commit -m 'second commit' # 1

        $ echo "third" > file.txt

        $ hg commit -m 'third commit' # 2

        $ hg diff --nodates --change 1

        diff -r 4bb65dda5db4 -r e9b286083166 file.txt

        --- a/file.txt

        +++ b/file.txt

        @@ -1,1 +1,1 @@

        -first

        +second

        $ hg diff --change e9b286083166

        diff -r 4bb65dda5db4 -r e9b286083166 file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -first

        +second

      Test dumb revspecs (issue3474)

        $ hg diff -r 2:2

        $ hg diff -r "2 and 1"

        abort: empty revision range

        [255]

      Testing diff --change when merge:

        $ for i in 1 2 3 4 5 6 7 8 9 10; do

        >    echo $i >> file.txt

        > done

        $ hg commit -m "lots of text" # 3

        $ sed -e 's,^2$,x,' file.txt > file.txt.tmp

        $ mv file.txt.tmp file.txt

        $ hg commit -m "change 2 to x" # 4

        $ hg up -r 3

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

        $ sed -e 's,^8$,y,' file.txt > file.txt.tmp

        $ mv file.txt.tmp file.txt

        $ hg commit -m "change 8 to y"

        created new head

        $ hg up -C -r 4

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

        $ hg merge -r 5

        merging file.txt

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

        (branch merge, don't forget to commit)

        $ hg commit -m "merge 8 to y" # 6

        $ hg diff --change 5

        diff -r ae119d680c82 -r 9085c5c02e52 file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -6,6 +6,6 @@

         5

         6

         7

        -8

        +y

         9

         10

      must be similar to 'hg diff --change 5':

        $ hg diff -c 6

        diff -r 273b50f17c6d -r 979ca961fd2e file.txt

        --- a/file.txt	Thu Jan 01 00:00:00 1970 +0000

        +++ b/file.txt	Thu Jan 01 00:00:00 1970 +0000

        @@ -6,6 +6,6 @@

         5

         6

         7

        -8

        +y

         9

         10

        $ 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

				Testing diff --change

				$ hg init a
				$ cd a

				$ echo "first" > file.txt
				$ hg add file.txt
				$ hg commit -m 'first commit' # 0

				$ echo "second" > file.txt
				$ hg commit -m 'second commit' # 1

				$ echo "third" > file.txt
				$ hg commit -m 'third commit' # 2

				$ hg diff --nodates --change 1
				diff -r 4bb65dda5db4 -r e9b286083166 file.txt
				--- a/file.txt
				+++ b/file.txt
				@@ -1,1 +1,1 @@
				-first
				+second

				$ hg diff --change e9b286083166
				diff -r 4bb65dda5db4 -r e9b286083166 file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-first
				+second

				Test dumb revspecs (issue3474)

				$ hg diff -r 2:2
				$ hg diff -r "2 and 1"
				abort: empty revision range
				[255]

				Testing diff --change when merge:

				$ for i in 1 2 3 4 5 6 7 8 9 10; do
				> echo $i >> file.txt
				> done
				$ hg commit -m "lots of text" # 3

				$ sed -e 's,^2$,x,' file.txt > file.txt.tmp
				$ mv file.txt.tmp file.txt
				$ hg commit -m "change 2 to x" # 4

				$ hg up -r 3
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed -e 's,^8$,y,' file.txt > file.txt.tmp
				$ mv file.txt.tmp file.txt
				$ hg commit -m "change 8 to y"
				created new head

				$ hg up -C -r 4
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg merge -r 5
				merging file.txt
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "merge 8 to y" # 6

				$ hg diff --change 5
				diff -r ae119d680c82 -r 9085c5c02e52 file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -6,6 +6,6 @@
				5
				6
				7
				-8
				+y
				9
				10

				must be similar to 'hg diff --change 5':

				$ hg diff -c 6
				diff -r 273b50f17c6d -r 979ca961fd2e file.txt
				--- a/file.txt Thu Jan 01 00:00:00 1970 +0000
				+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
				@@ -6,6 +6,6 @@
				5
				6
				7
				-8
				+y
				9
				10

				$ cd ..