upstream/mercurial-mirror Files · tests/test-clone-update-order.t

transplant: use peer of source repository as "remote" for "repo.pull()"...

transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r20020:6fb59247

default

Download file

             test-clone-update-order.t
        
                    105 lines
            
             | 3.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-clone-update-order.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-clone-update-order

              r12286
            
        $ hg init

        $ echo foo > bar

        $ hg commit -Am default

        adding bar

        $ hg up -r null

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

        $ hg branch mine

        marked working directory as branch mine

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-clone-update-order

              r12286
            
        $ echo hello > world

        $ hg commit -Am hello

        adding world

        $ hg up -r null

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

        $ hg branch other

        marked working directory as branch other

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-clone-update-order

              r12286
            
        $ echo good > bye

        $ hg commit -Am other

        adding bye

        $ hg up -r mine

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

        $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other

        abort: cannot specify both --noupdate and --updaterev

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Adrian Buehlmann
    
tests: unify test-clone-update-order

              r12286
            
        $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        $ rm -rf ../b

        $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch mine

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

        $ rm -rf ../b

        $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch default

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

        $ rm -rf ../b

        $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch mine

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

        $ rm -rf ../b

        $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch other

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

        $ rm -rf ../b

      Test -r mine ... mine is ignored:

        $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch other

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

        $ rm -rf ../b

        $ hg clone .#other ../b -b default -b mine

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch default

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

        $ rm -rf ../b

        $ hg clone .#other ../b

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch other

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

        $ rm -rf ../b

        $ hg clone -U . ../c -r 1 -r 2 > /dev/null

        $ hg clone ../c ../b

        updating to branch other

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

        $ rm -rf ../b ../c

	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

Adrian Buehlmann tests: unify test-clone-update-order	r12286	$ hg init
		$ echo foo > bar
		$ hg commit -Am default
		adding bar
		$ hg up -r null
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg branch mine
		marked working directory as branch mine
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-clone-update-order	r12286	$ echo hello > world
		$ hg commit -Am hello
		adding world
		$ hg up -r null
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg branch other
		marked working directory as branch other
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-clone-update-order	r12286	$ echo good > bye
		$ hg commit -Am other
		adding bye
		$ hg up -r mine
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
		abort: cannot specify both --noupdate and --updaterev
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Adrian Buehlmann tests: unify test-clone-update-order	r12286
		$ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		$ rm -rf ../b

		$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch mine
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch mine
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch other
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		Test -r mine ... mine is ignored:

		$ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch other
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone .#other ../b -b default -b mine
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 3 files (+2 heads)
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone .#other ../b
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		updating to branch other
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b

		$ hg clone -U . ../c -r 1 -r 2 > /dev/null
		$ hg clone ../c ../b
		updating to branch other
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm -rf ../b ../c