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

Pulkit Goyal - - Load All Authors

File last commit:

r35123:f56a30b8 default


                r36916:219b2335

default

Download file

             test-rebase-templates.t
        
                    57 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-templates.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing templating for rebase command

      Setup

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > [experimental]

        > evolution=createmarkers

        > EOF

        $ hg init repo

        $ cd repo

        $ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done

        $ hg log -G -T "{rev}:{node|short} {desc}"

        @  3:62615734edd5 Added d

        |

        o  2:28ad74487de9 Added c

        |

        o  1:29becc82797a Added b

        |

        o  0:18d04c59bb5d Added a

      Getting the JSON output for nodechanges

        $ hg rebase -s 2 -d 0 -q -Tjson

        [

         {

          "nodechanges": {"28ad74487de9599d00d81085be739c61fc340652": ["849767420fd5519cf0026232411a943ed03cc9fb"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["df21b32134ba85d86bca590cbe9b8b7cbc346c53"]}

         }

        ]

        $ hg log -G -T "{rev}:{node|short} {desc}"

        @  5:df21b32134ba Added d

        |

        o  4:849767420fd5 Added c

        |

        | o  1:29becc82797a Added b

        |/

        o  0:18d04c59bb5d Added a

        $ hg rebase -s 1 -d 5 -q -T "{nodechanges|json}"

        {"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)

        $ hg log -G -T "{rev}:{node|short} {desc}"

        o  6:d9d6773efc83 Added b

        |

        @  5:df21b32134ba Added d

        |

        o  4:849767420fd5 Added c

        |

        o  0:18d04c59bb5d Added a

        $ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}"

        d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f  (no-eol)

	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 templating for rebase command

				Setup

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> [experimental]
				> evolution=createmarkers
				> EOF

				$ hg init repo
				$ cd repo
				$ for ch in a b c d; do echo foo > $ch; hg commit -Aqm "Added "$ch; done

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				@ 3:62615734edd5 Added d
				\|
				o 2:28ad74487de9 Added c
				\|
				o 1:29becc82797a Added b
				\|
				o 0:18d04c59bb5d Added a

				Getting the JSON output for nodechanges

				$ hg rebase -s 2 -d 0 -q -Tjson
				[
				{
				"nodechanges": {"28ad74487de9599d00d81085be739c61fc340652": ["849767420fd5519cf0026232411a943ed03cc9fb"], "62615734edd52f06b6fb9c2beb429e4fe30d57b8": ["df21b32134ba85d86bca590cbe9b8b7cbc346c53"]}
				}
				]

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				@ 5:df21b32134ba Added d
				\|
				o 4:849767420fd5 Added c
				\|
				\| o 1:29becc82797a Added b
				\|/
				o 0:18d04c59bb5d Added a

				$ hg rebase -s 1 -d 5 -q -T "{nodechanges\|json}"
				{"29becc82797a4bc11ec8880b58eaecd2ab3e7760": ["d9d6773efc831c274eace04bc13e8e6412517139"]} (no-eol)

				$ hg log -G -T "{rev}:{node\|short} {desc}"
				o 6:d9d6773efc83 Added b
				\|
				@ 5:df21b32134ba Added d
				\|
				o 4:849767420fd5 Added c
				\|
				o 0:18d04c59bb5d Added a


				$ hg rebase -s 6 -d 4 -q -T "{nodechanges % '{oldnode}:{newnodes % ' {node} '}'}"
				d9d6773efc831c274eace04bc13e8e6412517139: f48cd65c6dc3d2acb55da54402a5b029546e546f (no-eol)