upstream/mercurial-mirror Files · tests/test-push-checkheads-superceed-A5.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 "..".

av6 - - Load All Authors

File last commit:

r50061:5996640f default


                r53823:f33f37ac

tip default

Download file

             test-push-checkheads-superceed-A5.t
        
                    78 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case A-5

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

      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 A: simple case involving a branch being superseded by another.

      TestCase 5: New changeset as parent of the successor

      .. old-state:

      ..

      .. * 1-changeset branch

      ..

      .. new-state:

      ..

      .. * 2rchangeset branch, head is a successor, but other is new

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   A ø⇠◔ A'

      ..     | |

      ..     | ◔ B

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir A5

        $ cd A5

        $ 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 debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

        1 new obsolescence markers

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  ba93660aff8d (draft): A1

        |

        o  74ff5441d343 (draft): B0

        |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/A5/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        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 A-5
				====================================

				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 A: simple case involving a branch being superseded by another.
				TestCase 5: New changeset as parent of the successor

				.. old-state:
				..
				.. * 1-changeset branch
				..
				.. new-state:
				..
				.. * 2rchangeset branch, head is a successor, but other is new
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. A ø⇠◔ A'
				.. \| \|
				.. \| ◔ B
				.. \|/
				.. ●

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

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

				$ mkdir A5
				$ cd A5
				$ 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 debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				1 new obsolescence markers
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ ba93660aff8d (draft): A1
				\|
				o 74ff5441d343 (draft): B0
				\|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

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

				$ cd ../..