upstream/mercurial-mirror Files · tests/test-bad-pull.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22287:f3ac9677

default

Download file

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

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require serve

        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
            
        $ cat > dumb.py <<EOF

        > import BaseHTTPServer, SimpleHTTPServer, os, signal

        > def run(server_class=BaseHTTPServer.HTTPServer,

        >         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):

        >     server_address = ('localhost', int(os.environ['HGPORT']))

        >     httpd = server_class(server_address, handler_class)

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

              r16334
            
        >     open("listening", "w")

        Matt Mackall
    
tests: eliminate daemon race in test-bad-pull

              r16296
            
        >     httpd.handle_request()

        Martin Geisler
    
tests: unify test-bad-pull

              r11859
            
        > run()

        > EOF

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

              r16334
            
        $ python dumb.py 2> log &

        $ P=$!

        Mads Kiilerich
    
tests: use 'do sleep 0' instead of 'do true', also on first line of command...

              r16496
            
        $ while [ ! -f listening ]; do sleep 0; done

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

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

        abort: HTTP Error 404: * (glob)

        [255]

        $ wait $P

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require serve
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
		$ cat > dumb.py <<EOF
		> import BaseHTTPServer, SimpleHTTPServer, os, signal
		> def run(server_class=BaseHTTPServer.HTTPServer,
		> handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
		> server_address = ('localhost', int(os.environ['HGPORT']))
		> httpd = server_class(server_address, handler_class)
Matt Mackall tests: fix shutdown race in test-bad-pull	r16334	> open("listening", "w")
Matt Mackall tests: eliminate daemon race in test-bad-pull	r16296	> httpd.handle_request()
Martin Geisler tests: unify test-bad-pull	r11859	> run()
		> EOF

Matt Mackall tests: fix shutdown race in test-bad-pull	r16334	$ python dumb.py 2> log &
		$ P=$!
Mads Kiilerich tests: use 'do sleep 0' instead of 'do true', also on first line of command...	r16496	$ while [ ! -f listening ]; do sleep 0; done
Matt Mackall tests: fix shutdown race in test-bad-pull	r16334	$ hg clone http://localhost:$HGPORT/foo copy2
		abort: HTTP Error 404: * (glob)
		[255]
		$ wait $P