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

graft: fix collision detection with origin revisions that are missing...

graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

Mads Kiilerich - - Load All Authors

File last commit:

r16948:a0cbbf78 default


                r22302:9472284d

stable

Download file

             test-convert-authormap.t
        
                    58 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-authormap.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > convert=

        > EOF

      Prepare orig repo

        $ hg init orig

        $ cd orig

        $ echo foo > foo

        $ HGUSER='user name' hg ci -qAm 'foo'

        $ cd ..

      Explicit --authors

        $ cat > authormap.txt <<EOF

        > user name = Long User Name

        > 

        > # comment

        > this line is ignored

        > EOF

        $ hg convert --authors authormap.txt orig new

        initializing destination new repository

        ignoring bad line in author map file authormap.txt: this line is ignored

        scanning source...

        sorting...

        converting...

        0 foo

        writing author map file $TESTTMP/new/.hg/authormap (glob)

        $ cat new/.hg/authormap

        user name=Long User Name

        $ hg -Rnew log

        changeset:   0:d89716e88087

        tag:         tip

        user:        Long User Name

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     foo

        $ rm -rf new

      Implicit .hg/authormap

        $ hg init new

        $ mv authormap.txt new/.hg/authormap

        $ hg convert orig new

        ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)

        scanning source...

        sorting...

        converting...

        0 foo

        $ hg -Rnew log

        changeset:   0:d89716e88087

        tag:         tip

        user:        Long User Name

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     foo

	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 >> $HGRCPATH <<EOF
				> [extensions]
				> convert=
				> EOF

				Prepare orig repo

				$ hg init orig
				$ cd orig
				$ echo foo > foo
				$ HGUSER='user name' hg ci -qAm 'foo'
				$ cd ..

				Explicit --authors

				$ cat > authormap.txt <<EOF
				> user name = Long User Name
				>
				> # comment
				> this line is ignored
				> EOF
				$ hg convert --authors authormap.txt orig new
				initializing destination new repository
				ignoring bad line in author map file authormap.txt: this line is ignored
				scanning source...
				sorting...
				converting...
				0 foo
				writing author map file $TESTTMP/new/.hg/authormap (glob)
				$ cat new/.hg/authormap
				user name=Long User Name
				$ hg -Rnew log
				changeset: 0:d89716e88087
				tag: tip
				user: Long User Name
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: foo

				$ rm -rf new

				Implicit .hg/authormap

				$ hg init new
				$ mv authormap.txt new/.hg/authormap
				$ hg convert orig new
				ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
				scanning source...
				sorting...
				converting...
				0 foo
				$ hg -Rnew log
				changeset: 0:d89716e88087
				tag: tip
				user: Long User Name
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: foo