upstream/mercurial-mirror Files · tests/test-convert-clonebranches.t

discovery: add extinct changesets to outgoing.excluded...

discovery: add extinct changesets to outgoing.excluded Before this change, push would incorrectly fast-path the bundle generation when extinct changesets are involved, because they are not added to outgoing.excluded. The reason to do so are related to outgoing.excluded being assumed to contain only secret changesets by scmutil.nochangesfound(), when displaying warnings like: changes found (ignored 9 secret changesets) Still, outgoing.excluded seems like a good API to report the extinct changesets instead of dedicated code and nothing in the docstring indicates it to be bound to secret changesets. This patch adds extinct changesets to outgoing.excluded and fixes scmutil.nochangesfound() to filter the excluded node list. Original version and test by Pierre-Yves.David@ens-lyon.org

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r17248:6ffb35b2

stable

Download file

             test-convert-clonebranches.t
        
                    88 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-clonebranches.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "convert = " >> $HGRCPATH

        $ echo "[convert]" >> $HGRCPATH

        $ echo "hg.tagsbranch=0" >> $HGRCPATH

        $ hg init source

        $ cd source

        $ echo a > a

        $ hg ci -qAm adda

      Add a merge with one parent in the same branch

        $ echo a >> a

        $ hg ci -qAm changea

        $ hg up -qC 0

        $ hg branch branch0

        marked working directory as branch branch0

        Matt Mackall
    
branch: warn on branching

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

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ echo b > b

        $ hg ci -qAm addb

        $ hg up -qC

        $ hg merge default

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

        (branch merge, don't forget to commit)

        $ hg ci -qm mergeab

        $ hg tag -ql mergeab

        $ cd ..

      Miss perl... sometimes

        $ cat > filter.py <<EOF

        > import sys, re

        > 

        > r = re.compile(r'^(?:\d+|pulling from)')

        > sys.stdout.writelines([l for l in sys.stdin if r.search(l)])

        > EOF

      convert

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        3 adda

        2 changea

        1 addb

        pulling from default into branch0

        1 changesets found

        0 mergeab

        pulling from default into branch0

        1 changesets found

      Add a merge with both parents and child in different branches

        $ cd source

        $ hg branch branch1

        marked working directory as branch branch1

        Matt Mackall
    
branch: warn on branching

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

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ echo a > file1

        $ hg ci -qAm c1

        $ hg up -qC mergeab

        $ hg branch branch2

        marked working directory as branch branch2

        Matt Mackall
    
branch: warn on branching

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

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ echo a > file2

        $ hg ci -qAm c2

        $ hg merge branch1

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

        (branch merge, don't forget to commit)

        $ hg branch branch3

        marked working directory as branch branch3

        Matt Mackall
    
branch: warn on branching

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

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ hg ci -qAm c3

        $ cd ..

      incremental conversion

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        2 c1

        pulling from branch0 into branch1

        4 changesets found

        1 c2

        pulling from branch0 into branch2

        4 changesets found

        0 c3

        pulling from branch2 into branch3

        5 changesets found

        pulling from branch1 into branch3

        1 changesets found

	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

Matt Mackall tests: unify test-convert-clonebranches	r12518
		$ echo "[extensions]" >> $HGRCPATH
		$ echo "convert = " >> $HGRCPATH
		$ echo "[convert]" >> $HGRCPATH
		$ echo "hg.tagsbranch=0" >> $HGRCPATH
		$ hg init source
		$ cd source
		$ echo a > a
		$ hg ci -qAm adda

		Add a merge with one parent in the same branch

		$ echo a >> a
		$ hg ci -qAm changea
		$ hg up -qC 0
		$ hg branch branch0
		marked working directory as branch branch0
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ echo b > b
		$ hg ci -qAm addb
		$ hg up -qC
		$ hg merge default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -qm mergeab
		$ hg tag -ql mergeab
		$ cd ..

		Miss perl... sometimes

		$ cat > filter.py <<EOF
		> import sys, re
		>
		> r = re.compile(r'^(?:\d+\|pulling from)')
		> sys.stdout.writelines([l for l in sys.stdin if r.search(l)])
		> EOF

		convert

		$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
		> python filter.py
		3 adda
		2 changea
		1 addb
		pulling from default into branch0
		1 changesets found
		0 mergeab
		pulling from default into branch0
		1 changesets found

		Add a merge with both parents and child in different branches

		$ cd source
		$ hg branch branch1
		marked working directory as branch branch1
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ echo a > file1
		$ hg ci -qAm c1
		$ hg up -qC mergeab
		$ hg branch branch2
		marked working directory as branch branch2
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ echo a > file2
		$ hg ci -qAm c2
		$ hg merge branch1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg branch branch3
		marked working directory as branch branch3
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ hg ci -qAm c3
		$ cd ..

		incremental conversion

		$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
		> python filter.py
		2 c1
		pulling from branch0 into branch1
		4 changesets found
		1 c2
		pulling from branch0 into branch2
		4 changesets found
		0 c3
		pulling from branch2 into branch3
		5 changesets found
		pulling from branch1 into branch3
		1 changesets found