upstream/mercurial-mirror Files · tests/test-absorb-unfinished.t

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

rebase: change and standarize template for rebase's one-line summary This removes the default template in rebase and switches to a centrally defined template. I've simplified it a bit to avoid the conditional parenthesis. I've also added labels so the different parts can be easily colored. The template is somewhat similar to what we've used internally at Google for a few years. I'm happy to change the template if others have opinions. Should we reuse the `color.log.` names as I have? Differential Revision: https://phab.mercurial-scm.org/D9252

Martin von Zweigbergk - - Load All Authors

File last commit:

r46356:f90a5c21 default


                r46356:f90a5c21

default

Download file

             test-absorb-unfinished.t
        
                    30 lines
            
             | 796 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-unfinished.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ 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

        rebasing 1:c3b6dc0e177a tip "foo 2"

        merging foo.whole

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

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

        [1]

        $ hg --config extensions.rebase= absorb

        abort: rebase in progress

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

        [255]

	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

				$ 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
				rebasing 1:c3b6dc0e177a tip "foo 2"
				merging foo.whole
				warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
				unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
				[1]

				$ hg --config extensions.rebase= absorb
				abort: rebase in progress
				(use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
				[255]