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

rebase: add support to output nodechanges...

rebase: add support to output nodechanges This patch adds support to rebase to show the changes in node once the rebase is complete. This will be extremely helpful for automation purposes and editors such as Nuclide. The output is a dictionary of predecessor hash as key and a list of successors' hashes. The successors one is a list as there can be many successors for a single predecessor in case of split and it will good to have a generic output format. This patch adds tests for the same. A new file is created for the patch as existing files related to rebase has their own purpose and there will be more formatter support coming for rebase in next cycle. Thanks to Jun for suggesting to use fm.data(). Differential Revision: https://phab.mercurial-scm.org/D1173

Ryan McElroy - - Load All Authors

File last commit:

r34798:284fa44f default


                r34884:c858afe9

default

Download file

             test-merge-halt.t
        
                    79 lines
            
             | 1.4 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

        $ echo on-failure=prompt >> $HGRCPATH

        $ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1

        > 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

	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
		$ echo on-failure=prompt >> $HGRCPATH
		$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false --config ui.interactive=1
		> 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