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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default


                r53823:f33f37ac

tip default

Download file

             test-exchange-obsmarkers-case-B3.t
        
                    116 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-exchange-obsmarkers-case-B3.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing obsolescence markers push: Cases B.3

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

      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 3: Pruned changeset on non-pushed part of the history

      B.3 Pruned changeset on non-pushed part of the history

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

      .. {{{

      ..   ⊗ C

      ..   |

      ..   ○ B

      ..   | ◔ A

      ..   |/

      ..   ● O

      .. }}}

      ..

      .. Marker exists from:

      ..

      ..  * C (prune)

      ..

      .. Commands run:

      ..

      ..  * hg push -r A

      ..

      .. Expected exchange:

      ..

      ..  * ø

      ..

      .. Expected exclude:

      ..

      ..  * chain from B

      Setup

      -----

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

      initial

        $ setuprepos B.3

        creating test repo for test case B.3

        - pulldest

        - main

        - pushdest

        cd into `main` and proceed with env setup

        $ cd main

        $ mkcommit A

        $ hg up --quiet 0

        $ mkcommit B

        created new head

        $ mkcommit C

        $ hg prune -qd '0 0' .

        $ hg log -G --hidden

        x  e56289ab6378 (draft): C

        |

        @  35b183996678 (draft): B

        |

        | o  f5bc6836db60 (draft): A

        |/

        o  a9bdc8b26820 (public): O

        $ inspect_obsmarkers

        obsstore content

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

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

        $ cd ..

        $ cd ..

      Actual Test

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

        $ dotest B.3 A

        ## Running testcase B.3

        # testing echange of "A" (f5bc6836db60)

        ## initial state

        # obstore: main

        e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (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

        ## post push state

        # obstore: main

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

        # obstore: pushdest

        # 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

        new changesets f5bc6836db60 (1 drafts)

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

        ## post pull state

        # obstore: main

        e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (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.3
				============================================

				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 3: Pruned changeset on non-pushed part of the history

				B.3 Pruned changeset on non-pushed part of the history
				======================================================

				.. {{{
				.. ⊗ C
				.. \|
				.. ○ B
				.. \| ◔ A
				.. \|/
				.. ● O
				.. }}}
				..
				.. Marker exists from:
				..
				.. * C (prune)
				..
				.. Commands run:
				..
				.. * hg push -r A
				..
				.. Expected exchange:
				..
				.. * ø
				..
				.. Expected exclude:
				..
				.. * chain from B

				Setup
				-----

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

				initial

				$ setuprepos B.3
				creating test repo for test case B.3
				- pulldest
				- main
				- pushdest
				cd into `main` and proceed with env setup
				$ cd main
				$ mkcommit A
				$ hg up --quiet 0
				$ mkcommit B
				created new head
				$ mkcommit C
				$ hg prune -qd '0 0' .
				$ hg log -G --hidden
				x e56289ab6378 (draft): C
				\|
				@ 35b183996678 (draft): B
				\|
				\| o f5bc6836db60 (draft): A
				\|/
				o a9bdc8b26820 (public): O

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

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

				$ dotest B.3 A
				## Running testcase B.3
				# testing echange of "A" (f5bc6836db60)
				## initial state
				# obstore: main
				e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (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
				## post push state
				# obstore: main
				e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# 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
				new changesets f5bc6836db60 (1 drafts)
				(run 'hg update' to get a working copy)
				## post pull state
				# obstore: main
				e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
				# obstore: pushdest
				# obstore: pulldest