upstream/mercurial-mirror Files · tests/test-convert-bzr-ghosts.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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r23525:5126d771

default

Download file

             test-convert-bzr-ghosts.t
        
                    38 lines
            
             | 950 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-ghosts.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$TESTDIR/bzr-definitions"

        $ cat > ghostcreator.py <<EOF

        > import sys

        > from bzrlib import workingtree

        > wt = workingtree.WorkingTree.open('.')

        > 

        > message, ghostrev = sys.argv[1:]

        > wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])

        > wt.commit(message)

        > EOF

      ghost revisions

        $ mkdir test-ghost-revisions

        $ cd test-ghost-revisions

        $ bzr init -q source

        $ cd source

        $ echo content > somefile

        $ bzr add -q somefile

        $ bzr commit -q -m 'Initial layout setup'

        $ echo morecontent >> somefile

        $ python ../../ghostcreator.py 'Commit with ghost revision' ghostrev

        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        1 Initial layout setup

        0 Commit with ghost revision

        $ glog -R source-hg

        o  1@source "Commit with ghost revision" files: somefile

        |

        o  0@source "Initial layout setup" files: somefile

        $ 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/bzr-definitions"
				$ cat > ghostcreator.py <<EOF
				> import sys
				> from bzrlib import workingtree
				> wt = workingtree.WorkingTree.open('.')
				>
				> message, ghostrev = sys.argv[1:]
				> wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
				> wt.commit(message)
				> EOF

				ghost revisions

				$ mkdir test-ghost-revisions
				$ cd test-ghost-revisions
				$ bzr init -q source
				$ cd source
				$ echo content > somefile
				$ bzr add -q somefile
				$ bzr commit -q -m 'Initial layout setup'
				$ echo morecontent >> somefile
				$ python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
				$ cd ..
				$ hg convert source source-hg
				initializing destination source-hg repository
				scanning source...
				sorting...
				converting...
				1 Initial layout setup
				0 Commit with ghost revision
				$ glog -R source-hg
				o 1@source "Commit with ghost revision" files: somefile
				\|
				o 0@source "Initial layout setup" files: somefile


				$ cd ..