upstream/mercurial-mirror Files · tests/test-issue2137.t

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Augie Fackler - - Load All Authors

File last commit:

r36582:c4ccc73f default


                r41198:0101a35d

default

Download file

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

      https://bz.mercurial-scm.org/2137

      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(b'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

				https://bz.mercurial-scm.org/2137

				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(b'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 ..