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

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Pierre-Yves David - - Load All Authors

File last commit:

r31919:2bf73e35 default


                r33051:15a79ac8

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