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

subrepo: backout to restore reporelpath()...

subrepo: backout to restore reporelpath() The path for hgsubrepo needs to be calculated slightly differently from other subrepo types, but can reuse this. See the next patch for details.

Mateusz Kwapich - - Load All Authors

File last commit:

r24002:96d13069 default


                r24785:39f519be

default

Download file

             test-histedit-drop.t
        
                    154 lines
            
             | 3.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-histedit-drop.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        $ . "$TESTDIR/histedit-helpers.sh"

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > histedit=

        > EOF

        $ initrepo ()

        > {

        >     hg init r

        >     cd r

        >     for x in a b c d e f ; do

        >         echo $x > $x

        >         hg add $x

        >         hg ci -m $x

        >     done

        > }

        $ initrepo

      log before edit

        $ hg log --graph

        @  changeset:   5:652413bf663e

        |  tag:         tip

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     f

        |

        o  changeset:   4:e860deea161a

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     e

        |

        o  changeset:   3:055a42cdd887

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     d

        |

        o  changeset:   2:177f92b77385

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     c

        |

        o  changeset:   1:d2ae7f538514

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     b

        |

        o  changeset:   0:cb9a9f314b8b

           user:        test

           date:        Thu Jan 01 00:00:00 1970 +0000

           summary:     a

      edit the history

        Pierre-Yves David
    
histedit-test: generalise --commands "-" usage...

              r19019
            
        $ hg histedit 177f92b77385 --commands - 2>&1 << EOF | fixbundle

        > drop 177f92b77385 c

        > pick e860deea161a e

        > pick 652413bf663e f

        > pick 055a42cdd887 d

        > EOF

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        0 files updated, 0 files merged, 4 files removed, 0 files unresolved

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

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

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

      log after edit

        $ hg log --graph

        Pierre-Yves David
    
histedit: record histedit source (issue3681)...

              r18437
            
        @  changeset:   4:f518305ce889

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        |  tag:         tip

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     d

        |

        Pierre-Yves David
    
histedit: record histedit source (issue3681)...

              r18437
            
        o  changeset:   3:a4f7421b80f7

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     f

        |

        Pierre-Yves David
    
histedit: record histedit source (issue3681)...

              r18437
            
        o  changeset:   2:ee283cb5f2d5

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     e

        |

        o  changeset:   1:d2ae7f538514

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     b

        |

        o  changeset:   0:cb9a9f314b8b

           user:        test

           date:        Thu Jan 01 00:00:00 1970 +0000

           summary:     a

        Pierre-Yves David
    
histedit: record histedit source (issue3681)...

              r18437
            
      Check histedit_source

        $ hg log --debug --rev f518305ce889

        changeset:   4:f518305ce889c07cb5bd05522176d75590ef3324

        tag:         tip

        phase:       draft

        parent:      3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3

        parent:      -1:0000000000000000000000000000000000000000

        manifest:    4:d3d4f51c157ff242c32ff745d4799aaa26ccda44

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        files+:      d

        extra:       branch=default

        extra:       histedit_source=055a42cdd88768532f9cf79daa407fc8d138de9b

        description:

        d

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
      manifest after edit

        $ hg manifest

        a

        b

        d

        e

        f

        Pierre-Yves David
    
test-histedit: add tests for dropping head changeset...

              r18509
            
      Drop the last changeset

        Pierre-Yves David
    
histedit-test: generalise --commands "-" usage...

              r19019
            
        $ hg histedit ee283cb5f2d5 --commands - 2>&1 << EOF | fixbundle

        Pierre-Yves David
    
test-histedit: add tests for dropping head changeset...

              r18509
            
        > pick ee283cb5f2d5 e

        > pick a4f7421b80f7 f

        > drop f518305ce889 d

        > EOF

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

        $ hg log --graph

        @  changeset:   3:a4f7421b80f7

        |  tag:         tip

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     f

        |

        o  changeset:   2:ee283cb5f2d5

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     e

        |

        o  changeset:   1:d2ae7f538514

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  summary:     b

        |

        o  changeset:   0:cb9a9f314b8b

           user:        test

           date:        Thu Jan 01 00:00:00 1970 +0000

           summary:     a

        Mads Kiilerich
    
tests: convert histedit tests to .t...

              r17085
            
        $ 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

Mads Kiilerich tests: convert histedit tests to .t...	r17085	$ . "$TESTDIR/histedit-helpers.sh"

		$ cat >> $HGRCPATH <<EOF
		> [extensions]
		> histedit=
		> EOF

		$ initrepo ()
		> {
		> hg init r
		> cd r
		> for x in a b c d e f ; do
		> echo $x > $x
		> hg add $x
		> hg ci -m $x
		> done
		> }

		$ initrepo

		log before edit
		$ hg log --graph
		@ changeset: 5:652413bf663e
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: f
		\|
		o changeset: 4:e860deea161a
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 3:055a42cdd887
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
		o changeset: 2:177f92b77385
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: c
		\|
		o changeset: 1:d2ae7f538514
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


		edit the history
Pierre-Yves David histedit-test: generalise --commands "-" usage...	r19019	$ hg histedit 177f92b77385 --commands - 2>&1 << EOF \| fixbundle
		> drop 177f92b77385 c
		> pick e860deea161a e
		> pick 652413bf663e f
		> pick 055a42cdd887 d
		> EOF
Mads Kiilerich tests: convert histedit tests to .t...	r17085	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved

		log after edit
		$ hg log --graph
Pierre-Yves David histedit: record histedit source (issue3681)...	r18437	@ changeset: 4:f518305ce889
Mads Kiilerich tests: convert histedit tests to .t...	r17085	\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: d
		\|
Pierre-Yves David histedit: record histedit source (issue3681)...	r18437	o changeset: 3:a4f7421b80f7
Mads Kiilerich tests: convert histedit tests to .t...	r17085	\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: f
		\|
Pierre-Yves David histedit: record histedit source (issue3681)...	r18437	o changeset: 2:ee283cb5f2d5
Mads Kiilerich tests: convert histedit tests to .t...	r17085	\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 1:d2ae7f538514
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


Pierre-Yves David histedit: record histedit source (issue3681)...	r18437	Check histedit_source

		$ hg log --debug --rev f518305ce889
		changeset: 4:f518305ce889c07cb5bd05522176d75590ef3324
		tag: tip
		phase: draft
		parent: 3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3
		parent: -1:0000000000000000000000000000000000000000
		manifest: 4:d3d4f51c157ff242c32ff745d4799aaa26ccda44
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		files+: d
		extra: branch=default
		extra: histedit_source=055a42cdd88768532f9cf79daa407fc8d138de9b
		description:
		d



Mads Kiilerich tests: convert histedit tests to .t...	r17085	manifest after edit
		$ hg manifest
		a
		b
		d
		e
		f

Pierre-Yves David test-histedit: add tests for dropping head changeset...	r18509	Drop the last changeset

Pierre-Yves David histedit-test: generalise --commands "-" usage...	r19019	$ hg histedit ee283cb5f2d5 --commands - 2>&1 << EOF \| fixbundle
Pierre-Yves David test-histedit: add tests for dropping head changeset...	r18509	> pick ee283cb5f2d5 e
		> pick a4f7421b80f7 f
		> drop f518305ce889 d
		> EOF
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg log --graph
		@ changeset: 3:a4f7421b80f7
		\| tag: tip
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: f
		\|
		o changeset: 2:ee283cb5f2d5
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: e
		\|
		o changeset: 1:d2ae7f538514
		\| user: test
		\| date: Thu Jan 01 00:00:00 1970 +0000
		\| summary: b
		\|
		o changeset: 0:cb9a9f314b8b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: a


Mads Kiilerich tests: convert histedit tests to .t...	r17085	$ cd ..