upstream/mercurial-mirror Files · tests/test-merge-halt.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

Ryan McElroy - - Load All Authors

File last commit:

r34885:05535d0d default


                r36916:219b2335

default

Download file

             test-merge-halt.t
        
                    164 lines
            
             | 3.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-halt.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > [phases]

        > publish=False

        > [merge]

        > EOF

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ echo b > b

        $ hg commit -qAm ab

        $ echo c >> a

        $ echo c >> b

        $ hg commit -qAm c

        $ hg up -q ".^"

        $ echo d >> a

        $ echo d >> b

        $ hg commit -qAm d

      Testing on-failure=continue

        $ echo on-failure=continue >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merging b failed!

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=halt

        $ echo on-failure=halt >> $HGRCPATH

        $ hg rebase -s 1 -d 2 --tool false

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=prompt

        $ cat <<EOS >> $HGRCPATH

        > [merge]

        > on-failure=prompt

        > [ui]

        > interactive=1

        > EOS

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool false

        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        continue merge operation (yn)? y

        merging b failed!

        continue merge operation (yn)? n

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that successful tool with failed post-check halts the merge

        $ cat <<EOS >> $HGRCPATH

        > [merge-tools]

        > true.check=changed

        > EOS

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool true

        > y

        > n

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

         output file a appears unchanged

        was merge successful (yn)? y

         output file b appears unchanged

        was merge successful (yn)? n

        merging b failed!

        continue merge operation (yn)? n

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        R a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that conflicts with conflict check also halts the merge

        $ cat <<EOS >> $HGRCPATH

        > [merge-tools]

        > true.check=conflicts

        > true.premerge=keep

        > [merge]

        > on-failure=halt

        > EOS

        $ hg rebase -s 1 -d 2 --tool true

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that always-prompt also can halt the merge

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt

        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        was merge of 'a' successful (yn)? y

        was merge of 'b' successful (yn)? n

        merging b failed!

        merge halted after failed merge (see hg resolve)

        [1]

        $ hg resolve --list

        R a

        U b

        $ hg rebase --abort

        rebase aborted

      Check that successful tool otherwise allows the merge to continue

        $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        $TESTTMP/repo/a *a~base* *a~other* (glob)

        $TESTTMP/repo/b *b~base* *b~other* (glob)

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> [phases]
				> publish=False
				> [merge]
				> EOF

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ echo b > b
				$ hg commit -qAm ab
				$ echo c >> a
				$ echo c >> b
				$ hg commit -qAm c
				$ hg up -q ".^"
				$ echo d >> a
				$ echo d >> b
				$ hg commit -qAm d

				Testing on-failure=continue
				$ echo on-failure=continue >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=halt
				$ echo on-failure=halt >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Testing on-failure=prompt
				$ cat <<EOS >> $HGRCPATH
				> [merge]
				> on-failure=prompt
				> [ui]
				> interactive=1
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				continue merge operation (yn)? y
				merging b failed!
				continue merge operation (yn)? n
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that successful tool with failed post-check halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=changed
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true
				> y
				> n
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				output file a appears unchanged
				was merge successful (yn)? y
				output file b appears unchanged
				was merge successful (yn)? n
				merging b failed!
				continue merge operation (yn)? n
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that conflicts with conflict check also halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=conflicts
				> true.premerge=keep
				> [merge]
				> on-failure=halt
				> EOS
				$ hg rebase -s 1 -d 2 --tool true
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that always-prompt also can halt the merge
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				was merge of 'a' successful (yn)? y
				was merge of 'b' successful (yn)? n
				merging b failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that successful tool otherwise allows the merge to continue
				$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				$TESTTMP/repo/a a~base a~other (glob)
				$TESTTMP/repo/b b~base b~other (glob)