upstream/mercurial-mirror Files · tests/test-single-head-obsolescence-named-branch-A2.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:

r49537:053a5bf5 default


                r53823:f33f37ac

tip default

Download file

             test-single-head-obsolescence-named-branch-A2.t
        
                    113 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-single-head-obsolescence-named-branch-A2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing single head enforcement: Case A-2

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

      A repository is set to only accept a single head per name (typically named

      branch). However, obsolete changesets can make this enforcement more

      complicated, because they can be kept visible by other changeset on other

      branch.

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

      Category A: Involving obsolescence

      TestCase 2: A branch is split in two, effectively creating two heads

      .. old-state:

      ..

      .. * 2 changesets on branch default

      .. * 2 changesets on branch Z on top of them

      ..

      .. new-state:

      ..

      .. * 2 changesets on branch Z at the same location

      .. * 1 changeset on branch default unchanged

      .. * 1 changeset on branch default superseding the other ones

      ..

      .. expected-result:

      ..

      .. * two heads detected

      ..

      .. graph-summary:

      ..

      ..   D ●      (branch Z)

      ..     |

      ..   C ●      (branch Z)

      ..     |

      ..   B ø⇠◔ B'

      ..     | |

      ..   A ● |

      ..     |/

      ..     ●

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

        $ cat >> $HGRCPATH << EOF

        > [command-templates]

        > log = "{node|short} [{branch}] ({phase}): {desc}\n"

        > EOF

      Test setup

      ----------

        $ mkdir A2

        $ cd A2

        $ setuprepos single-head

        creating basic server and client repo

        updating to branch default

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

        $ cd client

        $ mkcommit B0

        $ hg branch Z

        marked working directory as branch Z

        (branches are permanent and global, did you want a bookmark?)

        $ mkcommit C0

        $ mkcommit D0

        $ hg push --new-branch

        pushing to $TESTTMP/A2/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files

        $ hg up 0

        0 files updated, 0 files merged, 4 files removed, 0 files unresolved

        $ mkcommit B1

        created new head

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

        1 new obsolescence markers

        obsoleted 1 changesets

        2 new orphan changesets

        $ hg heads

        25c56d33e4c4 [default] (draft): B1

        cdf1dbb37a67 [Z] (draft): D0

        8aaa48160adc [default] (draft): A0

        $ hg log -G --hidden

        @  25c56d33e4c4 [default] (draft): B1

        |

        | *  cdf1dbb37a67 [Z] (draft): D0

        | |

        | *  3213e3e16c67 [Z] (draft): C0

        | |

        | x  d73caddc5533 [default] (draft): B0

        | |

        | o  8aaa48160adc [default] (draft): A0

        |/

        o  1e4be0697311 [default] (public): root

      Actual testing

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

      (force push to make sure we get the changeset on the remote)

        $ hg push -r 'desc("B1")' --force

        pushing to $TESTTMP/A2/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        transaction abort!

        rollback completed

        abort: rejecting multiple heads on branch "default"

        (2 heads: 8aaa48160adc 25c56d33e4c4)

        [255]

	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 single head enforcement: Case A-2
				=========================================

				A repository is set to only accept a single head per name (typically named
				branch). However, obsolete changesets can make this enforcement more
				complicated, because they can be kept visible by other changeset on other
				branch.

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

				Category A: Involving obsolescence
				TestCase 2: A branch is split in two, effectively creating two heads

				.. old-state:
				..
				.. * 2 changesets on branch default
				.. * 2 changesets on branch Z on top of them
				..
				.. new-state:
				..
				.. * 2 changesets on branch Z at the same location
				.. * 1 changeset on branch default unchanged
				.. * 1 changeset on branch default superseding the other ones
				..
				.. expected-result:
				..
				.. * two heads detected
				..
				.. graph-summary:
				..
				.. D ● (branch Z)
				.. \|
				.. C ● (branch Z)
				.. \|
				.. B ø⇠◔ B'
				.. \| \|
				.. A ● \|
				.. \|/
				.. ●

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

				$ cat >> $HGRCPATH << EOF
				> [command-templates]
				> log = "{node\|short} [{branch}] ({phase}): {desc}\n"
				> EOF

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

				$ mkdir A2
				$ cd A2
				$ setuprepos single-head
				creating basic server and client repo
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd client
				$ mkcommit B0
				$ hg branch Z
				marked working directory as branch Z
				(branches are permanent and global, did you want a bookmark?)
				$ mkcommit C0
				$ mkcommit D0
				$ hg push --new-branch
				pushing to $TESTTMP/A2/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files
				$ hg up 0
				0 files updated, 0 files merged, 4 files removed, 0 files unresolved
				$ mkcommit B1
				created new head
				$ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
				1 new obsolescence markers
				obsoleted 1 changesets
				2 new orphan changesets
				$ hg heads
				25c56d33e4c4 [default] (draft): B1
				cdf1dbb37a67 [Z] (draft): D0
				8aaa48160adc [default] (draft): A0
				$ hg log -G --hidden
				@ 25c56d33e4c4 [default] (draft): B1
				\|
				\| * cdf1dbb37a67 [Z] (draft): D0
				\| \|
				\| * 3213e3e16c67 [Z] (draft): C0
				\| \|
				\| x d73caddc5533 [default] (draft): B0
				\| \|
				\| o 8aaa48160adc [default] (draft): A0
				\|/
				o 1e4be0697311 [default] (public): root


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

				(force push to make sure we get the changeset on the remote)

				$ hg push -r 'desc("B1")' --force
				pushing to $TESTTMP/A2/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				transaction abort!
				rollback completed
				abort: rejecting multiple heads on branch "default"
				(2 heads: 8aaa48160adc 25c56d33e4c4)
				[255]