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

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Ryan McElroy - - Load All Authors

File last commit:

r34885:05535d0d default


                r41198:0101a35d

default

Download file

             test-merge-halt.t
        
                    164 lines
            
             | 3.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-halt.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Ryan McElroy
    
merge: add tests to show current behavior on failed filemerges...

              r34680
            
        $ 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!

        Ryan McElroy
    
merge: allow user to halt merge on merge-tool failures...

              r34798
            
        merge halted after failed merge (see hg resolve)

        Ryan McElroy
    
merge: add tests to show current behavior on failed filemerges...

              r34680
            
        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

      Testing on-failure=prompt

        Ryan McElroy
    
merge: additional test cases to show merge-halting behavior...

              r34885
            
        $ cat <<EOS >> $HGRCPATH

        > [merge]

        > on-failure=prompt

        > [ui]

        > interactive=1

        > EOS

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool false

        Ryan McElroy
    
merge: add tests to show current behavior on failed filemerges...

              r34680
            
        > y

        > n

        > EOS

        rebasing 1:1f28a51c3c9b "c"

        merging a

        merging b

        merging a failed!

        Ryan McElroy
    
merge: allow user to halt merge on merge-tool failures...

              r34798
            
        continue merge operation (yn)? y

        Ryan McElroy
    
merge: add tests to show current behavior on failed filemerges...

              r34680
            
        merging b failed!

        Ryan McElroy
    
merge: allow user to halt merge on merge-tool failures...

              r34798
            
        continue merge operation (yn)? n

        merge halted after failed merge (see hg resolve)

        Ryan McElroy
    
merge: add tests to show current behavior on failed filemerges...

              r34680
            
        [1]

        $ hg resolve --list

        U a

        U b

        $ hg rebase --abort

        rebase aborted

        Ryan McElroy
    
merge: additional test cases to show merge-halting behavior...

              r34885
            
      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

Ryan McElroy merge: add tests to show current behavior on failed filemerges...	r34680	$ 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!
Ryan McElroy merge: allow user to halt merge on merge-tool failures...	r34798	merge halted after failed merge (see hg resolve)
Ryan McElroy merge: add tests to show current behavior on failed filemerges...	r34680	[1]

		$ hg resolve --list
		U a
		U b

		$ hg rebase --abort
		rebase aborted

		Testing on-failure=prompt
Ryan McElroy merge: additional test cases to show merge-halting behavior...	r34885	$ cat <<EOS >> $HGRCPATH
		> [merge]
		> on-failure=prompt
		> [ui]
		> interactive=1
		> EOS
		$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false
Ryan McElroy merge: add tests to show current behavior on failed filemerges...	r34680	> y
		> n
		> EOS
		rebasing 1:1f28a51c3c9b "c"
		merging a
		merging b
		merging a failed!
Ryan McElroy merge: allow user to halt merge on merge-tool failures...	r34798	continue merge operation (yn)? y
Ryan McElroy merge: add tests to show current behavior on failed filemerges...	r34680	merging b failed!
Ryan McElroy merge: allow user to halt merge on merge-tool failures...	r34798	continue merge operation (yn)? n
		merge halted after failed merge (see hg resolve)
Ryan McElroy merge: add tests to show current behavior on failed filemerges...	r34680	[1]

		$ hg resolve --list
		U a
		U b

		$ hg rebase --abort
		rebase aborted

Ryan McElroy merge: additional test cases to show merge-halting behavior...	r34885	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)