upstream/mercurial-mirror Files · tests/test-bookmarks-strip.t

transplant: restore dirstate correctly at unexpected failure...

transplant: restore dirstate correctly at unexpected failure Before this patch, transplant can't restore dirstate as expected at failure other than one while patching. This causes: - unexpected file status - dirstate refers already rollback-ed parent (only at failure of transplanting the 2nd or later revision) To restore dirstate correctly also at unexpected failure, this patch encloses scope of store lock and transaction by 'dirstateguard'. This is temporary fixing for stable branch. See DirstateTransactionPlan wiki page for detail about the future plan to treat dirstate consistently around scope boundary of transaction. https://mercurial.selenic.com/wiki/DirstateTransactionPlan This patch also adds 'if lock' examination for safety 'lock.release()', because creating 'dirstateguard' object may fail unexpectedly (e.g. IOError for saving dirstate). BTW, in the test script, putting section header '[extensions]' into '.hg/hgrc' is needed to fix incomplete disabling 'abort' extension at 4d1382fd96ff.

Pierre-Yves David - - Load All Authors

File last commit:

r25744:e78a80f8 default


                r25879:99e88320

stable

Download file

             test-bookmarks-strip.t
        
                    65 lines
            
             | 1007 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-strip.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ echo qqq>qqq.txt

        David Soria Parra
    
bookmarks: respect rollbacks dryrun parameter

              r13307
            
      rollback dry run without rollback information

        $ hg rollback

        no rollback information available

        [1]

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      add file

        $ hg add

        adding qqq.txt

      commit first revision

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 1

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      set bookmark

        $ hg book test

        $ echo www>>qqq.txt

      commit second revision

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 2

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      set bookmark

        $ hg book test2

        timeless@mozdev.org
    
spelling: deactivates

              r17497
            
      update to -2 (deactivates the active bookmark)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ hg update -r -2

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark test2)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        $ echo eee>>qqq.txt

      commit new head

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -m 3

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
        created new head

      bookmarks updated?

        $ hg book

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
           test                      1:25e1ee7a0081

           test2                     1:25e1ee7a0081

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      strip to revision 1

        Nicolas Dumazet
    
tests: use regular expressions instead of helpers

              r11907
            
        $ hg strip 1

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)

        Martin Geisler
    
tests: unify test-bookmarks-strip

              r11864
            
      list bookmarks

        $ hg book

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

              r17264
            
           test                      0:5c9ad3787638

           test2                     0:5c9ad3787638

	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

Martin Geisler tests: unify test-bookmarks-strip	r11864	$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH

		$ hg init

		$ echo qqq>qqq.txt

David Soria Parra bookmarks: respect rollbacks dryrun parameter	r13307	rollback dry run without rollback information

		$ hg rollback
		no rollback information available
		[1]

Martin Geisler tests: unify test-bookmarks-strip	r11864	add file

		$ hg add
		adding qqq.txt

		commit first revision

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 1
Martin Geisler tests: unify test-bookmarks-strip	r11864
		set bookmark

		$ hg book test

		$ echo www>>qqq.txt

		commit second revision

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 2
Martin Geisler tests: unify test-bookmarks-strip	r11864
		set bookmark

		$ hg book test2

timeless@mozdev.org spelling: deactivates	r17497	update to -2 (deactivates the active bookmark)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		$ hg update -r -2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark test2)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		$ echo eee>>qqq.txt

		commit new head

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -m 3
Martin Geisler tests: unify test-bookmarks-strip	r11864	created new head

		bookmarks updated?

		$ hg book
Martin Geisler tests: remove unneeded -d flags...	r12156	test 1:25e1ee7a0081
		test2 1:25e1ee7a0081
Martin Geisler tests: unify test-bookmarks-strip	r11864
		strip to revision 1

Nicolas Dumazet tests: use regular expressions instead of helpers	r11907	$ hg strip 1
Mads Kiilerich tests: remove redundant globs...	r12640	saved backup bundle to $TESTTMP/.hg/strip-backup/*-backup.hg (glob)
Martin Geisler tests: unify test-bookmarks-strip	r11864
		list bookmarks

		$ hg book
Augie Fackler strip: move bookmarks to nearest ancestor rather than '.'...	r17264	test 0:5c9ad3787638
		test2 0:5c9ad3787638