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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Martin von Zweigbergk - - Load All Authors

File last commit:

r46444:527ce85c default


                r53438:f33f37ac

tip default

Download file

             test-histedit-merge-tools.t
        
                    83 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-merge-tools.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Rodrigo Damazio Bovendorp
    
histedit: narrow the scope of discarded ui output...

              r42219
            
      Test histedit extension: Merge tools

      ====================================

      Initialization

      ---------------

        $ . "$TESTDIR/histedit-helpers.sh"

        $ cat >> $HGRCPATH <<EOF

        > [alias]

        > logt = log --template '{rev}:{node|short} {desc|firstline}\n'

        > [extensions]

        > histedit=

        > mockmakedate = $TESTDIR/mockmakedate.py

        > EOF

      Merge conflict

      --------------

        $ hg init r

        $ cd r

        Martin von Zweigbergk
    
config: move ui.pre-merge-tool-output-template into [command-templates]...

              r46353
            
        $ cat >> .hg/hgrc <<EOF

        > [command-templates]

        > pre-merge-tool-output='pre-merge message for {node}\n'

        > EOF

        Rodrigo Damazio Bovendorp
    
histedit: narrow the scope of discarded ui output...

              r42219
            
        $ echo foo > file

        $ hg add file

        $ hg ci -m "First" -d "1 0"

        $ echo bar > file

        $ hg ci -m "Second" -d "2 0"

        $ hg logt --graph

        @  1:2aa920f62fb9 Second

        |

        o  0:7181f42b8fca First

      Invert the order of the commits, but fail the merge.

        $ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle

        > pick 2aa920f62fb9 Second

        > pick 7181f42b8fca First

        > EOF

        merging file

        pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec

        merging file failed!

        Fix up the change (pick 7181f42b8fca)

        (hg histedit --continue to resume)

        $ hg histedit --abort | fixbundle

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

      Invert the order of the commits, and pretend the merge succeeded.

        $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle

        > pick 2aa920f62fb9 Second

        > pick 7181f42b8fca First

        > EOF

        merging file

        pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec

        7181f42b8fca: skipping changeset (no changes)

        Martin von Zweigbergk
    
config: move ui.pre-merge-tool-output-template into [command-templates]...

              r46353
            
        $ hg histedit --abort

        abort: no histedit in progress

        Martin von Zweigbergk
    
errors: introduce StateError and use it from commands and cmdutil...

              r46444
            
        [20]

        Martin von Zweigbergk
    
config: move ui.pre-merge-tool-output-template into [command-templates]...

              r46353
            
        $ cd ..

      Test legacy config name

        $ hg init r2

        $ cd r2

        $ echo foo > file

        $ hg add file

        $ hg ci -m "First"

        $ echo bar > file

        $ hg ci -m "Second"

        $ echo conflict > file

        $ hg co -m 0 --config ui.merge=false \

        > --config ui.pre-merge-tool-output-template='legacy config: {node}\n'

        merging file

        legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7

        merging file failed!

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

        use 'hg resolve' to retry unresolved file merges

        [1]

	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

Rodrigo Damazio Bovendorp histedit: narrow the scope of discarded ui output...	r42219	Test histedit extension: Merge tools
		====================================

		Initialization
		---------------

		$ . "$TESTDIR/histedit-helpers.sh"

		$ cat >> $HGRCPATH <<EOF
		> [alias]
		> logt = log --template '{rev}:{node\|short} {desc\|firstline}\n'
		> [extensions]
		> histedit=
		> mockmakedate = $TESTDIR/mockmakedate.py
		> EOF

		Merge conflict
		--------------

		$ hg init r
		$ cd r
Martin von Zweigbergk config: move ui.pre-merge-tool-output-template into [command-templates]...	r46353	$ cat >> .hg/hgrc <<EOF
		> [command-templates]
		> pre-merge-tool-output='pre-merge message for {node}\n'
		> EOF

Rodrigo Damazio Bovendorp histedit: narrow the scope of discarded ui output...	r42219	$ echo foo > file
		$ hg add file
		$ hg ci -m "First" -d "1 0"
		$ echo bar > file
		$ hg ci -m "Second" -d "2 0"

		$ hg logt --graph
		@ 1:2aa920f62fb9 Second
		\|
		o 0:7181f42b8fca First


		Invert the order of the commits, but fail the merge.
		$ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF \| fixbundle
		> pick 2aa920f62fb9 Second
		> pick 7181f42b8fca First
		> EOF
		merging file
		pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
		merging file failed!
		Fix up the change (pick 7181f42b8fca)
		(hg histedit --continue to resume)

		$ hg histedit --abort \| fixbundle
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		Invert the order of the commits, and pretend the merge succeeded.
		$ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF \| fixbundle
		> pick 2aa920f62fb9 Second
		> pick 7181f42b8fca First
		> EOF
		merging file
		pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec
		7181f42b8fca: skipping changeset (no changes)
Martin von Zweigbergk config: move ui.pre-merge-tool-output-template into [command-templates]...	r46353	$ hg histedit --abort
		abort: no histedit in progress
Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil...	r46444	[20]
Martin von Zweigbergk config: move ui.pre-merge-tool-output-template into [command-templates]...	r46353	$ cd ..

		Test legacy config name

		$ hg init r2
		$ cd r2
		$ echo foo > file
		$ hg add file
		$ hg ci -m "First"
		$ echo bar > file
		$ hg ci -m "Second"
		$ echo conflict > file
		$ hg co -m 0 --config ui.merge=false \
		> --config ui.pre-merge-tool-output-template='legacy config: {node}\n'
		merging file
		legacy config: 889c9c4d58bd4ce74815efd04a01e0f2bf6765a7
		merging file failed!
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
		[1]