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

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r41198:0101a35d

default

Download file

             test-issue1802.t
        
                    73 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1802.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

      Create extension that can disable exec checks:

        $ cat > noexec.py <<EOF

        > from mercurial import extensions, util

        > def setflags(orig, f, l, x):

        >     pass

        > def checkexec(orig, path):

        >     return False

        > def extsetup(ui):

        >     extensions.wrapfunction(util, 'setflags', setflags)

        >     extensions.wrapfunction(util, 'checkexec', checkexec)

        > EOF

        $ hg init unix-repo

        $ cd unix-repo

        $ touch a

        $ hg add a

        $ hg commit -m 'unix: add a'

        $ hg clone . ../win-repo

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ chmod +x a

        $ hg commit -m 'unix: chmod a'

        $ hg manifest -v

        755 * a

        $ cd ../win-repo

        $ touch b

        $ hg add b

        $ hg commit -m 'win: add b'

        $ hg manifest -v

        644   a

        644   b

        $ hg pull

        pulling from $TESTTMP/unix-repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        new changesets 2d8bcf2dda39

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg manifest -v -r tip

        755 * a

      Simulate a Windows merge:

        $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug

          searching for copies back to rev 1

          unmatched files in local:

           b

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39

         a: update permissions -> e

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      Simulate a Windows commit:

        $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

        $ hg manifest -v

        755 * a

        644   b

        $ 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

				#require execbit

				Create extension that can disable exec checks:

				$ cat > noexec.py <<EOF
				> from mercurial import extensions, util
				> def setflags(orig, f, l, x):
				> pass
				> def checkexec(orig, path):
				> return False
				> def extsetup(ui):
				> extensions.wrapfunction(util, 'setflags', setflags)
				> extensions.wrapfunction(util, 'checkexec', checkexec)
				> EOF

				$ hg init unix-repo
				$ cd unix-repo
				$ touch a
				$ hg add a
				$ hg commit -m 'unix: add a'
				$ hg clone . ../win-repo
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ chmod +x a
				$ hg commit -m 'unix: chmod a'
				$ hg manifest -v
				755 * a

				$ cd ../win-repo

				$ touch b
				$ hg add b
				$ hg commit -m 'win: add b'

				$ hg manifest -v
				644 a
				644 b

				$ hg pull
				pulling from $TESTTMP/unix-repo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)
				new changesets 2d8bcf2dda39
				(run 'hg heads' to see heads, 'hg merge' to merge)

				$ hg manifest -v -r tip
				755 * a

				Simulate a Windows merge:

				$ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
				searching for copies back to rev 1
				unmatched files in local:
				b
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
				a: update permissions -> e
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Simulate a Windows commit:

				$ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

				$ hg manifest -v
				755 * a
				644 b

				$ cd ..