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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r12316:4134686b default


                r22285:85bded43

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