upstream/mercurial-mirror Files · tests/test-revert-interactive.t

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

mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. 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" at failure even if "dirstate.write()" is executed before failure. 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).

Pierre-Yves David - - Load All Authors

File last commit:

r24698:a85c4ed1 default


                r24996:58308dde

default

Download file

             test-revert-interactive.t
        
                    272 lines
            
             | 4.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-interactive.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Laurent Charignon
    
revert: add flag to make revert interactive

              r24359
            
      Revert interactive tests

      1 add and commit file f

      2 add commit file folder1/g

      3 add and commit file folder2/h

      4 add and commit file folder1/i

      5 commit change to file f

      6 commit changes to files folder1/g folder2/h

      7 commit changes to files folder1/g folder2/h

      8 revert interactive to commit id 2 (line 3 above), check that folder1/i is removed and

      9 make workdir match 7

      10 run the same test than 8 from within folder1 and check same expectations

        $ cat <<EOF >> $HGRCPATH

        > [ui]

        > interactive = true

        > [extensions]

        > record =

        > EOF

        Yuya Nishihara
    
test-revert-interactive: eliminate bashism in wildcard pattern...

              r24389
            
        $ mkdir -p a/folder1 a/folder2

        Laurent Charignon
    
revert: add flag to make revert interactive

              r24359
            
        $ cd a

        $ hg init

        Matt Harbison
    
test-interactive: use stable EOL in various file generating routines...

              r24434
            
        >>> open('f', 'wb').write("1\n2\n3\n4\n5\n")

        $ hg add f ; hg commit -m "adding f"

        Matt Harbison
    
tests: replace uses of 'seq' with portable 'seq.py'

              r24361
            
        $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g"

        $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h"

        $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i"

        Matt Harbison
    
test-interactive: use stable EOL in various file generating routines...

              r24434
            
        >>> open('f', 'wb').write("a\n1\n2\n3\n4\n5\nb\n")

        $ hg commit -m "modifying f"

        >>> open('folder1/g', 'wb').write("c\n1\n2\n3\n4\n5\nd\n")

        $ hg commit -m "modifying folder1/g"

        >>> open('folder2/h', 'wb').write("e\n1\n2\n3\n4\n5\nf\n")

        $ hg commit -m "modifying folder2/h"

        Laurent Charignon
    
revert: add flag to make revert interactive

              r24359
            
        $ hg tip

        changeset:   6:59dd6e4ab63a

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     modifying folder2/h

        $ hg revert -i -r 2 --all -- << EOF

        > y

        > y

        > y

        > y

        > y

        > n

        > n

        > EOF

        reverting f

        reverting folder1/g (glob)

        removing folder1/i (glob)

        reverting folder2/h (glob)

        diff -r 89ac3d72e4a4 f

        2 hunks, 2 lines changed

        examine changes to 'f'? [Ynesfdaq?] y

        @@ -1,6 +1,5 @@

        -a

         1

         2

         3

         4

         5

        record change 1/6 to 'f'? [Ynesfdaq?] y

        @@ -2,6 +1,5 @@

         1

         2

         3

         4

         5

        -b

        record change 2/6 to 'f'? [Ynesfdaq?] y

        diff -r 89ac3d72e4a4 folder1/g

        2 hunks, 2 lines changed

        examine changes to 'folder1/g'? [Ynesfdaq?] y

        @@ -1,6 +1,5 @@

        -c

         1

         2

         3

         4

         5

        record change 3/6 to 'folder1/g'? [Ynesfdaq?] y

        @@ -2,6 +1,5 @@

         1

         2

         3

         4

         5

        -d

        record change 4/6 to 'folder1/g'? [Ynesfdaq?] n

        diff -r 89ac3d72e4a4 folder2/h

        2 hunks, 2 lines changed

        examine changes to 'folder2/h'? [Ynesfdaq?] n

        $ cat f

        1

        2

        3

        4

        5

        $ cat folder1/g

        1

        2

        3

        4

        5

        d

        $ cat folder2/h

        e

        1

        2

        3

        4

        5

        f

        Pierre-Yves David
    
revert: do not requires '--all' if '--interative' is present...

              r24698
            
      Test that --interactive lift the need for --all

        $ echo q | hg revert -i -r 2

        reverting folder1/g (glob)

        reverting folder2/h (glob)

        diff -r 89ac3d72e4a4 folder1/g

        1 hunks, 1 lines changed

        examine changes to 'folder1/g'? [Ynesfdaq?] q

        abort: user quit

        [255]

        $ rm folder1/g.orig

        Laurent Charignon
    
