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

Matt Mackall - - Load All Authors

File last commit:

r25295:701df761 default


                r32050:77eaf953

4.1.3 stable

Download file

             test-convert-clonebranches.t
        
                    87 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-clonebranches.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > convert =

        > [convert]

        > hg.tagsbranch = 0

        > EOF

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ hg init source

        $ cd source

        $ echo a > a

        $ hg ci -qAm adda

      Add a merge with one parent in the same branch

        $ echo a >> a

        $ hg ci -qAm changea

        $ hg up -qC 0

        $ hg branch branch0

        marked working directory as branch branch0

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        $ echo b > b

        $ hg ci -qAm addb

        $ hg up -qC

        $ hg merge default

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

        (branch merge, don't forget to commit)

        $ hg ci -qm mergeab

        $ hg tag -ql mergeab

        $ cd ..

      Miss perl... sometimes

        $ cat > filter.py <<EOF

        > import sys, re

        > 

        > r = re.compile(r'^(?:\d+|pulling from)')

        > sys.stdout.writelines([l for l in sys.stdin if r.search(l)])

        > EOF

      convert

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        3 adda

        2 changea

        1 addb

        pulling from default into branch0

        1 changesets found

        0 mergeab

        pulling from default into branch0

        1 changesets found

      Add a merge with both parents and child in different branches

        $ cd source

        $ hg branch branch1

        marked working directory as branch branch1

        $ echo a > file1

        $ hg ci -qAm c1

        $ hg up -qC mergeab

        $ hg branch branch2

        marked working directory as branch branch2

        $ echo a > file2

        $ hg ci -qAm c2

        $ hg merge branch1

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

        (branch merge, don't forget to commit)

        $ hg branch branch3

        marked working directory as branch branch3

        $ hg ci -qAm c3

        $ cd ..

      incremental conversion

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        2 c1

        pulling from branch0 into branch1

        4 changesets found

        1 c2

        pulling from branch0 into branch2

        4 changesets found

        0 c3

        Mads Kiilerich
    
convert: process missing branches in sorted order

              r18373
            
        pulling from branch1 into branch3

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        5 changesets found

        Mads Kiilerich
    
convert: process missing branches in sorted order

              r18373
            
        pulling from branch2 into branch3

        Matt Mackall
    
tests: unify test-convert-clonebranches

              r12518
            
        1 changesets found

	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

Matt Mackall tests: unify test-convert-clonebranches	r12518
Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> convert =
		> [convert]
		> hg.tagsbranch = 0
		> EOF
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ hg init source
		$ cd source
		$ echo a > a
		$ hg ci -qAm adda

		Add a merge with one parent in the same branch

		$ echo a >> a
		$ hg ci -qAm changea
		$ hg up -qC 0
		$ hg branch branch0
		marked working directory as branch branch0
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Matt Mackall tests: unify test-convert-clonebranches	r12518	$ echo b > b
		$ hg ci -qAm addb
		$ hg up -qC
		$ hg merge default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg ci -qm mergeab
		$ hg tag -ql mergeab
		$ cd ..

		Miss perl... sometimes

		$ cat > filter.py <<EOF
		> import sys, re
		>
		> r = re.compile(r'^(?:\d+\|pulling from)')
		> sys.stdout.writelines([l for l in sys.stdin if r.search(l)])
		> EOF

		convert

		$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
		> python filter.py
		3 adda
		2 changea
		1 addb
		pulling from default into branch0
		1 changesets found
		0 mergeab
		pulling from default into branch0
		1 changesets found

		Add a merge with both parents and child in different branches

		$ cd source
		$ hg branch branch1
		marked working directory as branch branch1
		$ echo a > file1
		$ hg ci -qAm c1
		$ hg up -qC mergeab
		$ hg branch branch2
		marked working directory as branch branch2
		$ echo a > file2
		$ hg ci -qAm c2
		$ hg merge branch1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg branch branch3
		marked working directory as branch branch3
		$ hg ci -qAm c3
		$ cd ..

		incremental conversion

		$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
		> python filter.py
		2 c1
		pulling from branch0 into branch1
		4 changesets found
		1 c2
		pulling from branch0 into branch2
		4 changesets found
		0 c3
Mads Kiilerich convert: process missing branches in sorted order	r18373	pulling from branch1 into branch3
Matt Mackall tests: unify test-convert-clonebranches	r12518	5 changesets found
Mads Kiilerich convert: process missing branches in sorted order	r18373	pulling from branch2 into branch3
Matt Mackall tests: unify test-convert-clonebranches	r12518	1 changesets found