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

Gregory Szorc - - Load All Authors

File last commit:

r37301:d4e62df1 default


                r41198:0101a35d

default

Download file

             test-changelog-exec.t
        
                    57 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-changelog-exec.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

      b51a8138292a introduced a regression where we would mention in the

      changelog executable files added by the second parent of a merge. Test

      that that doesn't happen anymore

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo bar > bar

        $ chmod +x bar

        $ hg ci -qAm 'add bar'

      manifest of p2:

        $ hg manifest

        bar

        foo

        $ hg up -qC 0

        $ echo >> foo

        $ hg ci -m 'change foo'

        created new head

      manifest of p1:

        $ hg manifest

        foo

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ chmod +x foo

        $ hg ci -m 'merge'

      this should not mention bar but should mention foo:

        $ hg tip -v

        changeset:   3:c53d17ff3380

        tag:         tip

        parent:      2:ed1b79f46b9a

        parent:      1:d394a8db219b

        user:        test

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

        files:       foo

        description:

        merge

        $ hg debugindex bar

           rev linkrev nodeid       p1           p2

             0       1 b004912a8510 000000000000 000000000000

        $ 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

				b51a8138292a introduced a regression where we would mention in the
				changelog executable files added by the second parent of a merge. Test
				that that doesn't happen anymore

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'

				$ echo bar > bar
				$ chmod +x bar
				$ hg ci -qAm 'add bar'

				manifest of p2:

				$ hg manifest
				bar
				foo

				$ hg up -qC 0
				$ echo >> foo
				$ hg ci -m 'change foo'
				created new head

				manifest of p1:

				$ hg manifest
				foo

				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ chmod +x foo
				$ hg ci -m 'merge'

				this should not mention bar but should mention foo:

				$ hg tip -v
				changeset: 3:c53d17ff3380
				tag: tip
				parent: 2:ed1b79f46b9a
				parent: 1:d394a8db219b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				files: foo
				description:
				merge



				$ hg debugindex bar
				rev linkrev nodeid p1 p2
				0 1 b004912a8510 000000000000 000000000000

				$ cd ..