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

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r23524:a1a7c94d

default

Download file

             test-diff-hashes.t
        
                    46 lines
            
             | 1013 B
            
                | 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

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