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

narrow: fix flaky behavior described in issue6150...

narrow: fix flaky behavior described in issue6150 This has been plaguing the CI for a good while, and it doesn't appear to have an easy fix proposed yet. The solution in this change is to always do an unambiguous (but expensive) lookup in case of comparison. This should always be correct, albeit suboptimal. Differential Revision: https://phab.mercurial-scm.org/D10034

Pulkit Goyal - - Load All Authors

File last commit:

r41950:251332db default


                r47280:b994db7c

stable

Download file

             test-diff-hashes.t
        
                    47 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-hashes.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-hashes

              r12137
            
        $ hg init a

        $ cd a

        $ hg diff inexistent1 inexistent2

        Mads Kiilerich
    
tests: hide 'No such file or directory' messages...

              r15521
            
        inexistent1: * (glob)

        inexistent2: * (glob)

        Adrian Buehlmann
    
tests: unify test-diff-hashes

              r12137
            
        $ echo bar > foo

        $ hg add foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 'add foo'

        Adrian Buehlmann
    
tests: unify test-diff-hashes

              r12137
            
        $ echo foobar > foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 'change foo'

        Adrian Buehlmann
    
tests: unify test-diff-hashes

              r12137
            
        $ hg --quiet diff -r 0 -r 1

        Pulkit Goyal
    
diff: make sure we output stat even when --git is not passed (issue4037) (BC)...

              r41950
            
        diff -r a99fb63adac3 -r 9b8568d3af2f foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        Adrian Buehlmann
    
tests: unify test-diff-hashes

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

        -bar

        +foobar

        $ hg diff -r 0 -r 1

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r a99fb63adac3 -r 9b8568d3af2f foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        Adrian Buehlmann
    
tests: unify test-diff-hashes

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

        -bar

        +foobar

        $ hg --verbose diff -r 0 -r 1

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r a99fb63adac3 -r 9b8568d3af2f foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        Adrian Buehlmann
    
tests: unify test-diff-hashes

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

        -bar

        +foobar

        $ hg --debug diff -r 0 -r 1

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo

        --- a/foo	Thu Jan 01 00:00:00 1970 +0000

        +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

        Adrian Buehlmann
    
tests: unify test-diff-hashes

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

        -bar

        +foobar

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Adrian Buehlmann tests: unify test-diff-hashes	r12137	$ hg init a
		$ cd a

		$ hg diff inexistent1 inexistent2
Mads Kiilerich tests: hide 'No such file or directory' messages...	r15521	inexistent1: * (glob)
		inexistent2: * (glob)
Adrian Buehlmann tests: unify test-diff-hashes	r12137
		$ echo bar > foo
		$ hg add foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 'add foo'
Adrian Buehlmann tests: unify test-diff-hashes	r12137
		$ echo foobar > foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 'change foo'
Adrian Buehlmann tests: unify test-diff-hashes	r12137
		$ hg --quiet diff -r 0 -r 1
Pulkit Goyal diff: make sure we output stat even when --git is not passed (issue4037) (BC)...	r41950	diff -r a99fb63adac3 -r 9b8568d3af2f foo
Martin Geisler tests: remove unneeded -d flags...	r12156	--- a/foo Thu Jan 01 00:00:00 1970 +0000
		+++ b/foo Thu Jan 01 00:00:00 1970 +0000
Adrian Buehlmann tests: unify test-diff-hashes	r12137	@@ -1,1 +1,1 @@
		-bar
		+foobar

		$ hg diff -r 0 -r 1
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r a99fb63adac3 -r 9b8568d3af2f foo
		--- a/foo Thu Jan 01 00:00:00 1970 +0000
		+++ b/foo Thu Jan 01 00:00:00 1970 +0000
Adrian Buehlmann tests: unify test-diff-hashes	r12137	@@ -1,1 +1,1 @@
		-bar
		+foobar

		$ hg --verbose diff -r 0 -r 1
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r a99fb63adac3 -r 9b8568d3af2f foo
		--- a/foo Thu Jan 01 00:00:00 1970 +0000
		+++ b/foo Thu Jan 01 00:00:00 1970 +0000
Adrian Buehlmann tests: unify test-diff-hashes	r12137	@@ -1,1 +1,1 @@
		-bar
		+foobar

		$ hg --debug diff -r 0 -r 1
Martin Geisler tests: remove unneeded -d flags...	r12156	diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo
		--- a/foo Thu Jan 01 00:00:00 1970 +0000
		+++ b/foo Thu Jan 01 00:00:00 1970 +0000
Adrian Buehlmann tests: unify test-diff-hashes	r12137	@@ -1,1 +1,1 @@
		-bar
		+foobar

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..