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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22284:72b37865

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