upstream/mercurial-mirror Files · tests/test-push-checkheads-pruned-B3.t

match: remove unnecessary '^' from regexes...

match: remove unnecessary '^' from regexes The regexes are passed to re.match(), which matches against the beginning of the input, so the '^' doesn't do anything. Note that unrooted patterns, such as globs and regexes from .hgignore are instead achieved by adding '.*' to the expression given by the user. (That's unless the user's expression started with '^', in which case the '.*' is not added, perhaps to keep the regex cleaner?)

marmoute - - Load All Authors

File last commit:

r33249:53b3a196 default


                r33357:a21819f4

default

Download file

             test-push-checkheads-pruned-B3.t
        
                    87 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-pruned-B3.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case B-3

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

      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 B: simple case involving pruned changesets

      TestCase 3: multi-changeset branch, other is pruned, rest is superceeded

      .. old-state:

      ..

      .. * 2 changeset branch

      ..

      .. new-state:

      ..

      .. * old head is superceeded

      .. * old other is pruned

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      ..   A ⊗ |

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir B3

        $ cd B3

        $ 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

        $ cd ../client

        $ hg pull

        pulling from $TESTTMP/B3/server (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

        $ hg up 0

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

        $ mkcommit B1

        created new head

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

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

        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/B3/server (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        2 new obsolescence markers

        obsoleted 2 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 B-3
				====================================

				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 B: simple case involving pruned changesets
				TestCase 3: multi-changeset branch, other is pruned, rest is superceeded

				.. old-state:
				..
				.. * 2 changeset branch
				..
				.. new-state:
				..
				.. * old head is superceeded
				.. * old other is pruned
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. B ø⇠◔ B'
				.. \| \|
				.. A ⊗ \|
				.. \|/
				.. ●

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

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

				$ mkdir B3
				$ cd B3
				$ 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
				$ cd ../client
				$ hg pull
				pulling from $TESTTMP/B3/server (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B1
				created new head
				$ hg debugobsolete --record-parents `getid "desc(A0)"`
				$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
				$ hg log -G --hidden
				@ 25c56d33e4c4 (draft): B1
				\|
				\| x d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push
				pushing to $TESTTMP/B3/server (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				2 new obsolescence markers
				obsoleted 2 changesets

				$ cd ../..