revert: add flag to make revert interactive

              r24359
            
        $ hg update -C 6

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg revert -i -r 2 --all -- << EOF

        > y

        > y

        > y

        > y

        > y

        > n

        > n

        > EOF

        reverting f

        reverting folder1/g (glob)

        removing folder1/i (glob)

        reverting folder2/h (glob)

        diff -r 89ac3d72e4a4 f

        2 hunks, 2 lines changed

        examine changes to 'f'? [Ynesfdaq?] y

        @@ -1,6 +1,5 @@

        -a

         1

         2

         3

         4

         5

        record change 1/6 to 'f'? [Ynesfdaq?] y

        @@ -2,6 +1,5 @@

         1

         2

         3

         4

         5

        -b

        record change 2/6 to 'f'? [Ynesfdaq?] y

        diff -r 89ac3d72e4a4 folder1/g

        2 hunks, 2 lines changed

        examine changes to 'folder1/g'? [Ynesfdaq?] y

        @@ -1,6 +1,5 @@

        -c

         1

         2

         3

         4

         5

        record change 3/6 to 'folder1/g'? [Ynesfdaq?] y

        @@ -2,6 +1,5 @@

         1

         2

         3

         4

         5

        -d

        record change 4/6 to 'folder1/g'? [Ynesfdaq?] n

        diff -r 89ac3d72e4a4 folder2/h

        2 hunks, 2 lines changed

        examine changes to 'folder2/h'? [Ynesfdaq?] n

        $ cat f

        1

        2

        3

        4

        5

        $ cat folder1/g

        1

        2

        3

        4

        5

        d

        $ cat folder2/h

        e

        1

        2

        3

        4

        5

        f

        Laurent Charignon
    
revert: fix --interactive on local modification (issue4576)...

              r24475
            
        $ hg st

        M f

        M folder1/g

        R folder1/i

        $ hg revert --interactive f << EOF

        > y

        > y

        > n

        > n

        > EOF

        diff -r 59dd6e4ab63a f

        2 hunks, 2 lines changed

        examine changes to 'f'? [Ynesfdaq?] y

        @@ -1,5 +1,6 @@

        +a

         1

         2

         3

         4

         5

        record change 1/2 to 'f'? [Ynesfdaq?] y

        @@ -1,5 +2,6 @@

         1

         2

         3

         4

         5

        +b

        record change 2/2 to 'f'? [Ynesfdaq?] n

        $ hg st

        M f

        M folder1/g

        R folder1/i

        ? f.orig

        $ cat f

        a

        1

        2

        3

        4

        5

        $ cat f.orig

        1

        2

        3

        4

        5

	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

Laurent Charignon revert: add flag to make revert interactive	r24359	Revert interactive tests
		1 add and commit file f
		2 add commit file folder1/g
		3 add and commit file folder2/h
		4 add and commit file folder1/i
		5 commit change to file f
		6 commit changes to files folder1/g folder2/h
		7 commit changes to files folder1/g folder2/h
		8 revert interactive to commit id 2 (line 3 above), check that folder1/i is removed and
		9 make workdir match 7
		10 run the same test than 8 from within folder1 and check same expectations

		$ cat <<EOF >> $HGRCPATH
		> [ui]
		> interactive = true
		> [extensions]
		> record =
		> EOF


Yuya Nishihara test-revert-interactive: eliminate bashism in wildcard pattern...	r24389	$ mkdir -p a/folder1 a/folder2
Laurent Charignon revert: add flag to make revert interactive	r24359	$ cd a
		$ hg init
Matt Harbison test-interactive: use stable EOL in various file generating routines...	r24434	>>> open('f', 'wb').write("1\n2\n3\n4\n5\n")
		$ hg add f ; hg commit -m "adding f"
Matt Harbison tests: replace uses of 'seq' with portable 'seq.py'	r24361	$ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g"
		$ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h"
		$ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i"
Matt Harbison test-interactive: use stable EOL in various file generating routines...	r24434	>>> open('f', 'wb').write("a\n1\n2\n3\n4\n5\nb\n")
		$ hg commit -m "modifying f"
		>>> open('folder1/g', 'wb').write("c\n1\n2\n3\n4\n5\nd\n")
		$ hg commit -m "modifying folder1/g"
		>>> open('folder2/h', 'wb').write("e\n1\n2\n3\n4\n5\nf\n")
		$ hg commit -m "modifying folder2/h"
