upstream/mercurial-mirror Files · tests/test-addremove.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.

Martin von Zweigbergk - - Load All Authors

File last commit:

r23427:37788841 default


                r23524:a1a7c94d

default

Download file

             test-addremove.t
        
                    72 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-addremove.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg init rep

        $ cd rep

        $ mkdir dir

        $ touch foo dir/bar

        $ hg -v addremove

        adding dir/bar

        adding foo

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

              r12156
            
        $ hg -v commit -m "add 1"

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        dir/bar

        foo

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

              r12156
            
        committed changeset 0:6f7f953567a2

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ cd dir/

        Adrian Buehlmann
    
test-addremove: remove bits about con.xml...

              r16874
            
        $ touch ../foo_2 bar_2

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg -v addremove

        adding dir/bar_2

        adding foo_2

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

              r12156
            
        $ hg -v commit -m "add 2"

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        dir/bar_2

        foo_2

        Adrian Buehlmann
    
test-addremove: remove bits about con.xml...

              r16874
            
        committed changeset 1:e65414bf35c5

        Martin von Zweigbergk
    
addremove: add back forgotten files (BC)...

              r23259
            
        $ cd ..

        $ hg forget foo

        $ hg -v addremove

        adding foo

        $ cd ..

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        Martin von Zweigbergk
    
addremove: print relative paths when called with -I/-X (BC)...

              r23427
            
        $ hg init subdir

        $ cd subdir

        $ mkdir dir

        $ cd dir

        $ touch a.py

        $ hg addremove 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove -I 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove

        adding dir/a.py

        $ cd ..

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg init sim

        $ cd sim

        $ echo a > a

        $ echo a >> a

        $ echo a >> a

        $ echo c > c

        $ hg commit -Ama

        adding a

        adding c

        $ mv a b

        $ rm c

        $ echo d > d

        $ hg addremove -n -s 50 # issue 1696

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg addremove -s 50

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg commit -mb

        Martin von Zweigbergk
    
addremove: add back forgotten files (BC)...

              r23259
            
        $ cp b c

        $ hg forget b

        $ hg addremove -s 50

        adding b

        adding c

        Mads Kiilerich
    
tests: cleanup of tests that got lost in their own nested directories...

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

Martin Geisler tests: unify test-addremove	r11850	$ hg init rep
		$ cd rep
		$ mkdir dir
		$ touch foo dir/bar
		$ hg -v addremove
		adding dir/bar
		adding foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg -v commit -m "add 1"
Martin Geisler tests: unify test-addremove	r11850	dir/bar
		foo
Martin Geisler tests: remove unneeded -d flags...	r12156	committed changeset 0:6f7f953567a2
Martin Geisler tests: unify test-addremove	r11850	$ cd dir/
Adrian Buehlmann test-addremove: remove bits about con.xml...	r16874	$ touch ../foo_2 bar_2
Martin Geisler tests: unify test-addremove	r11850	$ hg -v addremove
		adding dir/bar_2
		adding foo_2
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg -v commit -m "add 2"
Martin Geisler tests: unify test-addremove	r11850	dir/bar_2
		foo_2
Adrian Buehlmann test-addremove: remove bits about con.xml...	r16874	committed changeset 1:e65414bf35c5
Martin von Zweigbergk addremove: add back forgotten files (BC)...	r23259	$ cd ..
		$ hg forget foo
		$ hg -v addremove
		adding foo
		$ cd ..
Martin Geisler tests: unify test-addremove	r11850
Martin von Zweigbergk addremove: print relative paths when called with -I/-X (BC)...	r23427	$ hg init subdir
		$ cd subdir
		$ mkdir dir
		$ cd dir
		$ touch a.py
		$ hg addremove 'glob:*.py'
		adding a.py
		$ hg forget a.py
		$ hg addremove -I 'glob:*.py'
		adding a.py
		$ hg forget a.py
		$ hg addremove
		adding dir/a.py
		$ cd ..

Martin Geisler tests: unify test-addremove	r11850	$ hg init sim
		$ cd sim
		$ echo a > a
		$ echo a >> a
		$ echo a >> a
		$ echo c > c
		$ hg commit -Ama
		adding a
		adding c
		$ mv a b
		$ rm c
		$ echo d > d
		$ hg addremove -n -s 50 # issue 1696
		removing a
		adding b
		removing c
		adding d
		recording removal of a as rename to b (100% similar)
		$ hg addremove -s 50
		removing a
		adding b
		removing c
		adding d
		recording removal of a as rename to b (100% similar)
		$ hg commit -mb
Martin von Zweigbergk addremove: add back forgotten files (BC)...	r23259	$ cp b c
		$ hg forget b
		$ hg addremove -s 50
		adding b
		adding c
Mads Kiilerich tests: cleanup of tests that got lost in their own nested directories...	r16912	$ cd ..