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

Siddharth Agarwal - - Load All Authors

File last commit:

r19801:41abe2e3 default


                r20020:6fb59247

default

Download file

             test-update-issue1456.t
        
                    45 lines
            
             | 882 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-issue1456.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" execbit || exit 80

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo foo > foo

        $ hg ci -qAm0

        $ echo toremove > toremove

        $ echo todelete > todelete

        $ chmod +x foo toremove todelete

        $ hg ci -qAm1

      Test that local removed/deleted, remote removed works with flags

        $ hg rm toremove

        $ rm todelete

        $ hg co -q 0

        $ echo dirty > foo

        $ hg up -c

        abort: uncommitted changes

        [255]

        $ hg up -q

        $ cat foo

        dirty

        $ hg st -A

        M foo

        C todelete

        C toremove

      Validate update of standalone execute bit change:

        $ hg up -C 0

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

        $ chmod -x foo

        $ hg ci -m removeexec

        nothing changed

        [1]

        $ hg up -C 0

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

        $ hg up

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        $ 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

				$ "$TESTDIR/hghave" execbit \|\| exit 80

				$ rm -rf a
				$ hg init a
				$ cd a

				$ echo foo > foo
				$ hg ci -qAm0
				$ echo toremove > toremove
				$ echo todelete > todelete
				$ chmod +x foo toremove todelete
				$ hg ci -qAm1

				Test that local removed/deleted, remote removed works with flags
				$ hg rm toremove
				$ rm todelete
				$ hg co -q 0

				$ echo dirty > foo
				$ hg up -c
				abort: uncommitted changes
				[255]
				$ hg up -q
				$ cat foo
				dirty
				$ hg st -A
				M foo
				C todelete
				C toremove

				Validate update of standalone execute bit change:

				$ hg up -C 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ chmod -x foo
				$ hg ci -m removeexec
				nothing changed
				[1]
				$ hg up -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg up
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st

				$ cd ..