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

Pierre-Yves David - - Load All Authors

File last commit:

r28139:5476a7a0 default


                r32050:77eaf953

4.1.3 stable

Download file

             test-merge-default.t
        
                    151 lines
            
             | 3.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-default.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg commit -A -ma

        adding a

        $ echo b >> a

        $ hg commit -mb

        $ echo c >> a

        $ hg commit -mc

        $ hg up 1

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

        $ echo d >> a

        $ hg commit -md

        created new head

        $ hg up 1

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

        $ echo e >> a

        $ hg commit -me

        created new head

        $ hg up 1

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

      Should fail because not at a head:

        $ hg merge

        abort: working directory not at a head revision

        (use 'hg update' or merge with an explicit revision)

        [255]

        $ hg up

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

        2 other heads for branch "default"

      Should fail because > 2 heads:

        $ HGMERGE=internal:other; export HGMERGE

        $ hg merge

        abort: branch 'default' has 3 heads - please merge with an explicit rev

        (run 'hg heads .' to see heads)

        [255]

      Should succeed:

        $ hg merge 2

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

        (branch merge, don't forget to commit)

        $ hg commit -mm1

      Should succeed - 2 heads:

        $ hg merge -P

        changeset:   3:ea9ff125ff88

        parent:      1:1846eede8b68

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     d

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg commit -mm2

      Should fail because at tip:

        $ hg merge

        abort: nothing to merge

        [255]

        $ hg up 0

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

      Should fail because there is only one head:

        $ hg merge

        abort: nothing to merge

        (use 'hg update' instead)

        [255]

        $ hg up 3

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

        $ echo f >> a

        $ hg branch foobranch

        marked working directory as branch foobranch

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

        $ hg commit -mf

      Should fail because merge with other branch:

        $ hg merge

        abort: branch 'foobranch' has one head - please merge with an explicit rev

        (run 'hg heads' to see all heads)

        [255]

      Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that

      are not ancestors of 7, regardless of where their common ancestors are.

      Merge preview not affected by common ancestor:

        $ hg up -q 7

        $ hg merge -q -P 6

        2:2d95304fed5d

        4:f25cbe84d8b3

        5:a431fabd6039

        6:e88e33f3bf62

      Test experimental destination revset

        $ hg log -r '_destmerge()'

        abort: branch 'foobranch' has one head - please merge with an explicit rev

        (run 'hg heads' to see all heads)

        [255]

      (on a branch with a two heads)

        $ hg up 5

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

        $ echo f >> a

        $ hg commit -mf

        created new head

        $ hg log -r '_destmerge()'

        changeset:   6:e88e33f3bf62

        parent:      5:a431fabd6039

        parent:      3:ea9ff125ff88

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     m2

      (from the other head)

        $ hg log -r '_destmerge(e88e33f3bf62)'

        changeset:   8:b613918999e2

        tag:         tip

        parent:      5:a431fabd6039

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     f

      (from unrelated branch)

        $ hg log -r '_destmerge(foobranch)'

        abort: branch 'foobranch' has one head - please merge with an explicit rev

        (run 'hg heads' to see all heads)

        [255]

	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

				$ hg init
				$ echo a > a
				$ hg commit -A -ma
				adding a

				$ echo b >> a
				$ hg commit -mb

				$ echo c >> a
				$ hg commit -mc

				$ hg up 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo d >> a
				$ hg commit -md
				created new head

				$ hg up 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo e >> a
				$ hg commit -me
				created new head

				$ hg up 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Should fail because not at a head:

				$ hg merge
				abort: working directory not at a head revision
				(use 'hg update' or merge with an explicit revision)
				[255]

				$ hg up
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				2 other heads for branch "default"

				Should fail because > 2 heads:

				$ HGMERGE=internal:other; export HGMERGE
				$ hg merge
				abort: branch 'default' has 3 heads - please merge with an explicit rev
				(run 'hg heads .' to see heads)
				[255]

				Should succeed:

				$ hg merge 2
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -mm1

				Should succeed - 2 heads:

				$ hg merge -P
				changeset: 3:ea9ff125ff88
				parent: 1:1846eede8b68
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: d

				$ hg merge
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -mm2

				Should fail because at tip:

				$ hg merge
				abort: nothing to merge
				[255]

				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Should fail because there is only one head:

				$ hg merge
				abort: nothing to merge
				(use 'hg update' instead)
				[255]

				$ hg up 3
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo f >> a
				$ hg branch foobranch
				marked working directory as branch foobranch
				(branches are permanent and global, did you want a bookmark?)
				$ hg commit -mf

				Should fail because merge with other branch:

				$ hg merge
				abort: branch 'foobranch' has one head - please merge with an explicit rev
				(run 'hg heads' to see all heads)
				[255]


				Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
				are not ancestors of 7, regardless of where their common ancestors are.

				Merge preview not affected by common ancestor:

				$ hg up -q 7
				$ hg merge -q -P 6
				2:2d95304fed5d
				4:f25cbe84d8b3
				5:a431fabd6039
				6:e88e33f3bf62

				Test experimental destination revset

				$ hg log -r '_destmerge()'
				abort: branch 'foobranch' has one head - please merge with an explicit rev
				(run 'hg heads' to see all heads)
				[255]

				(on a branch with a two heads)

				$ hg up 5
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo f >> a
				$ hg commit -mf
				created new head
				$ hg log -r '_destmerge()'
				changeset: 6:e88e33f3bf62
				parent: 5:a431fabd6039
				parent: 3:ea9ff125ff88
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: m2


				(from the other head)

				$ hg log -r '_destmerge(e88e33f3bf62)'
				changeset: 8:b613918999e2
				tag: tip
				parent: 5:a431fabd6039
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: f


				(from unrelated branch)

				$ hg log -r '_destmerge(foobranch)'
				abort: branch 'foobranch' has one head - please merge with an explicit rev
				(run 'hg heads' to see all heads)
				[255]