upstream/mercurial-mirror Files · tests/test-merge-halt.t

exchange: move disabling of rev-branch-cache bundle part out of narrow...

exchange: move disabling of rev-branch-cache bundle part out of narrow I'm attempting to refactor changegroup code in order to better support alternate storage backends. The narrow extension is performing a lot of monkeypatching to this code and it is making it difficult to reason about how everything works. I'm reasonably certain I would be unable to abstract storage without requiring extensive rework of narrow. I believe it is less effort to move narrow code into core so it can be accounted for when changegroup code is refactored. So I'll be doing that. The first part of this is integrating the disabling of the cache:rev-branch-cache bundle2 part into core. This doesn't seem like it is related to changegroup, but narrow's modifications to changegroup are invasive and also require taking its code for bundle generation and exchange into core in order for the changegroup code to work. Differential Revision: https://phab.mercurial-scm.org/D4007

Ryan McElroy - - Load All Authors

File last commit:

r34885:05535d0d default


                r38813:ab765bc4

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)