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

store: introduce _matchtrackedpath() and use it to filter store files...

store: introduce _matchtrackedpath() and use it to filter store files This patch introduces a function to filter store files on the basis of the path which they are tracking. The function assumes that the entries can be of two types, 'meta/*' and 'data/*' which means it will just work on revlog based storage and not with another storage ways. For the 'data/*' entries, we remove the 'data/' part and '.i/.d' part from the beginning and the end then pass that to matcher. For the 'meta/*' entries, we remove the 'meta/' and '/00manifest.(i/d)' part from beginning and end then call matcher.visitdir() with it to make sure all the parent directories are also downloaded. Since the storage filtering for narrow stream clones is implemented with this patch, we remove the un-implemented error message, add some more tests and add the treemanifest case to tests too. The tests demonstrate that it works correctly. After this patch, we have now narrow stream clones working. Narrow stream clones are a very important feature for large repositories who have good internet connection because they use streamclones for cloning and if they do normal narrow clone, that takes more time then a full streamclone. Also narrow-stream clone will drastically speed up clone timings. Differential Revision: https://phab.mercurial-scm.org/D5139

Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default


                r40529:9aeb9e2d

default

Download file

             test-push-checkheads-unpushed-D4.t
        
                    127 lines
            
             | 3.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-4

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

      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 4: multi-changeset branch, split on multiple other, (base on its own new branch)

      .. old-state:

      ..

      .. * 2 branch (1 changeset, and 2 changesets)

      ..

      .. new-state:

      ..

      .. * 1 new branch superceeding the base of the old-2-changesets-branch,

      .. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other

      ..

      .. expected-result:

      ..

      .. * push the new branch only -> push denied (variant a)

      .. * push the existing branch only -> push allowed (variant b)

      .. (pushing all is tested as case A-7)

      ..

      .. graph-summary:

      ..

      .. (variant a)

      ..

      .. B'○⇢ø B

      ..   | |

      .. A | ø⇠◔ A'

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

      ..

      .. or (variant b)

      ..

      .. B'◔⇢ø B

      ..   | |

      .. A | ø⇠○ A'

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir D4

        $ cd D4

        $ setuprepos

        creating basic server and client repo

        updating to branch default

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

        $ cd server

        $ mkcommit B0

        $ hg up 0

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

        $ mkcommit C0

        created new head

        $ cd ../client

        $ hg pull

        pulling from $TESTTMP/D4/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        new changesets d73caddc5533:0f88766e02d6 (2 drafts)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up 0

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

        $ mkcommit A1

        created new head

        $ hg up 'desc(C0)'

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

        $ mkcommit B1

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

        obsoleted 1 changesets

        1 new orphan changesets

        $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  d70a1f75a020 (draft): B1

        |

        | o  f6082bc4ffef (draft): A1

        | |

        o |  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing (new branch only)

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

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

        pushing to $TESTTMP/D4/server

        searching for changes

        abort: push creates new remote head f6082bc4ffef!

        (merge or see 'hg help push' for details about pushing new heads)

        [255]

      Actual testing (existing branch only)

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

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

        pushing to $TESTTMP/D4/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 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-4
				====================================

				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 4: multi-changeset branch, split on multiple other, (base on its own new branch)

				.. old-state:
				..
				.. * 2 branch (1 changeset, and 2 changesets)
				..
				.. new-state:
				..
				.. * 1 new branch superceeding the base of the old-2-changesets-branch,
				.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other
				..
				.. expected-result:
				..
				.. * push the new branch only -> push denied (variant a)
				.. * push the existing branch only -> push allowed (variant b)
				.. (pushing all is tested as case A-7)
				..
				.. graph-summary:
				..
				.. (variant a)
				..
				.. B'○⇢ø B
				.. \| \|
				.. A \| ø⇠◔ A'
				.. \| \|/
				.. C ● \|
				.. \\|
				.. ●
				..
				.. or (variant b)
				..
				.. B'◔⇢ø B
				.. \| \|
				.. A \| ø⇠○ A'
				.. \| \|/
				.. C ● \|
				.. \\|
				.. ●

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

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

				$ mkdir D4
				$ cd D4
				$ setuprepos
				creating basic server and client repo
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd server
				$ mkcommit B0
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ cd ../client
				$ hg pull
				pulling from $TESTTMP/D4/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files (+1 heads)
				new changesets d73caddc5533:0f88766e02d6 (2 drafts)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit A1
				created new head
				$ hg up 'desc(C0)'
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B1
				$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				obsoleted 1 changesets
				1 new orphan changesets
				$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ d70a1f75a020 (draft): B1
				\|
				\| o f6082bc4ffef (draft): A1
				\| \|
				o \| 0f88766e02d6 (draft): C0
				\|/
				\| x d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


				Actual testing (new branch only)
				--------------------------------

				$ hg push --rev 'desc(A1)'
				pushing to $TESTTMP/D4/server
				searching for changes
				abort: push creates new remote head f6082bc4ffef!
				(merge or see 'hg help push' for details about pushing new heads)
				[255]

				Actual testing (existing branch only)
				------------------------------------

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

				$ cd ../..