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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r22285:85bded43

default

Download file

             test-lock-badness.t
        
                    41 lines
            
             | 1011 B
            
                | 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

      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

				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