upstream/mercurial-mirror Files · tests/test-exchange-obsmarkers-case-B7.t

rebase: clean up rebasestate from active transaction...

rebase: clean up rebasestate from active transaction Previously, rebase assumes the following pattern: rebase: with transaction as tr: # top-level ... tr.__close__ writes rebasestate unlink('rebasestate') However it's possible that "rebase" was called inside a transaction: with transaction as tr1: rebase: with transaction as tr2: # not top-level ... tr2.__close__ does not write rebasestate unlink('rebasestate') tr1.__close__ writes rebasestate That leaves a rebasestate on disk incorrectly. This patch adds "removefilegenerator" to notify transaction code that the state file is no longer needed therefore fixes the issue.

Pierre-Yves David - - Load All Authors

File last commit:

r31919:2bf73e35 default


                r33056:2312e70c

default

Download file

             test-exchange-obsmarkers-case-B7.t
        
                    100 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-exchange-obsmarkers-case-B7.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing obsolescence markers push: Cases B.7

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

      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 B: pruning case

      TestCase 7: Prune on non-targeted common changeset

      B.7 Prune above non-targeted common changeset

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

      .. (very similar to B1, but the prune changeset is unknown on remote)

      ..

      .. {{{

      ..     ⊗ B

      ..     |

      ..     ◕ A

      ..     |

      ..     ● O

      .. }}}

      ..

      .. Marker exist from:

      ..

      ..  * B (prune)

      ..

      .. Command runs:

      ..

      ..  * hg push -r O

      ..

      .. Expected exclude:

      ..

      ..  * B (prune)

      Setup

      -----

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

      Initial

        $ setuprepos B.7

        creating test repo for test case B.7

        - pulldest

        - main

        - pushdest

        cd into `main` and proceed with env setup

        $ cd main

        $ mkcommit A

        $ hg push -q ../pushdest

        $ hg push -q ../pulldest

        $ mkcommit B

        $ hg prune -qd '0 0' .

        $ hg log -G --hidden

        x  f6fbb35d8ac9 (draft): B

        |

        @  f5bc6836db60 (draft): A

        |

        o  a9bdc8b26820 (public): O

        $ inspect_obsmarkers

        obsstore content

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

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

        $ cd ..

        $ cd ..

      Actual Test

      -------------------------------------

        $ dotest B.7 O

        ## Running testcase B.7

        # testing echange of "O" (a9bdc8b26820)

        ## initial state

        # obstore: main

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

        # obstore: pushdest

        # obstore: pulldest

        ## pushing "O" from main to pushdest

        pushing to pushdest

        searching for changes

        no changes found

        ## post push state

        # obstore: main

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

        # obstore: pushdest

        # obstore: pulldest

        ## pulling "a9bdc8b26820" from main into pulldest

        pulling from main

        no changes found

        ## post pull state

        # obstore: main

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

        # obstore: pushdest

        # obstore: pulldest

	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 B.7
				============================================

				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 B: pruning case
				TestCase 7: Prune on non-targeted common changeset

				B.7 Prune above non-targeted common changeset
				=============================================

				.. (very similar to B1, but the prune changeset is unknown on remote)
				..
				.. {{{
				.. ⊗ B
				.. \|
				.. ◕ A
				.. \|
				.. ● O
				.. }}}
				..
				.. Marker exist from:
				..
				.. * B (prune)
				..
				.. Command runs:
				..
				.. * hg push -r O
				..
				.. Expected exclude:
				..
				.. * B (prune)

				Setup
				-----

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

				Initial

				$ setuprepos B.7
				creating test repo for test case B.7
				- pulldest
				- main
				- pushdest
				cd into `main` and proceed with env setup
				$ cd main
				$ mkcommit A
				$ hg push -q ../pushdest
				$ hg push -q ../pulldest
				$ mkcommit B
				$ hg prune -qd '0 0' .
				$ hg log -G --hidden
				x f6fbb35d8ac9 (draft): B
				\|
				@ f5bc6836db60 (draft): A
				\|
				o a9bdc8b26820 (public): O

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

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

				$ dotest B.7 O
				## Running testcase B.7
				# testing echange of "O" (a9bdc8b26820)
				## initial state
				# obstore: main
				f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# obstore: pulldest
				## pushing "O" from main to pushdest
				pushing to pushdest
				searching for changes
				no changes found
				## post push state
				# obstore: main
				f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# obstore: pulldest
				## pulling "a9bdc8b26820" from main into pulldest
				pulling from main
				no changes found
				## post pull state
				# obstore: main
				f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# obstore: pulldest