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

patch: don't separate \r and \n when colorizing diff output...

patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

Ryan McElroy - - Load All Authors

File last commit:

r34885:05535d0d default


                r38649:e1987261

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)