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

strip: move bookmarks to nearest ancestor rather than '.'...

strip: move bookmarks to nearest ancestor rather than '.' If you've got this graph: 0-1-2 \ 3 and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug. This change makes bookmarks move to the tipmost ancestor of the stripped set rather than the currently-checked-out revision, which is what I always expected should happen.

Mads Kiilerich - - Load All Authors

File last commit:

r17087:a79776f4 default


                r17264:ec7b9bec

stable

Download file

             test-histedit-outgoing.t
        
                    91 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-outgoing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > histedit=

        > EOF

        $ EDITED="$TESTTMP/editedhistory"

        $ cat > $EDITED <<EOF

        > pick 177f92b77385 c

        > pick e860deea161a e

        > pick 652413bf663e f

        > pick 055a42cdd887 d

        > EOF

        $ initrepos ()

        > {

        >     hg init r

        >     cd r

        >     for x in a b c ; do

        >         echo $x > $x

        >         hg add $x

        >         hg ci -m $x

        >     done

        >     cd ..

        >     hg clone r r2 | grep -v updating

        >     cd r2

        >     for x in d e f ; do

        >         echo $x > $x

        >         hg add $x

        >         hg ci -m $x

        >     done

        >     cd ..

        >     hg init r3

        >     cd r3

        >     for x in g h i ; do

        >         echo $x > $x

        >         hg add $x

        >         hg ci -m $x

        >     done

        >     cd ..

        > }

        $ initrepos

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

      show the edit commands offered by outgoing

        $ cd r2

        $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching

        pick 055a42cdd887 3 d

        pick e860deea161a 4 e

        pick 652413bf663e 5 f

        # Edit history between 055a42cdd887 and 652413bf663e

        #

        # Commands:

        #  p, pick = use commit

        #  e, edit = use commit, but stop for amending

        #  f, fold = use commit, but fold into previous commit (combines N and N-1)

        #  d, drop = remove commit from history

        #  m, mess = edit message without changing commit content

        #

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

        $ cd ..

      show the error from unrelated repos

        $ cd r3

        $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching

        abort: repository is unrelated

        [1]

        $ cd ..

      show the error from unrelated repos

        $ cd r3

        $ HGEDITOR=cat hg histedit --force --outgoing ../r

        comparing with ../r

        searching for changes

        warning: repository is unrelated

        pick 2a4042b45417 0 g

        pick 68c46b4927ce 1 h

        pick 51281e65ba79 2 i

        # Edit history between 2a4042b45417 and 51281e65ba79

        #

        # Commands:

        #  p, pick = use commit

        #  e, edit = use commit, but stop for amending

        #  f, fold = use commit, but fold into previous commit (combines N and N-1)

        #  d, drop = remove commit from history

        #  m, mess = edit message without changing commit content

        #

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

        $ cd ..

	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]
				> graphlog=
				> histedit=
				> EOF

				$ EDITED="$TESTTMP/editedhistory"
				$ cat > $EDITED <<EOF
				> pick 177f92b77385 c
				> pick e860deea161a e
				> pick 652413bf663e f
				> pick 055a42cdd887 d
				> EOF
				$ initrepos ()
				> {
				> hg init r
				> cd r
				> for x in a b c ; do
				> echo $x > $x
				> hg add $x
				> hg ci -m $x
				> done
				> cd ..
				> hg clone r r2 \| grep -v updating
				> cd r2
				> for x in d e f ; do
				> echo $x > $x
				> hg add $x
				> hg ci -m $x
				> done
				> cd ..
				> hg init r3
				> cd r3
				> for x in g h i ; do
				> echo $x > $x
				> hg add $x
				> hg ci -m $x
				> done
				> cd ..
				> }

				$ initrepos
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				show the edit commands offered by outgoing
				$ cd r2
				$ HGEDITOR=cat hg histedit --outgoing ../r \| grep -v comparing \| grep -v searching
				pick 055a42cdd887 3 d
				pick e860deea161a 4 e
				pick 652413bf663e 5 f

				# Edit history between 055a42cdd887 and 652413bf663e
				#
				# Commands:
				# p, pick = use commit
				# e, edit = use commit, but stop for amending
				# f, fold = use commit, but fold into previous commit (combines N and N-1)
				# d, drop = remove commit from history
				# m, mess = edit message without changing commit content
				#
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ..

				show the error from unrelated repos
				$ cd r3
				$ HGEDITOR=cat hg histedit --outgoing ../r \| grep -v comparing \| grep -v searching
				abort: repository is unrelated
				[1]
				$ cd ..

				show the error from unrelated repos
				$ cd r3
				$ HGEDITOR=cat hg histedit --force --outgoing ../r
				comparing with ../r
				searching for changes
				warning: repository is unrelated
				pick 2a4042b45417 0 g
				pick 68c46b4927ce 1 h
				pick 51281e65ba79 2 i

				# Edit history between 2a4042b45417 and 51281e65ba79
				#
				# Commands:
				# p, pick = use commit
				# e, edit = use commit, but stop for amending
				# f, fold = use commit, but fold into previous commit (combines N and N-1)
				# d, drop = remove commit from history
				# m, mess = edit message without changing commit content
				#
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ..