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

hgweb: support constructing URLs from an alternate base URL...

hgweb: support constructing URLs from an alternate base URL The web.baseurl config option allows server operators to define a custom URL for hosted content. The way it works today is that hgwebdir parses this config option into URL components then updates the appropriate WSGI environment variables so the request "lies" about its details. For example, SERVER_NAME is updated to reflect the alternate base URL's hostname. The WSGI environment should not be modified because WSGI applications may want to know the original request details (for debugging, etc). This commit teaches our request parser about the existence of an alternate base URL. If defined, the advertised URL and other self-reflected paths will take the alternate base URL into account. The hgweb WSGI application didn't use web.baseurl. But hgwebdir did. We update hgwebdir to alter the environment parsing accordingly. The old code around environment manipulation has been removed. With this change, parserequestfromenv() has grown to a bit unwieldy. Now that practically everyone is using it, it is obvious that there is some unused features that can be trimmed. So look for this in follow-up commits. Differential Revision: https://phab.mercurial-scm.org/D2822

Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default


                r36916:219b2335

default

Download file

             test-push-checkheads-unpushed-D6.t
        
                    84 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D6.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-6

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

      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 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset

      This is a partial push variation of case B-6

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * old branch is rewritten onto another one,

      .. * the new version is then pruned.

      ..

      .. expected-result:

      ..

      .. * push denied

      ..

      .. graph-summary:

      ..

      ..   A ø⇠⊗ A'

      ..     | |

      .. C ◔ | ○ B

      ..    \|/

      ..     ●

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

      Test setup

      ----------

        $ mkdir D6

        $ cd D6

        $ 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 up '0'

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

        $ mkcommit C0

        created new head

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

        obsoleted 1 changesets

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

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | x  ba93660aff8d (draft): A1

        | |

        | o  74ff5441d343 (draft): B0

        |/

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

        pushing to $TESTTMP/D6/server

        searching for changes

        abort: push creates new remote head 0f88766e02d6!

        (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

				====================================
				Testing head checking code: Case D-6
				====================================

				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 6: single changeset, superseeded then pruned (on a new changeset unpushed) changeset

				This is a partial push variation of case B-6

				.. old-state:
				..
				.. * 1 changeset branch
				..
				.. new-state:
				..
				.. * old branch is rewritten onto another one,
				.. * the new version is then pruned.
				..
				.. expected-result:
				..
				.. * push denied
				..
				.. graph-summary:
				..
				.. A ø⇠⊗ A'
				.. \| \|
				.. C ◔ \| ○ B
				.. \\|/
				.. ●

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

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

				$ mkdir D6
				$ cd D6
				$ 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 up '0'
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
				obsoleted 1 changesets
				$ hg debugobsolete --record-parents `getid "desc(A1)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ 0f88766e02d6 (draft): C0
				\|
				\| x ba93660aff8d (draft): A1
				\| \|
				\| o 74ff5441d343 (draft): B0
				\|/
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

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

				$ cd ../..