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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

             test-pull-http.t
        
                    64 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-http.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require killdaemons

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ cd ..

        $ hg clone test test2

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd test2

        $ echo a >> a

        $ hg ci -mb

      Cloning with a password in the URL should not save the password in .hg/hgrc:

        $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

        $ hg clone http://foo:xyzzy@localhost:$HGPORT/ test3

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat test3/.hg/hgrc

        [paths]

        default = http://foo@localhost:$HGPORT/

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

      expect error, cloning not allowed

        $ echo '[web]' > .hg/hgrc

        $ echo 'allowpull = false' >> .hg/hgrc

        $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

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

        requesting all changes

        abort: authorization failed

        [255]

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

      serve errors

        $ cat errors.log

        $ req() {

        >     hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log

        >     cat hg.pid >> $DAEMON_PIDS

        >     hg --cwd ../test pull http://localhost:$HGPORT/

        >     "$TESTDIR/killdaemons.py" hg.pid

        >     echo % serve errors

        >     cat errors.log

        > }

      expect error, pulling not allowed

        $ req

        pulling from http://localhost:$HGPORT/

        abort: authorization failed

        % serve errors

        $ 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

				#require killdaemons

				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Ama
				adding a
				$ cd ..
				$ hg clone test test2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd test2
				$ echo a >> a
				$ hg ci -mb

				Cloning with a password in the URL should not save the password in .hg/hgrc:

				$ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg clone http://foo:xyzzy@localhost:$HGPORT/ test3
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat test3/.hg/hgrc
				[paths]
				default = http://foo@localhost:$HGPORT/
				$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

				expect error, cloning not allowed

				$ echo '[web]' > .hg/hgrc
				$ echo 'allowpull = false' >> .hg/hgrc
				$ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg clone http://localhost:$HGPORT/ test4
				requesting all changes
				abort: authorization failed
				[255]
				$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

				serve errors

				$ cat errors.log
				$ req() {
				> hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
				> cat hg.pid >> $DAEMON_PIDS
				> hg --cwd ../test pull http://localhost:$HGPORT/
				> "$TESTDIR/killdaemons.py" hg.pid
				> echo % serve errors
				> cat errors.log
				> }

				expect error, pulling not allowed

				$ req
				pulling from http://localhost:$HGPORT/
				abort: authorization failed
				% serve errors

				$ cd ..