upstream/mercurial-mirror Files · tests/test-narrow-rebase.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-narrow-rebase.t
        
                    99 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-rebase.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Taapas Agrawal
    
continue: added support for rebase...

              r42832
            
      #testcases continuecommand continueflag

      #if continueflag

        $ cat >> $HGRCPATH <<EOF

        > [alias]

        > continue = rebase --continue

        > EOF

      #endif

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        $ . "$TESTDIR/narrow-library.sh"

      create full repo

        $ hg init master

        $ cd master

        $ mkdir inside

        $ echo inside1 > inside/f1

        $ echo inside2 > inside/f2

        $ mkdir outside

        $ echo outside1 > outside/f1

        $ echo outside2 > outside/f2

        $ hg ci -Aqm 'initial'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside/f1'

        $ hg update -q 0

        $ echo modified2 > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg update -q 0

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside/f1'

        $ hg update -q 0

        $ echo modified2 > outside/f1

        $ hg ci -qm 'conflicting outside/f1'

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master narrow --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 5 changesets with 4 changes to 2 files (+3 heads)

        new changesets *:* (glob)

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd narrow

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > EOF

        $ hg update -q 0

      Can rebase onto commit where no files outside narrow spec are involved

        $ hg update -q 0

        $ echo modified > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg rebase -d 'desc("modify inside/f1")'

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

              r46356
            
        rebasing 5:c2f36d04e05d tip "modify inside/f2"

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Can rebase onto conflicting changes inside narrow spec

        $ hg update -q 0

        $ echo conflicting > inside/f1

        $ hg ci -qm 'conflicting inside/f1'

        $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'

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

              r46356
            
        rebasing 6:cdce97fbf653 tip "conflicting inside/f1"

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        merging inside/f1

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

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

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        $ echo modified3 > inside/f1

        $ hg resolve -m 2>&1 | grep -v continue:

        (no more unresolved files)

        Taapas Agrawal
    
continue: added support for rebase...

              r42832
            
        $ hg continue

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

              r46356
            
        rebasing 6:cdce97fbf653 tip "conflicting inside/f1"

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Can rebase onto non-conflicting changes outside narrow spec

        $ hg update -q 0

        $ echo modified > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg rebase -d 'desc("modify outside/f1")'

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

              r46356
            
        rebasing 7:c2f36d04e05d tip "modify inside/f2"

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Rebase interrupts on conflicting changes outside narrow spec

        $ hg update -q 'desc("conflicting outside/f1")'

        $ hg phase -f -d .

        $ hg rebase -d 'desc("modify outside/f1")'

        rebasing 4:707c035aadb6 "conflicting outside/f1"

        abort: conflict in file 'outside/f1' is outside narrow clone

        [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

Taapas Agrawal continue: added support for rebase...	r42832	#testcases continuecommand continueflag
		#if continueflag
		$ cat >> $HGRCPATH <<EOF
		> [alias]
		> continue = rebase --continue
		> EOF
		#endif
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096
		$ . "$TESTDIR/narrow-library.sh"

		create full repo

		$ hg init master
		$ cd master

		$ mkdir inside
		$ echo inside1 > inside/f1
		$ echo inside2 > inside/f2
		$ mkdir outside
		$ echo outside1 > outside/f1
		$ echo outside2 > outside/f2
		$ hg ci -Aqm 'initial'

		$ echo modified > inside/f1
		$ hg ci -qm 'modify inside/f1'

		$ hg update -q 0
		$ echo modified2 > inside/f2
		$ hg ci -qm 'modify inside/f2'

		$ hg update -q 0
		$ echo modified > outside/f1
		$ hg ci -qm 'modify outside/f1'

		$ hg update -q 0
		$ echo modified2 > outside/f1
		$ hg ci -qm 'conflicting outside/f1'

		$ cd ..

		$ hg clone --narrow ssh://user@dummy/master narrow --include inside
		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 5 changesets with 4 changes to 2 files (+3 heads)
		new changesets : (glob)
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd narrow
		$ cat >> $HGRCPATH <<EOF
		> [extensions]
		> rebase=
		> EOF

		$ hg update -q 0

		Can rebase onto commit where no files outside narrow spec are involved

		$ hg update -q 0
		$ echo modified > inside/f2
		$ hg ci -qm 'modify inside/f2'
		$ hg rebase -d 'desc("modify inside/f1")'
Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary...	r46356	rebasing 5:c2f36d04e05d tip "modify inside/f2"
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

		Can rebase onto conflicting changes inside narrow spec

		$ hg update -q 0
		$ echo conflicting > inside/f1
		$ hg ci -qm 'conflicting inside/f1'
		$ hg rebase -d 'desc("modify inside/f1")' 2>&1 \| egrep -v '(warning:\|incomplete!)'
Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary...	r46356	rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	merging inside/f1
Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'...	r45710	unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	$ echo modified3 > inside/f1
		$ hg resolve -m 2>&1 \| grep -v continue:
		(no more unresolved files)
Taapas Agrawal continue: added support for rebase...	r42832	$ hg continue
Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary...	r46356	rebasing 6:cdce97fbf653 tip "conflicting inside/f1"
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

		Can rebase onto non-conflicting changes outside narrow spec

		$ hg update -q 0
		$ echo modified > inside/f2
		$ hg ci -qm 'modify inside/f2'
		$ hg rebase -d 'desc("modify outside/f1")'
Martin von Zweigbergk rebase: change and standarize template for rebase's one-line summary...	r46356	rebasing 7:c2f36d04e05d tip "modify inside/f2"
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

		Rebase interrupts on conflicting changes outside narrow spec

		$ hg update -q 'desc("conflicting outside/f1")'
		$ hg phase -f -d .
		$ hg rebase -d 'desc("modify outside/f1")'
		rebasing 4:707c035aadb6 "conflicting outside/f1"
		abort: conflict in file 'outside/f1' is outside narrow clone
		[255]