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

discovery: add extinct changesets to outgoing.excluded...

discovery: add extinct changesets to outgoing.excluded Before this change, push would incorrectly fast-path the bundle generation when extinct changesets are involved, because they are not added to outgoing.excluded. The reason to do so are related to outgoing.excluded being assumed to contain only secret changesets by scmutil.nochangesfound(), when displaying warnings like: changes found (ignored 9 secret changesets) Still, outgoing.excluded seems like a good API to report the extinct changesets instead of dedicated code and nothing in the docstring indicates it to be bound to secret changesets. This patch adds extinct changesets to outgoing.excluded and fixes scmutil.nochangesfound() to filter the excluded node list. Original version and test by Pierre-Yves.David@ens-lyon.org

Augie Fackler - - Load All Authors

File last commit:

r17065:949e241b default


                r17248:6ffb35b2

stable

Download file

             test-histedit-revspec.t
        
                    62 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-revspec.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      This test requires parentrevspec support in revsets, so check for that

      and skip the test if we're on an unusual hg that supports .t tests but

      not parentrevspec.

        $ python -c 'from mercurial import revset ; revset.methods["parentpost"]' || exit 80

      Enable extensions used by this test.

        $ cat >>$HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > histedit=

        > EOF

      Repo setup.

        $ hg init foo

        $ cd foo

        $ echo alpha >> alpha

        $ hg addr

        adding alpha

        $ hg ci -m one

        $ echo alpha >> alpha

        $ hg ci -m two

        $ echo alpha >> alpha

        $ hg ci -m three

        $ echo alpha >> alpha

        $ hg ci -m four

        $ echo alpha >> alpha

        $ hg ci -m five

        $ hg log --style compact --graph

        @  4[tip]   08d98a8350f3   1970-01-01 00:00 +0000   test

        |    five

        |

        o  3   c8e68270e35a   1970-01-01 00:00 +0000   test

        |    four

        |

        o  2   eb57da33312f   1970-01-01 00:00 +0000   test

        |    three

        |

        o  1   579e40513370   1970-01-01 00:00 +0000   test

        |    two

        |

        o  0   6058cbb6cfd7   1970-01-01 00:00 +0000   test

             one

      Run a dummy edit to make sure we get tip^^ correctly via revsingle.

        $ HGEDITOR=cat hg histedit "tip^^"

        pick eb57da33312f 2 three

        pick c8e68270e35a 3 four

        pick 08d98a8350f3 4 five

        # Edit history between eb57da33312f and 08d98a8350f3

        #

        # 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

	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

				This test requires parentrevspec support in revsets, so check for that
				and skip the test if we're on an unusual hg that supports .t tests but
				not parentrevspec.
				$ python -c 'from mercurial import revset ; revset.methods["parentpost"]' \|\| exit 80

				Enable extensions used by this test.
				$ cat >>$HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> histedit=
				> EOF

				Repo setup.
				$ hg init foo
				$ cd foo
				$ echo alpha >> alpha
				$ hg addr
				adding alpha
				$ hg ci -m one
				$ echo alpha >> alpha
				$ hg ci -m two
				$ echo alpha >> alpha
				$ hg ci -m three
				$ echo alpha >> alpha
				$ hg ci -m four
				$ echo alpha >> alpha
				$ hg ci -m five

				$ hg log --style compact --graph
				@ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
				\| five
				\|
				o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
				\| four
				\|
				o 2 eb57da33312f 1970-01-01 00:00 +0000 test
				\| three
				\|
				o 1 579e40513370 1970-01-01 00:00 +0000 test
				\| two
				\|
				o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
				one


				Run a dummy edit to make sure we get tip^^ correctly via revsingle.
				$ HGEDITOR=cat hg histedit "tip^^"
				pick eb57da33312f 2 three
				pick c8e68270e35a 3 four
				pick 08d98a8350f3 4 five

				# Edit history between eb57da33312f and 08d98a8350f3
				#
				# 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