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

debian: switch to using debhelper and dh_python2 to build debs...

debian: switch to using debhelper and dh_python2 to build debs This is a much larger commit than I'd like, but I honestly don't see a good way to break it up and leave things working. Summary: We now use debian/rules with debhelper to build our debs. This is much more standard, and means we use dh_python2 to do things like handle leaving .pyc files out of the built debs. The resulting package is split into mercurial and mercurial-common, with the former being the hg stub and all the native .sos, and the latter being basically everything else. builddeb and dockerdeb are updated to use the new system. The old way (using dpkg by hand) breaks with the above changes because debian/control no longer contains a version string (that's now guessed from the phony changelog.) Tests are updated to assert that the right files end up in the right debs.

Laurent Charignon - - Load All Authors

File last commit:

r25657:dcc56e10 default


                r26148:7f49efca

default

Download file

             test-revert-interactive.t
        
                    379 lines
            
             | 6.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-interactive.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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

        $ mkdir -p a/folder1 a/folder2

        $ cd a

        $ hg init

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

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

        $ 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"

        >>> 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"

        $ 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 --git a/f b/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/6 to 'f'? [Ynesfdaq?] y

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

         1

         2

         3

         4

         5

        +b

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

        diff --git a/folder1/g b/folder1/g

        2 hunks, 2 lines changed

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

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

        +c

         1

         2

         3

         4

         5

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

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

         1

         2

         3

         4

         5

        +d

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

        diff --git a/folder2/h b/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

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

        $ echo q | hg revert -i -r 2

        reverting folder1/g (glob)

        reverting folder2/h (glob)

        diff --git a/folder1/g b/folder1/g

        1 hunks, 1 lines changed

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

        abort: user quit

        [255]

        $ rm folder1/g.orig

        $ 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 --git a/f b/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/6 to 'f'? [Ynesfdaq?] y

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

         1

         2

         3

         4

         5

        +b

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

        diff --git a/folder1/g b/folder1/g

        2 hunks, 2 lines changed

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

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

        +c

         1

         2

         3

         4

         5

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

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

         1

         2

         3

         4

         5

        +d

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

        diff --git a/folder2/h b/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

        $ hg st

        M f

        M folder1/g

        R folder1/i

        $ hg revert --interactive f << EOF

        > y

        > y

        > n

        > n

        > EOF

        diff --git a/f b/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/2 to 'f'? [Ynesfdaq?] y

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

         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

        $ rm f.orig

        $ hg update -C .

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

      Check editing files newly added by a revert

      1) Create a dummy editor changing 1 to 42

        $ cat > $TESTTMP/editor.sh << '__EOF__'

        > cat "$1"  | sed "s/1/42/g"  > tt

        > mv tt  "$1"

        > __EOF__

      2) Add k

        $ printf "1\n" > k

        $ hg add k

        $ hg commit -m "add k"

      3) Use interactive revert with editing (replacing +1 with +42):

        $ printf "0\n2\n" > k

        $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i  <<EOF

        > y

        > e

        > EOF

        reverting k

        diff --git a/k b/k

        1 hunks, 2 lines changed

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

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

        -1

        +0

        +2

        record this change to 'k'? [Ynesfdaq?] e

        $ cat k

        42

      Check the experimental config to invert the selection:

        $ cat <<EOF >> $HGRCPATH

        > [experimental]

        > revertalternateinteractivemode=False

        > EOF

        $ hg up -C .

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

        $ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g

        $ hg diff --nodates

        diff -r a3d963a027aa folder1/g

        --- a/folder1/g

        +++ b/folder1/g

        @@ -1,7 +1,9 @@

        +firstline

         c

         1

         2

         3

        -4

        + 3

         5

         d

        +lastline

        $ hg revert -i <<EOF

        > y

        > y

        > y

        > n

        > EOF

        reverting folder1/g (glob)

        diff --git a/folder1/g b/folder1/g

        3 hunks, 3 lines changed

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

        @@ -1,5 +1,4 @@

        -firstline

         c

         1

         2

         3

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

        @@ -2,7 +1,7 @@

         c

         1

         2

         3

        - 3

        +4

         5

         d

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

        @@ -7,3 +6,2 @@

         5

         d

        -lastline

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

        $ hg diff --nodates

        diff -r a3d963a027aa folder1/g

        --- a/folder1/g

        +++ b/folder1/g

        @@ -5,3 +5,4 @@

         4

         5

         d

        +lastline

	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

				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


				$ mkdir -p a/folder1 a/folder2
				$ cd a
				$ hg init
				>>> open('f', 'wb').write("1\n2\n3\n4\n5\n")
				$ hg add f ; hg commit -m "adding f"
				$ 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"
				>>> 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"
				$ 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 --git a/f b/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/6 to 'f'? [Ynesfdaq?] y

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

				diff --git a/folder1/g b/folder1/g
				2 hunks, 2 lines changed
				examine changes to 'folder1/g'? [Ynesfdaq?] y

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

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

				diff --git a/folder2/h b/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

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

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

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


				$ 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 --git a/f b/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/6 to 'f'? [Ynesfdaq?] y

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

				diff --git a/folder1/g b/folder1/g
				2 hunks, 2 lines changed
				examine changes to 'folder1/g'? [Ynesfdaq?] y

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

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

				diff --git a/folder2/h b/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
				$ hg st
				M f
				M folder1/g
				R folder1/i
				$ hg revert --interactive f << EOF
				> y
				> y
				> n
				> n
				> EOF
				diff --git a/f b/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/2 to 'f'? [Ynesfdaq?] y

				@@ -2,6 +1,5 @@
				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
				$ rm f.orig
				$ hg update -C .
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Check editing files newly added by a revert

				1) Create a dummy editor changing 1 to 42
				$ cat > $TESTTMP/editor.sh << '__EOF__'
				> cat "$1" \| sed "s/1/42/g" > tt
				> mv tt "$1"
				> __EOF__

				2) Add k
				$ printf "1\n" > k
				$ hg add k
				$ hg commit -m "add k"

				3) Use interactive revert with editing (replacing +1 with +42):
				$ printf "0\n2\n" > k
				$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF
				> y
				> e
				> EOF
				reverting k
				diff --git a/k b/k
				1 hunks, 2 lines changed
				examine changes to 'k'? [Ynesfdaq?] y

				@@ -1,1 +1,2 @@
				-1
				+0
				+2
				record this change to 'k'? [Ynesfdaq?] e

				$ cat k
				42

				Check the experimental config to invert the selection:
				$ cat <<EOF >> $HGRCPATH
				> [experimental]
				> revertalternateinteractivemode=False
				> EOF


				$ hg up -C .
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g
				$ hg diff --nodates
				diff -r a3d963a027aa folder1/g
				--- a/folder1/g
				+++ b/folder1/g
				@@ -1,7 +1,9 @@
				+firstline
				c
				1
				2
				3
				-4
				+ 3
				5
				d
				+lastline
				$ hg revert -i <<EOF
				> y
				> y
				> y
				> n
				> EOF
				reverting folder1/g (glob)
				diff --git a/folder1/g b/folder1/g
				3 hunks, 3 lines changed
				examine changes to 'folder1/g'? [Ynesfdaq?] y

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

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

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

				$ hg diff --nodates
				diff -r a3d963a027aa folder1/g
				--- a/folder1/g
				+++ b/folder1/g
				@@ -5,3 +5,4 @@
				4
				5
				d
				+lastline