upstream/mercurial-mirror Files · tests/test-impexp-branch.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Matt Mackall - - Load All Authors

File last commit:

r22485:efedda4a default


                r23524:a1a7c94d

default

Download file

             test-impexp-branch.t
        
                    81 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-impexp-branch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo '[extensions]' >> $HGRCPATH

        $ echo 'strip =' >> $HGRCPATH

        $ cat >findbranch.py <<EOF

        > import re, sys

        > 

        > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

        > 

        > for line in sys.stdin:

        >     hmatch = head_re.match(line)

        >     if not hmatch:

        >         sys.exit(1)

        >     if hmatch.group(1) == 'Branch':

        >         sys.exit(0)

        > sys.exit(1)

        > EOF

        $ hg init a

        $ cd a

        $ echo "Rev 1" >rev

        $ hg add rev

        $ hg commit -m "No branch."

        $ hg branch abranch

        marked working directory as branch abranch

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

        $ echo "Rev  2" >rev

        $ hg commit -m "With branch."

        $ hg export 0 > ../r0.patch

        $ hg export 1 > ../r1.patch

        $ cd ..

        $ if python findbranch.py < r0.patch; then

        >     echo "Export of default branch revision has Branch header" 1>&2

        >     exit 1

        > fi

        $ if python findbranch.py < r1.patch; then

        >     :  # Do nothing

        > else

        >     echo "Export of branch revision is missing Branch header" 1>&2

        >     exit 1

        > fi

      Make sure import still works with branch information in patches.

        $ hg init b

        $ cd b

        $ hg import ../r0.patch

        applying ../r0.patch

        $ hg import ../r1.patch

        applying ../r1.patch

        $ cd ..

        $ hg init c

        $ cd c

        $ hg import --exact --no-commit ../r0.patch

        applying ../r0.patch

        warning: can't check exact import with --no-commit

        $ hg st

        A rev

        $ hg revert -a

        forgetting rev

        $ rm rev

        $ hg import --exact ../r0.patch

        applying ../r0.patch

        $ hg import --exact ../r1.patch

        applying ../r1.patch

      Test --exact and patch header separators (issue3356)

        $ hg strip --no-backup .

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        >>> import re

        >>> p = file('../r1.patch', 'rb').read()

        >>> p = re.sub(r'Parent\s+', 'Parent ', p)

        >>> file('../r1-ws.patch', 'wb').write(p)

        $ hg import --exact ../r1-ws.patch

        applying ../r1-ws.patch

        $ 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

				$ echo '[extensions]' >> $HGRCPATH
				$ echo 'strip =' >> $HGRCPATH

				$ cat >findbranch.py <<EOF
				> import re, sys
				>
				> head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_])(?:\\s.)?)\|(?:\\s*))$')
				>
				> for line in sys.stdin:
				> hmatch = head_re.match(line)
				> if not hmatch:
				> sys.exit(1)
				> if hmatch.group(1) == 'Branch':
				> sys.exit(0)
				> sys.exit(1)
				> EOF

				$ hg init a
				$ cd a
				$ echo "Rev 1" >rev
				$ hg add rev
				$ hg commit -m "No branch."
				$ hg branch abranch
				marked working directory as branch abranch
				(branches are permanent and global, did you want a bookmark?)
				$ echo "Rev 2" >rev
				$ hg commit -m "With branch."

				$ hg export 0 > ../r0.patch
				$ hg export 1 > ../r1.patch
				$ cd ..

				$ if python findbranch.py < r0.patch; then
				> echo "Export of default branch revision has Branch header" 1>&2
				> exit 1
				> fi

				$ if python findbranch.py < r1.patch; then
				> : # Do nothing
				> else
				> echo "Export of branch revision is missing Branch header" 1>&2
				> exit 1
				> fi

				Make sure import still works with branch information in patches.

				$ hg init b
				$ cd b
				$ hg import ../r0.patch
				applying ../r0.patch
				$ hg import ../r1.patch
				applying ../r1.patch
				$ cd ..

				$ hg init c
				$ cd c
				$ hg import --exact --no-commit ../r0.patch
				applying ../r0.patch
				warning: can't check exact import with --no-commit
				$ hg st
				A rev
				$ hg revert -a
				forgetting rev
				$ rm rev
				$ hg import --exact ../r0.patch
				applying ../r0.patch
				$ hg import --exact ../r1.patch
				applying ../r1.patch

				Test --exact and patch header separators (issue3356)

				$ hg strip --no-backup .
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				>>> import re
				>>> p = file('../r1.patch', 'rb').read()
				>>> p = re.sub(r'Parent\s+', 'Parent ', p)
				>>> file('../r1-ws.patch', 'wb').write(p)
				$ hg import --exact ../r1-ws.patch
				applying ../r1-ws.patch

				$ cd ..