upstream/mercurial-mirror Files · tests/test-diffdir.t

copies: filter out copies when target is not in destination manifest...

copies: filter out copies when target is not in destination manifest When chaining a series of commits that copied a file with a series that removed the destination file, we would still include the copy in the result. Similar to the previous patch, I have checked that `hg status --copies` is not affected by this bug, but I wouldn't be surprised if some commands are. Differential Revision: https://phab.mercurial-scm.org/D5989

Martin von Zweigbergk - - Load All Authors

File last commit:

r27902:51b6ce25 default


                r41920:d5edb5d3

default

Download file

             test-diffdir.t
        
                    77 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diffdir.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ touch a

        $ hg add a

        $ hg ci -m "a"

        $ echo 123 > b

        $ hg add b

        $ hg diff --nodates

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

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

        +123

        $ hg diff --nodates -r tip

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

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

        +123

        $ echo foo > a

        $ hg diff --nodates

        diff -r 3903775176ed a

        --- a/a

        +++ b/a

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

        +foo

        diff -r 3903775176ed b

        --- /dev/null

        +++ b/b

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

        +123

        $ hg diff -r ""

        hg: parse error: empty query

        [255]

        $ hg diff -r tip -r ""

        hg: parse error: empty query

        [255]

      Remove a file that was added via merge. Since the file is not in parent 1,

      it should not be in the diff.

        $ hg ci -m 'a=foo' a

        $ hg co -Cq null

        $ echo 123 > b

        $ hg add b

        $ hg ci -m "b"

        created new head

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg rm -f a

        $ hg diff --nodates

      Rename a file that was added via merge. Since the rename source is not in

      parent 1, the diff should be relative to /dev/null

        $ hg co -Cq 2

        $ hg merge 1

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

        (branch merge, don't forget to commit)

        $ hg mv a a2

        $ hg diff --nodates

        diff -r cf44b38435e5 a2

        --- /dev/null

        +++ b/a2

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

        +foo

        $ hg diff --nodates --git

        diff --git a/a2 b/a2

        new file mode 100644

        --- /dev/null

        +++ b/a2

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

        +foo

	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

				$ hg init
				$ touch a
				$ hg add a
				$ hg ci -m "a"

				$ echo 123 > b
				$ hg add b
				$ hg diff --nodates
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ hg diff --nodates -r tip
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ echo foo > a
				$ hg diff --nodates
				diff -r 3903775176ed a
				--- a/a
				+++ b/a
				@@ -0,0 +1,1 @@
				+foo
				diff -r 3903775176ed b
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+123

				$ hg diff -r ""
				hg: parse error: empty query
				[255]
				$ hg diff -r tip -r ""
				hg: parse error: empty query
				[255]

				Remove a file that was added via merge. Since the file is not in parent 1,
				it should not be in the diff.

				$ hg ci -m 'a=foo' a
				$ hg co -Cq null
				$ echo 123 > b
				$ hg add b
				$ hg ci -m "b"
				created new head
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg rm -f a
				$ hg diff --nodates

				Rename a file that was added via merge. Since the rename source is not in
				parent 1, the diff should be relative to /dev/null

				$ hg co -Cq 2
				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg mv a a2
				$ hg diff --nodates
				diff -r cf44b38435e5 a2
				--- /dev/null
				+++ b/a2
				@@ -0,0 +1,1 @@
				+foo
				$ hg diff --nodates --git
				diff --git a/a2 b/a2
				new file mode 100644
				--- /dev/null
				+++ b/a2
				@@ -0,0 +1,1 @@
				+foo