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

merge: move dr/rd warning messages out of applyupdates()...

merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

Matt Harbison - - Load All Authors

File last commit:

r23349:7dd18701 default


                r23525:5126d771

default

Download file

             test-push-hook-lock.t
        
                    38 lines
            
             | 926 B
            
                | 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

        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

	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
				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