upstream/mercurial-mirror Files · tests/test-push-checkheads-partial-C2.t

revisions: allow "x123" to refer to nodeid prefix "123"...

revisions: allow "x123" to refer to nodeid prefix "123" When resolving "123" to a revision, we try to interpret it as revnum before we try to interpret it as a nodeid hex prefix. This can lead to the shortest valid prefix being longer than necessary. This patch lets us write such nodeids in a shorter form by prefixing them with "x" instead of adding more hex digits until they're longer than the longest decimal revnum. On my hg repo with almost 69k revisions, turning this feature on saves on average 0.4% on the average nodeid length. That clearly doesn't justify this patch. However, it becomes more usefule when combined with the earlier patches in this series that let you disambiguate nodeid prefixes within a configured revset. Note that we attempt to resolve symbols as nodeid prefixes after we've exhausted all other posibilities, so this is a backwards compatible change (only queries that would previously fail may now succeed). I've still hidden this feature behind an experiemntal config option so we can roll it back if needed. Differential Revision: https://phab.mercurial-scm.org/D4041

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r38891:7848f284

default

Download file

             test-push-checkheads-partial-C2.t
        
                    85 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-partial-C2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

              r31983
            
      ====================================

      Testing head checking code: Case C-2

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

      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 C: case were the branch is only partially obsoleted

      TestCase 2: 2 changeset branch, only the base is rewritten

      .. old-state:

      ..

      .. * 2 changeset branch

      ..

      .. new-state:

      ..

      .. * 1 new changesets branches superceeding only the base of the old one

      .. * The old branch is still alive (base is obsolete, head is alive)

      ..

      .. expected-result:

      ..

      .. * push denied

      ..

      .. graph-summary:

      ..

      ..   B ○

      ..     |

      ..   A ø⇠◔ A'

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir C2

        $ cd C2

        $ 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

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pulling from $TESTTMP/C2/server

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

              r31983
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets d73caddc5533

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

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

        $ hg up 0

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

        $ mkcommit A1

        created new head

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

        Boris Feld
    
debugobsolete: also report the number of obsoleted changesets...

              r33542
            
        obsoleted 1 changesets

        Martin von Zweigbergk
    
evolution: report new unstable changesets...

              r35727
            
        1 new orphan changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

              r31983
            
        $ hg log -G --hidden

        @  f6082bc4ffef (draft): A1

        |

        av6
    
graphlog: add another graph node type, unstable, using character "*" (BC)

              r35524
            
        | *  d73caddc5533 (draft): B0

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

              r31983
            
        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pushing to $TESTTMP/C2/server

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case C2...

              r31983
            
        searching for changes

        abort: push creates new remote head f6082bc4ffef!

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

        [255]

        $ 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

Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	====================================
		Testing head checking code: Case C-2
		====================================

		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 C: case were the branch is only partially obsoleted
		TestCase 2: 2 changeset branch, only the base is rewritten

		.. old-state:
		..
		.. * 2 changeset branch
		..
		.. new-state:
		..
		.. * 1 new changesets branches superceeding only the base of the old one
		.. * The old branch is still alive (base is obsolete, head is alive)
		..
		.. expected-result:
		..
		.. * push denied
		..
		.. graph-summary:
		..
		.. B ○
		.. \|
		.. A ø⇠◔ A'
		.. \|/
		.. ●

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

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

		$ mkdir C2
		$ cd C2
		$ 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
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/C2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets d73caddc5533
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	(run 'hg update' to get a working copy)
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		created new head
		$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Martin von Zweigbergk evolution: report new unstable changesets...	r35727	1 new orphan changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	$ hg log -G --hidden
		@ f6082bc4ffef (draft): A1
		\|
av6 graphlog: add another graph node type, unstable, using character "*" (BC)	r35524	\| * d73caddc5533 (draft): B0
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	\| \|
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


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

		$ hg push --rev 'desc(A1)'
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/C2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case C2...	r31983	searching for changes
		abort: push creates new remote head f6082bc4ffef!
		(merge or see 'hg help push' for details about pushing new heads)
		[255]

		$ cd ../..