upstream/mercurial-mirror Files · tests/test-mq-pull-from-bundle.t

dispatch: protect against malicious 'hg serve --stdio' invocations (sec)...

dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Some shared-ssh installations assume that 'hg serve --stdio' is a safe command to run for minimally trusted users. Unfortunately, the messy implementation of argument parsing here meant that trying to access a repo named '--debugger' would give the user a pdb prompt, thereby sidestepping any hoped-for sandboxing. Serving repositories over HTTP(S) is unaffected. We're not currently hardening any subcommands other than 'serve'. If your service exposes other commands to users with arbitrary repository names, it is imperative that you defend against repository names of '--debugger' and anything starting with '--config'. The read-only mode of hg-ssh stopped working because it provided its hook configuration to "hg serve --stdio" via --config parameter. This is banned for security reasons now. This patch switches it to directly call ui.setconfig(). If your custom hosting infrastructure relies on passing --config to "hg serve --stdio", you'll need to find a different way to get that configuration into Mercurial, either by using ui.setconfig() as hg-ssh does in this patch, or by placing an hgrc file someplace where Mercurial will read it. mitrandir@fb.com provided some extra fixes for the dispatch code and for hg-ssh in places that I overlooked.

Klaus Koch - - Load All Authors

File last commit:

r12962:ff083040 stable


                r32050:77eaf953

4.1.3 stable

Download file

             test-mq-pull-from-bundle.t
        
                    135 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-pull-from-bundle.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > mq=

        > [alias]

        > tlog = log --template "{rev}: {desc}\\n"

        > theads = heads --template "{rev}: {desc}\\n"

        > tincoming = incoming --template "{rev}: {desc}\\n"

        > EOF

      Setup main:

        $ hg init base

        $ cd base

        $ echo "One" > one

        $ hg add

        adding one

        $ hg ci -m "main: one added"

        $ echo "++" >> one

        $ hg ci -m "main: one updated"

      Bundle main:

        $ hg bundle --base=null ../main.hg

        2 changesets found

        $ cd ..

      Incoming to fresh repo:

        $ hg init fresh

        $ hg -R fresh tincoming main.hg

        comparing with main.hg

        0: main: one added

        1: main: one updated

        Klaus Koch
    
bundlerepository: get rid of temporary bundle files (issue2478)...

              r12962
            
        $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ hg -R fresh tincoming bundle:fresh+main.hg

        comparing with bundle:fresh+main.hg

        0: main: one added

        1: main: one updated

      Setup queue:

        $ cd base

        $ hg qinit -c

        $ hg qnew -m "patch: two added" two.patch

        $ echo two > two

        $ hg add

        adding two

        $ hg qrefresh

        $ hg qcommit -m "queue: two.patch added"

        $ hg qpop -a

        popping two.patch

        patch queue now empty

      Bundle queue:

        $ hg -R .hg/patches bundle --base=null ../queue.hgq

        1 changesets found

        Klaus Koch
    
bundlerepository: get rid of temporary bundle files (issue2478)...

              r12962
            
        $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ cd ..

      Clone base:

        $ hg clone base copy

        updating to branch default

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

        $ cd copy

        $ hg qinit -c

      Incoming queue bundle:

        $ hg -R .hg/patches tincoming ../queue.hgq

        comparing with ../queue.hgq

        0: queue: two.patch added

        Klaus Koch
    
bundlerepository: get rid of temporary bundle files (issue2478)...

              r12962
            
        $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
      Pull queue bundle:

        $ hg -R .hg/patches pull --update ../queue.hgq

        pulling from ../queue.hgq

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        merging series

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

        Klaus Koch
    
bundlerepository: get rid of temporary bundle files (issue2478)...

              r12962
            
        $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ hg -R .hg/patches theads

        0: queue: two.patch added

        $ hg -R .hg/patches tlog

        0: queue: two.patch added

        $ hg qseries

        two.patch

        $ cd ..

      Clone base again:

        $ hg clone base copy2

        updating to branch default

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

        $ cd copy2

        $ hg qinit -c

      Unbundle queue bundle:

        $ hg -R .hg/patches unbundle --update ../queue.hgq

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        merging series

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

        $ hg -R .hg/patches theads

        0: queue: two.patch added

        $ hg -R .hg/patches tlog

        0: queue: two.patch added

        $ hg qseries

        two.patch

        $ 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

Adrian Buehlmann tests: unify some of test-mq*	r12324	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> mq=
		> [alias]
		> tlog = log --template "{rev}: {desc}\\n"
		> theads = heads --template "{rev}: {desc}\\n"
		> tincoming = incoming --template "{rev}: {desc}\\n"
		> EOF

		Setup main:

		$ hg init base
		$ cd base
		$ echo "One" > one
		$ hg add
		adding one
		$ hg ci -m "main: one added"
		$ echo "++" >> one
		$ hg ci -m "main: one updated"

		Bundle main:

		$ hg bundle --base=null ../main.hg
		2 changesets found

		$ cd ..

		Incoming to fresh repo:

		$ hg init fresh

		$ hg -R fresh tincoming main.hg
		comparing with main.hg
		0: main: one added
		1: main: one updated
Klaus Koch bundlerepository: get rid of temporary bundle files (issue2478)...	r12962	$ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true
Adrian Buehlmann tests: unify some of test-mq*	r12324
		$ hg -R fresh tincoming bundle:fresh+main.hg
		comparing with bundle:fresh+main.hg
		0: main: one added
		1: main: one updated


		Setup queue:

		$ cd base
		$ hg qinit -c
		$ hg qnew -m "patch: two added" two.patch
		$ echo two > two
		$ hg add
		adding two
		$ hg qrefresh
		$ hg qcommit -m "queue: two.patch added"
		$ hg qpop -a
		popping two.patch
		patch queue now empty

		Bundle queue:

		$ hg -R .hg/patches bundle --base=null ../queue.hgq
		1 changesets found
Klaus Koch bundlerepository: get rid of temporary bundle files (issue2478)...	r12962	$ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true
Adrian Buehlmann tests: unify some of test-mq*	r12324
		$ cd ..


		Clone base:

		$ hg clone base copy
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd copy
		$ hg qinit -c

		Incoming queue bundle:

		$ hg -R .hg/patches tincoming ../queue.hgq
		comparing with ../queue.hgq
		0: queue: two.patch added
Klaus Koch bundlerepository: get rid of temporary bundle files (issue2478)...	r12962	$ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' \|\| true
Adrian Buehlmann tests: unify some of test-mq*	r12324
		Pull queue bundle:

		$ hg -R .hg/patches pull --update ../queue.hgq
		pulling from ../queue.hgq
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 3 changes to 3 files
		merging series
		2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Klaus Koch bundlerepository: get rid of temporary bundle files (issue2478)...	r12962	$ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' \|\| true
Adrian Buehlmann tests: unify some of test-mq*	r12324
		$ hg -R .hg/patches theads
		0: queue: two.patch added

		$ hg -R .hg/patches tlog
		0: queue: two.patch added

		$ hg qseries
		two.patch

		$ cd ..


		Clone base again:

		$ hg clone base copy2
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd copy2
		$ hg qinit -c

		Unbundle queue bundle:

		$ hg -R .hg/patches unbundle --update ../queue.hgq
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 3 changes to 3 files
		merging series
		2 files updated, 1 files merged, 0 files removed, 0 files unresolved

		$ hg -R .hg/patches theads
		0: queue: two.patch added

		$ hg -R .hg/patches tlog
		0: queue: two.patch added

		$ hg qseries
		two.patch

		$ cd ..