upstream/mercurial-mirror Files · tests/test-exchange-obsmarkers-case-A2.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-exchange-obsmarkers-case-A2.t
        
                    125 lines
            
             | 3.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-exchange-obsmarkers-case-A2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ============================================

      Testing obsolescence markers push: Cases A.2

      ============================================

      Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of

      all changesets that requested to be "in sync" after the push (even if they are

      already on both side).

      This test belongs to a series of tests checking such set is properly computed

      and applied. This does not tests "obsmarkers" discovery capabilities.

      Category A: simple cases

      TestCase 2: Two heads, only one of them pushed

      A.2 Two heads, only on of then pushed

      =====================================

      .. {{{

      ..     ⇠○ B

      ..   ⇠◔ | A

      ..    |/

      ..    ● O

      .. }}}

      ..

      .. Markers exist from:

      ..

      ..  * A

      ..  * B

      ..

      ..

      .. Command runs:

      ..

      ..  * hg push -r A

      ..

      .. Expected exchange:

      ..

      ..  * chain from A

      ..

      .. Expected Exclude:

      ..

      ..  * chain from B

      Setup

      -----

        $ . $TESTDIR/testlib/exchange-obsmarker-util.sh

      initial

        $ setuprepos A.2

        creating test repo for test case A.2

        - pulldest

        - main

        - pushdest

        cd into `main` and proceed with env setup

        $ cd main

        $ mkcommit A

        $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`

        $ hg up '.~1'

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

        $ mkcommit B

        created new head

        $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`

        $ hg log -G

        @  35b183996678 (draft): B

        |

        | o  f5bc6836db60 (draft): A

        |/

        o  a9bdc8b26820 (public): O

        $ inspect_obsmarkers

        obsstore content

        ================

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        $ cd ..

        $ cd ..

      Actual Test

      -----------

        $ dotest A.2 A

        ## Running testcase A.2

        # testing echange of "A" (f5bc6836db60)

        ## initial state

        # obstore: main

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        # obstore: pulldest

        ## pushing "A" from main to pushdest

        pushing to pushdest

        searching for changes

        remote: adding changesets

        remote: adding manifests

        remote: adding file changes

        remote: added 1 changesets with 1 changes to 1 files

        remote: 1 new obsolescence markers

        ## post push state

        # obstore: main

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        ## pulling "f5bc6836db60" from main into pulldest

        pulling from main

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 new obsolescence markers

        new changesets f5bc6836db60 (1 drafts)

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

        ## post pull state

        # obstore: main

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        $ 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

				============================================
				Testing obsolescence markers push: Cases A.2
				============================================

				Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
				all changesets that requested to be "in sync" after the push (even if they are
				already on both side).

				This test belongs to a series of tests checking such set is properly computed
				and applied. This does not tests "obsmarkers" discovery capabilities.

				Category A: simple cases
				TestCase 2: Two heads, only one of them pushed

				A.2 Two heads, only on of then pushed
				=====================================

				.. {{{
				.. ⇠○ B
				.. ⇠◔ \| A
				.. \|/
				.. ● O
				.. }}}
				..
				.. Markers exist from:
				..
				.. * A
				.. * B
				..
				..
				.. Command runs:
				..
				.. * hg push -r A
				..
				.. Expected exchange:
				..
				.. * chain from A
				..
				.. Expected Exclude:
				..
				.. * chain from B

				Setup
				-----

				$ . $TESTDIR/testlib/exchange-obsmarker-util.sh

				initial

				$ setuprepos A.2
				creating test repo for test case A.2
				- pulldest
				- main
				- pushdest
				cd into `main` and proceed with env setup
				$ cd main
				$ mkcommit A
				$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
				$ hg up '.~1'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B
				created new head
				$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`
				$ hg log -G
				@ 35b183996678 (draft): B
				\|
				\| o f5bc6836db60 (draft): A
				\|/
				o a9bdc8b26820 (public): O

				$ inspect_obsmarkers
				obsstore content
				================
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				$ cd ..
				$ cd ..

				Actual Test
				-----------

				$ dotest A.2 A
				## Running testcase A.2
				# testing echange of "A" (f5bc6836db60)
				## initial state
				# obstore: main
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# obstore: pulldest
				## pushing "A" from main to pushdest
				pushing to pushdest
				searching for changes
				remote: adding changesets
				remote: adding manifests
				remote: adding file changes
				remote: added 1 changesets with 1 changes to 1 files
				remote: 1 new obsolescence markers
				## post push state
				# obstore: main
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pulldest
				## pulling "f5bc6836db60" from main into pulldest
				pulling from main
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				1 new obsolescence markers
				new changesets f5bc6836db60 (1 drafts)
				(run 'hg update' to get a working copy)
				## post pull state
				# obstore: main
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pulldest
				aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

				$ cd ..