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

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Matt Mackall - - Load All Authors

File last commit:

r12511:0fefeb4f default


                r13155:f02d7a56

default

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 new/.hg/authormap

        $ 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 new/.hg/authormap: this line is ignored

        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 new/.hg/authormap
				$ 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 new/.hg/authormap: this line is ignored
				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