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

Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default


                r41198:0101a35d

default

Download file

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

      Source bundle was generated with the following script:

      # hg init

      # echo a > a

      # ln -s a l

      # hg ci -Ama -d'0 0'

      # mkdir b

      # echo a > b/a

      # chmod +x b/a

      # hg ci -Amb -d'1 0'

        $ hg init

        $ hg unbundle "$TESTDIR/bundles/test-manifest.hg"

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 3 changes to 3 files

        new changesets b73562a03cfe:5bdc995175ba (2 drafts)

        (run 'hg update' to get a working copy)

      The next call is expected to return nothing:

        $ hg manifest

        $ hg co

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg manifest

        a

        b/a

        l

        $ hg files -vr .

                 2   a

                 2 x b/a

                 1 l l

        $ hg files -r . -X b

        a

        l

        $ hg files -T '{path} {size} {flags}\n'

        a 2 

        b/a 2 x

        l 1 l

        $ hg files -T '{path} {node|shortest}\n' -r.

        a 5bdc

        b/a 5bdc

        l 5bdc

        $ hg manifest -v

        644   a

        755 * b/a

        644 @ l

        $ hg manifest -T '{path} {rev}\n'

        a 1

        b/a 1

        l 1

        $ hg manifest --debug

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a

        b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a

        047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

        $ hg manifest -r 0

        a

        l

        $ hg manifest -r 1

        a

        b/a

        l

        $ hg manifest -r tip

        a

        b/a

        l

        $ hg manifest tip

        a

        b/a

        l

        $ hg manifest --all

        a

        b/a

        l

      The next two calls are expected to abort:

        $ hg manifest -r 2

        abort: unknown revision '2'!

        [255]

        $ hg manifest -r tip tip

        abort: please specify just one revision

        [255]

	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

				Source bundle was generated with the following script:

				# hg init
				# echo a > a
				# ln -s a l
				# hg ci -Ama -d'0 0'
				# mkdir b
				# echo a > b/a
				# chmod +x b/a
				# hg ci -Amb -d'1 0'

				$ hg init
				$ hg unbundle "$TESTDIR/bundles/test-manifest.hg"
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 3 changes to 3 files
				new changesets b73562a03cfe:5bdc995175ba (2 drafts)
				(run 'hg update' to get a working copy)

				The next call is expected to return nothing:

				$ hg manifest

				$ hg co
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg manifest
				a
				b/a
				l

				$ hg files -vr .
				2 a
				2 x b/a
				1 l l
				$ hg files -r . -X b
				a
				l
				$ hg files -T '{path} {size} {flags}\n'
				a 2
				b/a 2 x
				l 1 l
				$ hg files -T '{path} {node\|shortest}\n' -r.
				a 5bdc
				b/a 5bdc
				l 5bdc

				$ hg manifest -v
				644 a
				755 * b/a
				644 @ l
				$ hg manifest -T '{path} {rev}\n'
				a 1
				b/a 1
				l 1

				$ hg manifest --debug
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
				b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
				047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l

				$ hg manifest -r 0
				a
				l

				$ hg manifest -r 1
				a
				b/a
				l

				$ hg manifest -r tip
				a
				b/a
				l

				$ hg manifest tip
				a
				b/a
				l

				$ hg manifest --all
				a
				b/a
				l

				The next two calls are expected to abort:

				$ hg manifest -r 2
				abort: unknown revision '2'!
				[255]

				$ hg manifest -r tip tip
				abort: please specify just one revision
				[255]