upstream/mercurial-mirror Files · tests/test-absorb-unfinished.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-absorb-unfinished.t
        
                    30 lines
            
             | 797 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-unfinished.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Rodrigo Damazio Bovendorp
    
absorb: aborting if another operation is in progress...

              r42297
            
        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        > EOF

      Abort absorb if there is an unfinished operation.

        $ hg init abortunresolved

        $ cd abortunresolved

        $ echo "foo1" > foo.whole

        $ hg commit -Aqm "foo 1"

        $ hg update null

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

        $ echo "foo2" > foo.whole

        $ hg commit -Aqm "foo 2"

        $ hg --config extensions.rebase= rebase -r 1 -d 0

        Martin von Zweigbergk
    
rebase: change and standarize template for rebase's one-line summary...

              r46356
            
        rebasing 1:c3b6dc0e177a tip "foo 2"

        Rodrigo Damazio Bovendorp
    
absorb: aborting if another operation is in progress...

              r42297
            
        merging foo.whole

        warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')

        Daniel Ploch
    
error: unify the error message formats for 'rebase' and 'unshelve'...

              r45710
            
        unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')

        Martin von Zweigbergk
    
errors: add config that lets user get more detailed exit codes...

              r46430
            
        [240]

        Rodrigo Damazio Bovendorp
    
absorb: aborting if another operation is in progress...

              r42297
            
        $ hg --config extensions.rebase= absorb

        abort: rebase in progress

        Kyle Lippincott
    
morestatus: mention --stop even if not using --verbose...

              r45774
            
        (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')

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

              r46444
            
        [20]

        Rodrigo Damazio Bovendorp
    
absorb: aborting if another operation is in progress...

              r42297

	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 absorb: aborting if another operation is in progress...	r42297	$ cat >> $HGRCPATH << EOF
		> [extensions]
		> absorb=
		> EOF

		Abort absorb if there is an unfinished operation.

		$ hg init abortunresolved
		$ cd abortunresolved

		$ echo "foo1" > foo.whole
		$ hg commit -Aqm "foo 1"

		$ hg update null
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo "foo2" > foo.whole
		$ hg commit -Aqm "foo 2"

		$ hg --config extensions.rebase= rebase -r 1 -d 0
Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary...	r46356	rebasing 1:c3b6dc0e177a tip "foo 2"
Rodrigo Damazio Bovendorp absorb: aborting if another operation is in progress...	r42297	merging foo.whole
		warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'...	r45710	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
Martin von Zweigbergk errors: add config that lets user get more detailed exit codes...	r46430	[240]
Rodrigo Damazio Bovendorp absorb: aborting if another operation is in progress...	r42297
		$ hg --config extensions.rebase= absorb
		abort: rebase in progress
Kyle Lippincott morestatus: mention --stop even if not using --verbose...	r45774	(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil...	r46444	[20]
Rodrigo Damazio Bovendorp absorb: aborting if another operation is in progress...	r42297