upstream/mercurial-mirror Files · tests/test-mq-pull-from-bundle.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.

Klaus Koch - - Load All Authors

File last commit:

r12962:ff083040 stable


                r20020:6fb59247

default

Download file

             test-mq-pull-from-bundle.t
        
                    135 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-pull-from-bundle.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq=

        > [alias]

        > tlog = log --template "{rev}: {desc}\\n"

        > theads = heads --template "{rev}: {desc}\\n"

        > tincoming = incoming --template "{rev}: {desc}\\n"

        > EOF

      Setup main:

        $ hg init base

        $ cd base

        $ echo "One" > one

        $ hg add

        adding one

        $ hg ci -m "main: one added"

        $ echo "++" >> one

        $ hg ci -m "main: one updated"

      Bundle main:

        $ hg bundle --base=null ../main.hg

        2 changesets found

        $ cd ..

      Incoming to fresh repo:

        $ hg init fresh

        $ hg -R fresh tincoming main.hg

        comparing with main.hg

        0: main: one added

        1: main: one updated

        $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true

        $ hg -R fresh tincoming bundle:fresh+main.hg

        comparing with bundle:fresh+main.hg

        0: main: one added

        1: main: one updated

      Setup queue:

        $ cd base

        $ hg qinit -c

        $ hg qnew -m "patch: two added" two.patch

        $ echo two > two

        $ hg add

        adding two

        $ hg qrefresh

        $ hg qcommit -m "queue: two.patch added"

        $ hg qpop -a

        popping two.patch

        patch queue now empty

      Bundle queue:

        $ hg -R .hg/patches bundle --base=null ../queue.hgq

        1 changesets found

        $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true

        $ cd ..

      Clone base:

        $ hg clone base copy

        updating to branch default

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

        $ cd copy

        $ hg qinit -c

      Incoming queue bundle:

        $ hg -R .hg/patches tincoming ../queue.hgq

        comparing with ../queue.hgq

        0: queue: two.patch added

        $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true

      Pull queue bundle:

        $ hg -R .hg/patches pull --update ../queue.hgq

        pulling from ../queue.hgq

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        merging series

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

        $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true

        $ hg -R .hg/patches theads

        0: queue: two.patch added

        $ hg -R .hg/patches tlog

        0: queue: two.patch added

        $ hg qseries

        two.patch

        $ cd ..

      Clone base again:

        $ hg clone base copy2

        updating to branch default

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

        $ cd copy2

        $ hg qinit -c

      Unbundle queue bundle:

        $ hg -R .hg/patches unbundle --update ../queue.hgq

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        merging series

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

        $ hg -R .hg/patches theads

        0: queue: two.patch added

        $ hg -R .hg/patches tlog

        0: queue: two.patch added

        $ hg qseries

        two.patch

        $ 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

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> mq=
				> [alias]
				> tlog = log --template "{rev}: {desc}\\n"
				> theads = heads --template "{rev}: {desc}\\n"
				> tincoming = incoming --template "{rev}: {desc}\\n"
				> EOF

				Setup main:

				$ hg init base
				$ cd base
				$ echo "One" > one
				$ hg add
				adding one
				$ hg ci -m "main: one added"
				$ echo "++" >> one
				$ hg ci -m "main: one updated"

				Bundle main:

				$ hg bundle --base=null ../main.hg
				2 changesets found

				$ cd ..

				Incoming to fresh repo:

				$ hg init fresh

				$ hg -R fresh tincoming main.hg
				comparing with main.hg
				0: main: one added
				1: main: one updated
				$ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true

				$ hg -R fresh tincoming bundle:fresh+main.hg
				comparing with bundle:fresh+main.hg
				0: main: one added
				1: main: one updated


				Setup queue:

				$ cd base
				$ hg qinit -c
				$ hg qnew -m "patch: two added" two.patch
				$ echo two > two
				$ hg add
				adding two
				$ hg qrefresh
				$ hg qcommit -m "queue: two.patch added"
				$ hg qpop -a
				popping two.patch
				patch queue now empty

				Bundle queue:

				$ hg -R .hg/patches bundle --base=null ../queue.hgq
				1 changesets found
				$ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true

				$ cd ..


				Clone base:

				$ hg clone base copy
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd copy
				$ hg qinit -c

				Incoming queue bundle:

				$ hg -R .hg/patches tincoming ../queue.hgq
				comparing with ../queue.hgq
				0: queue: two.patch added
				$ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true

				Pull queue bundle:

				$ hg -R .hg/patches pull --update ../queue.hgq
				pulling from ../queue.hgq
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				merging series
				2 files updated, 1 files merged, 0 files removed, 0 files unresolved
				$ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' \|\| true

				$ hg -R .hg/patches theads
				0: queue: two.patch added

				$ hg -R .hg/patches tlog
				0: queue: two.patch added

				$ hg qseries
				two.patch

				$ cd ..


				Clone base again:

				$ hg clone base copy2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd copy2
				$ hg qinit -c

				Unbundle queue bundle:

				$ hg -R .hg/patches unbundle --update ../queue.hgq
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				merging series
				2 files updated, 1 files merged, 0 files removed, 0 files unresolved

				$ hg -R .hg/patches theads
				0: queue: two.patch added

				$ hg -R .hg/patches tlog
				0: queue: two.patch added

				$ hg qseries
				two.patch

				$ cd ..