upstream/mercurial-mirror Files · tests/test-custom-filters.t

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r12316:4134686b default


                r22284:72b37865

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