Laurent Charignon revert: add flag to make revert interactive	r24359	$ hg tip
		changeset: 6:59dd6e4ab63a
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: modifying folder2/h

		$ hg revert -i -r 2 --all -- << EOF
		> y
		> y
		> y
		> y
		> y
		> n
		> n
		> EOF
		reverting f
		reverting folder1/g (glob)
		removing folder1/i (glob)
		reverting folder2/h (glob)
		diff -r 89ac3d72e4a4 f
		2 hunks, 2 lines changed
		examine changes to 'f'? [Ynesfdaq?] y

		@@ -1,6 +1,5 @@
		-a
		1
		2
		3
		4
		5
		record change 1/6 to 'f'? [Ynesfdaq?] y

		@@ -2,6 +1,5 @@
		1
		2
		3
		4
		5
		-b
		record change 2/6 to 'f'? [Ynesfdaq?] y

		diff -r 89ac3d72e4a4 folder1/g
		2 hunks, 2 lines changed
		examine changes to 'folder1/g'? [Ynesfdaq?] y

		@@ -1,6 +1,5 @@
		-c
		1
		2
		3
		4
		5
		record change 3/6 to 'folder1/g'? [Ynesfdaq?] y

		@@ -2,6 +1,5 @@
		1
		2
		3
		4
		5
		-d
		record change 4/6 to 'folder1/g'? [Ynesfdaq?] n

		diff -r 89ac3d72e4a4 folder2/h
		2 hunks, 2 lines changed
		examine changes to 'folder2/h'? [Ynesfdaq?] n

		$ cat f
		1
		2
		3
		4
		5
		$ cat folder1/g
		1
		2
		3
		4
		5
		d
		$ cat folder2/h
		e
		1
		2
		3
		4
		5
		f
Pierre-Yves David revert: do not requires '--all' if '--interative' is present...	r24698
		Test that --interactive lift the need for --all

		$ echo q \| hg revert -i -r 2
		reverting folder1/g (glob)
		reverting folder2/h (glob)
		diff -r 89ac3d72e4a4 folder1/g
		1 hunks, 1 lines changed
		examine changes to 'folder1/g'? [Ynesfdaq?] q

		abort: user quit
		[255]
		$ rm folder1/g.orig


Laurent Charignon revert: add flag to make revert interactive	r24359	$ hg update -C 6
		3 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg revert -i -r 2 --all -- << EOF
		> y
		> y
		> y
		> y
		> y
		> n
		> n
		> EOF
		reverting f
		reverting folder1/g (glob)
		removing folder1/i (glob)
		reverting folder2/h (glob)
		diff -r 89ac3d72e4a4 f
		2 hunks, 2 lines changed
		examine changes to 'f'? [Ynesfdaq?] y

		@@ -1,6 +1,5 @@
		-a
		1
		2
		3
		4
		5
		record change 1/6 to 'f'? [Ynesfdaq?] y

		@@ -2,6 +1,5 @@
		1
		2
		3
		4
		5
		-b
		record change 2/6 to 'f'? [Ynesfdaq?] y

		diff -r 89ac3d72e4a4 folder1/g
		2 hunks, 2 lines changed
		examine changes to 'folder1/g'? [Ynesfdaq?] y

		@@ -1,6 +1,5 @@
		-c
		1
		2
		3
		4
		5
		record change 3/6 to 'folder1/g'? [Ynesfdaq?] y

		@@ -2,6 +1,5 @@
		1
		2
		3
		4
		5
		-d
		record change 4/6 to 'folder1/g'? [Ynesfdaq?] n

		diff -r 89ac3d72e4a4 folder2/h
		2 hunks, 2 lines changed
		examine changes to 'folder2/h'? [Ynesfdaq?] n

		$ cat f
		1
		2
		3
		4
		5
		$ cat folder1/g
		1
		2
		3
		4
		5
		d
		$ cat folder2/h
		e
		1
		2
		3
		4
		5
		f
Laurent Charignon revert: fix --interactive on local modification (issue4576)...	r24475	$ hg st
		M f
		M folder1/g
		R folder1/i
		$ hg revert --interactive f << EOF
		> y
		> y
		> n
		> n
		> EOF
		diff -r 59dd6e4ab63a f
		2 hunks, 2 lines changed
		examine changes to 'f'? [Ynesfdaq?] y

		@@ -1,5 +1,6 @@
		+a
		1
		2
		3
		4
		5
		record change 1/2 to 'f'? [Ynesfdaq?] y

		@@ -1,5 +2,6 @@
		1
		2
		3
		4
		5
		+b
		record change 2/2 to 'f'? [Ynesfdaq?] n

		$ hg st
		M f
		M folder1/g
		R folder1/i
		? f.orig
		$ cat f
		a
		1
		2
		3
		4
		5
		$ cat f.orig
		1
		2
		3
		4
		5