upstream/mercurial-mirror Files · tests/test-push-checkheads-unpushed-D7.t

changegroup: move file matcher from narrow extension...

changegroup: move file matcher from narrow extension Sparse changegroup generation requires the use of a matcher to filter which files are relevant. This commit moves the file matcher from the narrow extension to core and updates the narrow extension to use it. I'm not sure why the narrow extension was storing the matcher as a callable that resolved to a matcher. So I changed it to be a simple matcher instance. In addition, code from narrow to intersect the matcher with the local narrow spec is now performed automatically when the changegroup packer is created. If a matcher is not passed into getbundler() an alwaysmatcher() is assumed. This ensures that a matcher is always defined for all operations. Differential Revision: https://phab.mercurial-scm.org/D4011

Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default


                r38818:9c057acb

default

Download file

             test-push-checkheads-unpushed-D7.t
        
                    100 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D7.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-7

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

      Mercurial checks for the introduction of new heads on push. Evolution comes

      into play to detect if existing branches on the server are being replaced by

      some of the new one we push.

      This case is part of a series of tests checking this behavior.

      Category D: remote head is "obs-affected" locally, but result is not part of the push

      TestCase 7: single changesets, superseeded multiple time then pruned (on a new changeset unpushed) changeset

      This is a partial push variation of B6

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * old branch is rewritten onto another one,

      .. * The rewriting it again rewritten on the root

      .. * the new version is then pruned.

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..       A'

      ..   A ø⇠ø⇠⊗ A''

      ..     | | |

      .. C ◔ | ◔ | B

      ..    \|/ /

      ..     | /

      ..     |/

      ..     |

      ..     ●

        $ . $TESTDIR/testlib/push-checkheads-util.sh

      Test setup

      ----------

        $ mkdir D7

        $ cd D7

        $ setuprepos

        creating basic server and client repo

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd client

        $ hg up 0

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

        $ mkcommit B0

        created new head

        $ mkcommit A1

        $ hg up '0'

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit A2

        created new head

        $ hg up '0'

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

        $ mkcommit C0

        created new head

        $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`

        obsoleted 1 changesets

        $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`

        obsoleted 1 changesets

        $ hg debugobsolete --record-parents `getid "desc(A2)"`

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | x  c1f8d089020f (draft): A2

        |/

        | x  ba93660aff8d (draft): A1

        | |

        | o  74ff5441d343 (draft): B0

        |/

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push --rev 'desc(C0)'

        pushing to $TESTTMP/D7/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        3 new obsolescence markers

        obsoleted 1 changesets

        $ 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 head checking code: Case D-7
				====================================

				Mercurial checks for the introduction of new heads on push. Evolution comes
				into play to detect if existing branches on the server are being replaced by
				some of the new one we push.

				This case is part of a series of tests checking this behavior.

				Category D: remote head is "obs-affected" locally, but result is not part of the push
				TestCase 7: single changesets, superseeded multiple time then pruned (on a new changeset unpushed) changeset

				This is a partial push variation of B6

				.. old-state:
				..
				.. * 1 changeset branch
				..
				.. new-state:
				..
				.. * old branch is rewritten onto another one,
				.. * The rewriting it again rewritten on the root
				.. * the new version is then pruned.
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. A'
				.. A ø⇠ø⇠⊗ A''
				.. \| \| \|
				.. C ◔ \| ◔ \| B
				.. \\|/ /
				.. \| /
				.. \|/
				.. \|
				.. ●

				$ . $TESTDIR/testlib/push-checkheads-util.sh

				Test setup
				----------

				$ mkdir D7
				$ cd D7
				$ setuprepos
				creating basic server and client repo
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd client
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B0
				created new head
				$ mkcommit A1
				$ hg up '0'
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit A2
				created new head
				$ hg up '0'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
				obsoleted 1 changesets
				$ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
				obsoleted 1 changesets
				$ hg debugobsolete --record-parents `getid "desc(A2)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ 0f88766e02d6 (draft): C0
				\|
				\| x c1f8d089020f (draft): A2
				\|/
				\| x ba93660aff8d (draft): A1
				\| \|
				\| o 74ff5441d343 (draft): B0
				\|/
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


				Actual testing
				--------------

				$ hg push --rev 'desc(C0)'
				pushing to $TESTTMP/D7/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				3 new obsolescence markers
				obsoleted 1 changesets

				$ cd ../..