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

Pierre-Yves David - - Load All Authors

File last commit:

r17802:a421459b default


                r22285:85bded43

default

Download file

             test-issue2137.t
        
                    56 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue2137.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue2137

      Setup:

      create a little extension that has 3 side-effects:

      1) ensure changelog data is not inlined

      2) make revlog to use lazyparser

      3) test that repo.lookup() works

      1 and 2 are preconditions for the bug; 3 is the bug.

        $ cat > commitwrapper.py <<EOF

        > from mercurial import extensions, node, revlog

        > 

        > def reposetup(ui, repo):

        >     class wraprepo(repo.__class__):

        >         def commit(self, *args, **kwargs):

        >             result = super(wraprepo, self).commit(*args, **kwargs)

        >             tip1 = node.short(repo.changelog.tip())

        >             tip2 = node.short(repo.lookup(tip1))

        >             assert tip1 == tip2

        >             ui.write('new tip: %s\n' % tip1)

        >             return result

        >     repo.__class__ = wraprepo

        > 

        > def extsetup(ui):

        >     revlog._maxinline = 8             # split out 00changelog.d early

        >     revlog._prereadsize = 8           # use revlog.lazyparser

        > EOF

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > commitwrapper = `pwd`/commitwrapper.py

        > EOF

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'

        adding a

        new tip: 553596fad57b

      Test that new changesets are visible to repo.lookup():

        $ echo a >> a

        $ hg commit -m'one more commit to demonstrate the bug'

        new tip: 799ae3599e0e

        $ hg tip

        changeset:   1:799ae3599e0e

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     one more commit to demonstrate the bug

        $ 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

				http://mercurial.selenic.com/bts/issue2137

				Setup:

				create a little extension that has 3 side-effects:
				1) ensure changelog data is not inlined
				2) make revlog to use lazyparser
				3) test that repo.lookup() works
				1 and 2 are preconditions for the bug; 3 is the bug.

				$ cat > commitwrapper.py <<EOF
				> from mercurial import extensions, node, revlog
				>
				> def reposetup(ui, repo):
				> class wraprepo(repo.__class__):
				> def commit(self, args, *kwargs):
				> result = super(wraprepo, self).commit(args, *kwargs)
				> tip1 = node.short(repo.changelog.tip())
				> tip2 = node.short(repo.lookup(tip1))
				> assert tip1 == tip2
				> ui.write('new tip: %s\n' % tip1)
				> return result
				> repo.__class__ = wraprepo
				>
				> def extsetup(ui):
				> revlog._maxinline = 8 # split out 00changelog.d early
				> revlog._prereadsize = 8 # use revlog.lazyparser
				> EOF

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> commitwrapper = `pwd`/commitwrapper.py
				> EOF

				$ hg init repo1
				$ cd repo1
				$ echo a > a
				$ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'
				adding a
				new tip: 553596fad57b

				Test that new changesets are visible to repo.lookup():

				$ echo a >> a
				$ hg commit -m'one more commit to demonstrate the bug'
				new tip: 799ae3599e0e

				$ hg tip
				changeset: 1:799ae3599e0e
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: one more commit to demonstrate the bug


				$ cd ..