upstream/mercurial-mirror Files · tests/test-lock-badness.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Siddharth Agarwal - - Load All Authors

File last commit:

r23032:f484be02 default


                r23524:a1a7c94d

default

Download file

             test-lock-badness.t
        
                    77 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-lock-badness.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require unix-permissions no-root no-windows

      Prepare

        $ hg init a

        $ echo a > a/a

        $ hg -R a ci -A -m a

        adding a

        $ hg clone a b

        updating to branch default

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

      Test that raising an exception in the release function doesn't cause the lock to choke

        $ cat > testlock.py << EOF

        > from mercurial import cmdutil, error, util

        > 

        > cmdtable = {}

        > command = cmdutil.command(cmdtable)

        > 

        > def acquiretestlock(repo, releaseexc):

        >     def unlock():

        >         if releaseexc:

        >             raise util.Abort('expected release exception')

        >     l = repo._lock(repo.vfs, 'testlock', False, unlock, None, 'test lock')

        >     return l

        > 

        > @command('testlockexc')

        > def testlockexc(ui, repo):

        >     testlock = acquiretestlock(repo, True)

        >     try:

        >         testlock.release()

        >     finally:

        >         try:

        >             testlock = acquiretestlock(repo, False)

        >         except error.LockHeld:

        >             raise util.Abort('lockfile on disk even after releasing!')

        >         testlock.release()

        > EOF

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > testlock=$TESTTMP/testlock.py

        > EOF

        $ hg -R b testlockexc

        abort: expected release exception

        [255]

      One process waiting for another

        $ cat > hooks.py << EOF

        > import time

        > def sleepone(**x): time.sleep(1)

        > def sleephalf(**x): time.sleep(0.5)

        > EOF

        $ echo b > b/b

        $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &

        $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"

        waiting for lock on working directory of b held by '*:*' (glob)

        got lock after ? seconds (glob)

        warning: ignoring unknown working parent d2ae7f538514!

        $ wait

        $ cat stdout

        adding b

      Pushing to a local read-only repo that can't be locked

        $ chmod 100 a/.hg/store

        $ hg -R b push a

        pushing to a

        searching for changes

        abort: could not lock repository a: Permission denied

        [255]

        $ chmod 700 a/.hg/store

	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

				#require unix-permissions no-root no-windows

				Prepare

				$ hg init a
				$ echo a > a/a
				$ hg -R a ci -A -m a
				adding a

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

				Test that raising an exception in the release function doesn't cause the lock to choke

				$ cat > testlock.py << EOF
				> from mercurial import cmdutil, error, util
				>
				> cmdtable = {}
				> command = cmdutil.command(cmdtable)
				>
				> def acquiretestlock(repo, releaseexc):
				> def unlock():
				> if releaseexc:
				> raise util.Abort('expected release exception')
				> l = repo._lock(repo.vfs, 'testlock', False, unlock, None, 'test lock')
				> return l
				>
				> @command('testlockexc')
				> def testlockexc(ui, repo):
				> testlock = acquiretestlock(repo, True)
				> try:
				> testlock.release()
				> finally:
				> try:
				> testlock = acquiretestlock(repo, False)
				> except error.LockHeld:
				> raise util.Abort('lockfile on disk even after releasing!')
				> testlock.release()
				> EOF
				$ cat >> $HGRCPATH << EOF
				> [extensions]
				> testlock=$TESTTMP/testlock.py
				> EOF

				$ hg -R b testlockexc
				abort: expected release exception
				[255]

				One process waiting for another

				$ cat > hooks.py << EOF
				> import time
				> def sleepone(**x): time.sleep(1)
				> def sleephalf(**x): time.sleep(0.5)
				> EOF
				$ echo b > b/b
				$ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
				$ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf"
				waiting for lock on working directory of b held by ':' (glob)
				got lock after ? seconds (glob)
				warning: ignoring unknown working parent d2ae7f538514!
				$ wait
				$ cat stdout
				adding b

				Pushing to a local read-only repo that can't be locked

				$ chmod 100 a/.hg/store

				$ hg -R b push a
				pushing to a
				searching for changes
				abort: could not lock repository a: Permission denied
				[255]

				$ chmod 700 a/.hg/store