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

Pierre-Yves David - - Load All Authors

File last commit:

r17802:a421459b default


                r23524:a1a7c94d

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 ..