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

Mike Hommey - - Load All Authors

File last commit:

r22959:10116463 default


                r23524:a1a7c94d

default

Download file

             test-bad-pull.t
        
                    21 lines
            
             | 461 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bad-pull.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mike Hommey
    
tests: pull common http server setup out of individual tests...

              r22959
            
      #require serve killdaemons

        Mads Kiilerich
    
tests: use 'hghave serve' to guard tests that requires serve daemon management

              r15446
            
        Adrian Buehlmann
    
test-bad-pull: partially adjust for Windows...

              r17019
            
      #if windows

        $ hg clone http://localhost:$HGPORT/ copy

        abort: * (glob)

        [255]

      #else

        Martin Geisler
    
tests: unify test-bad-pull

              r11859
            
        $ hg clone http://localhost:$HGPORT/ copy

        abort: error: Connection refused

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
test-bad-pull: partially adjust for Windows...

              r17019
            
      #endif

        Martin Geisler
    
tests: unify test-bad-pull

              r11859
            
        Mads Kiilerich
    
tests: remove hacks for testing if file or directory exists

              r15515
            
        $ test -d copy

        [1]

        Martin Geisler
    
tests: unify test-bad-pull

              r11859
            
        Mike Hommey
    
tests: pull common http server setup out of individual tests...

              r22959
            
        $ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid

        $ cat dumb.pid >> $DAEMON_PIDS

        Matt Mackall
    
tests: fix shutdown race in test-bad-pull

              r16334
            
        $ hg clone http://localhost:$HGPORT/foo copy2

        abort: HTTP Error 404: * (glob)

        [255]

        Mike Hommey
    
tests: pull common http server setup out of individual tests...

              r22959
            
        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

	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

Mike Hommey tests: pull common http server setup out of individual tests...	r22959	#require serve killdaemons
Mads Kiilerich tests: use 'hghave serve' to guard tests that requires serve daemon management	r15446
Adrian Buehlmann test-bad-pull: partially adjust for Windows...	r17019	#if windows
		$ hg clone http://localhost:$HGPORT/ copy
		abort: * (glob)
		[255]
		#else
Martin Geisler tests: unify test-bad-pull	r11859	$ hg clone http://localhost:$HGPORT/ copy
		abort: error: Connection refused
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann test-bad-pull: partially adjust for Windows...	r17019	#endif
Martin Geisler tests: unify test-bad-pull	r11859
Mads Kiilerich tests: remove hacks for testing if file or directory exists	r15515	$ test -d copy
		[1]
Martin Geisler tests: unify test-bad-pull	r11859
Mike Hommey tests: pull common http server setup out of individual tests...	r22959	$ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
		$ cat dumb.pid >> $DAEMON_PIDS
Matt Mackall tests: fix shutdown race in test-bad-pull	r16334	$ hg clone http://localhost:$HGPORT/foo copy2
		abort: HTTP Error 404: * (glob)
		[255]
Mike Hommey tests: pull common http server setup out of individual tests...	r22959	$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS