upstream/mercurial-mirror Files · tests/test-custom-filters.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:

r12316:4134686b default


                r23524:a1a7c94d

default

Download file

             test-custom-filters.t
        
                    66 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-custom-filters.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > prefixfilter = prefix.py

        > [encode]

        > *.txt = stripprefix: Copyright 2046, The Masters

        > [decode]

        > *.txt = insertprefix: Copyright 2046, The Masters

        > EOF

        $ cat > prefix.py <<EOF

        > from mercurial import util

        > def stripprefix(s, cmd, filename, **kwargs):

        >     header = '%s\n' % cmd

        >     if s[:len(header)] != header:

        >         raise util.Abort('missing header "%s" in %s' % (cmd, filename))

        >     return s[len(header):]

        > def insertprefix(s, cmd):

        >     return '%s\n%s' % (cmd, s)

        > def reposetup(ui, repo):

        >     repo.adddatafilter('stripprefix:', stripprefix)

        >     repo.adddatafilter('insertprefix:', insertprefix)

        > EOF

        $ cat > .hgignore <<EOF

        > .hgignore

        > prefix.py

        > prefix.pyc

        > EOF

        $ cat > stuff.txt <<EOF

        > Copyright 2046, The Masters

        > Some stuff to ponder very carefully.

        > EOF

        $ hg add stuff.txt

        $ hg ci -m stuff

      Repository data:

        $ hg cat stuff.txt

        Some stuff to ponder very carefully.

      Fresh checkout:

        $ rm stuff.txt

        $ hg up -C

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

        $ cat stuff.txt

        Copyright 2046, The Masters

        Some stuff to ponder very carefully.

        $ echo "Very very carefully." >> stuff.txt

        $ hg stat

        M stuff.txt

        $ echo "Unauthorized material subject to destruction." > morestuff.txt

      Problem encoding:

        $ hg add morestuff.txt

        $ hg ci -m morestuff

        abort: missing header "Copyright 2046, The Masters" in morestuff.txt

        [255]

        $ hg stat

        M stuff.txt

        A morestuff.txt

	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

				$ hg init

				$ cat > .hg/hgrc <<EOF
				> [extensions]
				> prefixfilter = prefix.py
				> [encode]
				> *.txt = stripprefix: Copyright 2046, The Masters
				> [decode]
				> *.txt = insertprefix: Copyright 2046, The Masters
				> EOF

				$ cat > prefix.py <<EOF
				> from mercurial import util
				> def stripprefix(s, cmd, filename, **kwargs):
				> header = '%s\n' % cmd
				> if s[:len(header)] != header:
				> raise util.Abort('missing header "%s" in %s' % (cmd, filename))
				> return s[len(header):]
				> def insertprefix(s, cmd):
				> return '%s\n%s' % (cmd, s)
				> def reposetup(ui, repo):
				> repo.adddatafilter('stripprefix:', stripprefix)
				> repo.adddatafilter('insertprefix:', insertprefix)
				> EOF

				$ cat > .hgignore <<EOF
				> .hgignore
				> prefix.py
				> prefix.pyc
				> EOF

				$ cat > stuff.txt <<EOF
				> Copyright 2046, The Masters
				> Some stuff to ponder very carefully.
				> EOF
				$ hg add stuff.txt
				$ hg ci -m stuff

				Repository data:

				$ hg cat stuff.txt
				Some stuff to ponder very carefully.

				Fresh checkout:

				$ rm stuff.txt
				$ hg up -C
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat stuff.txt
				Copyright 2046, The Masters
				Some stuff to ponder very carefully.
				$ echo "Very very carefully." >> stuff.txt
				$ hg stat
				M stuff.txt

				$ echo "Unauthorized material subject to destruction." > morestuff.txt

				Problem encoding:

				$ hg add morestuff.txt
				$ hg ci -m morestuff
				abort: missing header "Copyright 2046, The Masters" in morestuff.txt
				[255]
				$ hg stat
				M stuff.txt
				A morestuff.txt