upstream/mercurial-mirror Files · tests/test-debugindexdot.t

share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...

share: wrap bmstore._writerepo for transaction sensitivity (issue4940) made 'bmstore.write()' transaction sensitive, to restore original bookmarks correctly at failure of a transaction. For example, shelve and unshelve imply steps below: before 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' writes updated ones into .hg/bookmarks 3. rollback transaction to remove internal commits 4. restore updated bookmarks manually after 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' doesn't write updated ones into .hg/bookmarks (these are written into .hg/bookmarks.pending, if external hook is spawn) 3. rollback transaction to remove internal commits 4. .hg/bookmarks should be clean, because it isn't changed while transaction running: see (2) above But if shelve or unshelve is executed in the repository created with "shared bookmarks" ("hg share -B"), this doesn't work as expected, because: - share extension makes 'bmstore.write()' write updated bookmarks into .hg/bookmarks of shared source repository regardless of transaction activity, and - intentional transaction failure at the end of shelve/unshelve doesn't restore already updated .hg/bookmarks of shared source This patch makes share extension wrap 'bmstore._writerepo()' instead of 'bmstore.write()', because the former is used to actually write bookmark changes out.

timeless@mozdev.org - - Load All Authors

File last commit:

r17490:a03c3ba3 default


                r26933:a7eecd02

stable

Download file

             test-debugindexdot.t
        
                    25 lines
            
             | 435 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-debugindexdot.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Just exercise debugindexdot

      Create a short file history including a merge.

        $ hg init t

        $ cd t

        $ echo a > a

        $ hg ci -qAm t1 -d '0 0'

        $ echo a >> a

        $ hg ci -m t2 -d '1 0'

        $ hg up -qC 0

        $ echo b >> a

        $ hg ci -m t3 -d '2 0'

        created new head

        $ HGMERGE=true hg merge -q

        $ hg ci -m merge -d '3 0'

        $ hg debugindexdot .hg/store/data/a.i

        digraph G {

        	-1 -> 0

        	0 -> 1

        	0 -> 2

        	2 -> 3

        	1 -> 3

        }

        $ 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

				Just exercise debugindexdot
				Create a short file history including a merge.
				$ hg init t
				$ cd t
				$ echo a > a
				$ hg ci -qAm t1 -d '0 0'
				$ echo a >> a
				$ hg ci -m t2 -d '1 0'
				$ hg up -qC 0
				$ echo b >> a
				$ hg ci -m t3 -d '2 0'
				created new head
				$ HGMERGE=true hg merge -q
				$ hg ci -m merge -d '3 0'

				$ hg debugindexdot .hg/store/data/a.i
				digraph G {
				-1 -> 0
				0 -> 1
				0 -> 2
				2 -> 3
				1 -> 3
				}

				$ cd ..