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

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default


                r23525:5126d771

default

Download file

             test-convert-clonebranches.t
        
                    90 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-clonebranches.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > convert =

        > [convert]

        > hg.tagsbranch = 0

        > EOF

        $ 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

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

        $ 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

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

        $ echo a > file1

        $ hg ci -qAm c1

        $ hg up -qC mergeab

        $ hg branch branch2

        marked working directory as branch branch2

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

        $ 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

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

        $ 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 branch1 into branch3

        5 changesets found

        pulling from branch2 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


				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> convert =
				> [convert]
				> hg.tagsbranch = 0
				> EOF
				$ 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
				(branches are permanent and global, did you want a bookmark?)
				$ 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
				(branches are permanent and global, did you want a bookmark?)
				$ echo a > file1
				$ hg ci -qAm c1
				$ hg up -qC mergeab
				$ hg branch branch2
				marked working directory as branch branch2
				(branches are permanent and global, did you want a bookmark?)
				$ 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
				(branches are permanent and global, did you want a bookmark?)
				$ 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 branch1 into branch3
				5 changesets found
				pulling from branch2 into branch3
				1 changesets found