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

revert: handle subrepos missing in the given --rev...

revert: handle subrepos missing in the given --rev The list of subrepos to revert is currently based on the given --rev, so there is currently no way for this to fail. Using the --rev context is wrong though, because if the subrepo doesn't exist in --rev, it is skipped, so it won't be changed. This change makes it so that the revert aborts, which is what happens if a plain file is reverted to -1. Finding matches based on --rev is also inconsistent with evaluating files against the working directory (5b85a5bc5bbb). This change is made now, so as to not cause breakage when the context is switched in an upcoming patch.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24463:06d199e6

default

Download file

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

        Matt Mackall
    
tests: unify test-convert-bzr-ghosts

              r12515
            
        $ . "$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

        Patrick Mezard
    
convert/bzr: convert all branches (issue3229) (BC)...

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

        Matt Mackall
    
tests: unify test-convert-bzr-ghosts

              r12515
            
        |

        Patrick Mezard
    
convert/bzr: convert all branches (issue3229) (BC)...

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

        Matt Mackall
    
tests: unify test-convert-bzr-ghosts

              r12515
            
        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: unify test-convert-bzr-ghosts	r12515
		$ . "$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
Patrick Mezard convert/bzr: convert all branches (issue3229) (BC)...	r16060	o 1@source "Commit with ghost revision" files: somefile
Matt Mackall tests: unify test-convert-bzr-ghosts	r12515	\|
Patrick Mezard convert/bzr: convert all branches (issue3229) (BC)...	r16060	o 0@source "Initial layout setup" files: somefile
Matt Mackall tests: unify test-convert-bzr-ghosts	r12515
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..