upstream/mercurial-mirror Files · tests/test-push-hook-lock.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.

Pierre-Yves David - - Load All Authors

File last commit:

r25126:00e4c560 default


                r26933:a7eecd02

stable

Download file

             test-push-hook-lock.t
        
                    50 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-hook-lock.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init 1

        $ echo '[ui]' >> 1/.hg/hgrc

        $ echo 'timeout = 10' >> 1/.hg/hgrc

        $ echo foo > 1/foo

        $ hg --cwd 1 ci -A -m foo

        adding foo

        $ hg clone 1 2

        updating to branch default

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

        $ hg clone 2 3

        updating to branch default

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

        $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh

        > hg debuglocks

        > true

        > EOF

        $ echo '[hooks]' >> 2/.hg/hgrc

        $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc

        $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

        $ echo bar >> 3/foo

        $ hg --cwd 3 ci -m bar

        $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False

        pushing to ../2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        lock:  user *, process * (*s) (glob)

        wlock: free

        $ hg --cwd 1 --config extensions.strip= strip tip -q

        $ hg --cwd 2 --config extensions.strip= strip tip -q

        $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True

        pushing to ../2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        lock:  user *, process * (*s) (glob)

        wlock: user *, process * (*s) (glob)

	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

				$ hg init 1

				$ echo '[ui]' >> 1/.hg/hgrc
				$ echo 'timeout = 10' >> 1/.hg/hgrc

				$ echo foo > 1/foo
				$ hg --cwd 1 ci -A -m foo
				adding foo

				$ hg clone 1 2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg clone 2 3
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
				> hg debuglocks
				> true
				> EOF
				$ echo '[hooks]' >> 2/.hg/hgrc
				$ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
				$ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

				$ echo bar >> 3/foo
				$ hg --cwd 3 ci -m bar

				$ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False
				pushing to ../2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				lock: user , process (*s) (glob)
				wlock: free

				$ hg --cwd 1 --config extensions.strip= strip tip -q
				$ hg --cwd 2 --config extensions.strip= strip tip -q
				$ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True
				pushing to ../2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				lock: user , process (*s) (glob)
				wlock: user , process (*s) (glob)