upstream/mercurial-mirror Files · tests/test-mq-missingfiles.t

hg: acquire wlock while updating the working directory via updatetotally...

hg: acquire wlock while updating the working directory via updatetotally updatetotally() might be invoked outside wlock scope (e.g. invocation via postincoming() at "hg unbundle" or "hg pull"). In such case, acquisition of wlock is needed for consistent view, because parallel "hg update" and/or "hg bookmarks" might change working directory status while executing updatetotally(). Strictly speaking, truly consistent updating should acquire also store lock, because active bookmark might be moved to another one outside wlock scope (e.g. pulling from other repository causes updating current active one). Acquisition of wlock in this patch ensures consistency in as same level as past "hg update".

timeless@mozdev.org - - Load All Authors

File last commit:

r26780:bbf544b5 default


                r28503:138ec883

default

Download file

             test-mq-missingfiles.t
        
                    195 lines
            
             | 3.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-missingfiles.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        Martin Geisler
    
tests: added a short description to issue numbers...

              r12399
            
      Issue835: qpush fails immediately when patching a missing file, but

      remaining added files are still created empty which will trick a

      future qrefresh.

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ cat > writelines.py <<EOF

        > import sys

        > path = sys.argv[1]

        > args = sys.argv[2:]

        > assert (len(args) % 2) == 0

        > 

        > f = file(path, 'wb')

        > for i in xrange(len(args)/2):

        >    count, s = args[2*i:2*i+2]

        >    count = int(count)

        >    s = s.decode('string_escape')

        >    f.write(s*count)

        > f.close()

        > EOF

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init normal

        $ cd normal

        $ python ../writelines.py b 10 'a\n'

        $ hg ci -Am addb

        adding b

        $ echo a > a

        $ python ../writelines.py b 2 'b\n' 10 'a\n' 2 'c\n'

        $ echo c > c

        $ hg add a c

        $ hg qnew -f changeb

        $ hg qpop

        popping changeb

        patch queue now empty

        $ hg rm b

        $ hg ci -Am rmb

      Push patch with missing target:

        $ hg qpush

        applying changeb

        unable to find 'b' for patching

        2 out of 2 hunks FAILED -- saving rejects to file b.rej

        patch failed, unable to continue (try -v)

        Yuya Nishihara
    
commands: say "working directory" in full spelling

              r24365
            
        patch failed, rejects left in working directory

        timeless@mozdev.org
    
mq: consistently use qrefresh

              r26780
            
        errors during apply, please fix and qrefresh changeb

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        [2]

      Display added files:

        $ cat a

        a

        $ cat c

        c

      Display rejections:

        $ cat b.rej

        --- b

        +++ b

        @@ -1,3 +1,5 @@

        +b

        +b

         a

         a

         a

        @@ -8,3 +10,5 @@

         a

         a

         a

        +c

        +c

        Patrick Mezard
    
patch: keep patching after missing copy source (issue3480)...

              r16813
            
      Test missing renamed file

        $ hg qpop

        popping changeb

        patch queue now empty

        $ hg up -qC 0

        $ echo a > a

        $ hg mv b bb

        $ python ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n'

        $ echo c > c

        $ hg add a c

        $ hg qnew changebb

        $ hg qpop

        popping changebb

        patch queue now empty

        $ hg up -qC 1

        $ hg qpush

        applying changebb

        patching file bb

        Hunk #1 FAILED at 0

        Hunk #2 FAILED at 7

        2 out of 2 hunks FAILED -- saving rejects to file bb.rej

        b not tracked!

        patch failed, unable to continue (try -v)

        Yuya Nishihara
    
commands: say "working directory" in full spelling

              r24365
            
        patch failed, rejects left in working directory

        timeless@mozdev.org
    
mq: consistently use qrefresh

              r26780
            
        errors during apply, please fix and qrefresh changebb

        Patrick Mezard
    
patch: keep patching after missing copy source (issue3480)...

              r16813
            
        [2]

        $ cat a

        a

        $ cat c

        c

        $ cat bb.rej

        --- bb

        +++ bb

        @@ -1,3 +1,5 @@

        +b

        +b

         a

         a

         a

        @@ -8,3 +10,5 @@

         a

         a

         a

        +c

        +c

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        $ cd ..

        $ echo "[diff]" >> $HGRCPATH

        $ echo "git=1" >> $HGRCPATH

        $ hg init git

        $ cd git

        $ python ../writelines.py b 1 '\x00'

        $ hg ci -Am addb

        adding b

        $ echo a > a

        $ python ../writelines.py b 1 '\x01' 1 '\x00'

        $ echo c > c

        $ hg add a c

        $ hg qnew -f changeb

        $ hg qpop

        popping changeb

        patch queue now empty

        $ hg rm b

        $ hg ci -Am rmb

      Push git patch with missing target:

        $ hg qpush

        applying changeb

        unable to find 'b' for patching

        1 out of 1 hunks FAILED -- saving rejects to file b.rej

        patch failed, unable to continue (try -v)

        Yuya Nishihara
    
commands: say "working directory" in full spelling

              r24365
            
        patch failed, rejects left in working directory

        timeless@mozdev.org
    
mq: consistently use qrefresh

              r26780
            
        errors during apply, please fix and qrefresh changeb

        Adrian Buehlmann
    
tests: unify some of test-mq*

              r12324
            
        [2]

        $ hg st

        ? b.rej

      Display added files:

        $ cat a

        a

        $ cat c

        c

      Display rejections:

        $ cat b.rej

        --- b

        +++ b

        GIT binary patch

        literal 2

        Jc${No0000400IC2

        $ cd ..

      Test push creating directory during git copy or rename:

        $ hg init missingdir

        $ cd missingdir

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ mkdir d

        $ hg copy a d/a2

        $ hg mv a d/a

        $ hg qnew -g -f patch

        $ hg qpop

        popping patch

        patch queue now empty

        $ hg qpush

        applying patch

        now at: patch

        $ 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

Adrian Buehlmann tests: unify some of test-mq*	r12324
Martin Geisler tests: added a short description to issue numbers...	r12399	Issue835: qpush fails immediately when patching a missing file, but
		remaining added files are still created empty which will trick a
		future qrefresh.
Adrian Buehlmann tests: unify some of test-mq*	r12324
		$ cat > writelines.py <<EOF
		> import sys
		> path = sys.argv[1]
		> args = sys.argv[2:]
		> assert (len(args) % 2) == 0
		>
		> f = file(path, 'wb')
		> for i in xrange(len(args)/2):
		> count, s = args[2i:2i+2]
		> count = int(count)
		> s = s.decode('string_escape')
		> f.write(s*count)
		> f.close()
		> EOF

		$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH

		$ hg init normal
		$ cd normal
		$ python ../writelines.py b 10 'a\n'
		$ hg ci -Am addb
		adding b
		$ echo a > a
		$ python ../writelines.py b 2 'b\n' 10 'a\n' 2 'c\n'
		$ echo c > c
		$ hg add a c
		$ hg qnew -f changeb
		$ hg qpop
		popping changeb
		patch queue now empty
		$ hg rm b
		$ hg ci -Am rmb

		Push patch with missing target:

		$ hg qpush
		applying changeb
		unable to find 'b' for patching
		2 out of 2 hunks FAILED -- saving rejects to file b.rej
		patch failed, unable to continue (try -v)
Yuya Nishihara commands: say "working directory" in full spelling	r24365	patch failed, rejects left in working directory
timeless@mozdev.org mq: consistently use qrefresh	r26780	errors during apply, please fix and qrefresh changeb
Adrian Buehlmann tests: unify some of test-mq*	r12324	[2]

		Display added files:

		$ cat a
		a
		$ cat c
		c

		Display rejections:

		$ cat b.rej
		--- b
		+++ b
		@@ -1,3 +1,5 @@
		+b
		+b
		a
		a
		a
		@@ -8,3 +10,5 @@
		a
		a
		a
		+c
		+c

Patrick Mezard patch: keep patching after missing copy source (issue3480)...	r16813	Test missing renamed file

		$ hg qpop
		popping changeb
		patch queue now empty
		$ hg up -qC 0
		$ echo a > a
		$ hg mv b bb
		$ python ../writelines.py bb 2 'b\n' 10 'a\n' 2 'c\n'
		$ echo c > c
		$ hg add a c
		$ hg qnew changebb
		$ hg qpop
		popping changebb
		patch queue now empty
		$ hg up -qC 1
		$ hg qpush
		applying changebb
		patching file bb
		Hunk #1 FAILED at 0
		Hunk #2 FAILED at 7
		2 out of 2 hunks FAILED -- saving rejects to file bb.rej
		b not tracked!
		patch failed, unable to continue (try -v)
Yuya Nishihara commands: say "working directory" in full spelling	r24365	patch failed, rejects left in working directory
timeless@mozdev.org mq: consistently use qrefresh	r26780	errors during apply, please fix and qrefresh changebb
Patrick Mezard patch: keep patching after missing copy source (issue3480)...	r16813	[2]
		$ cat a
		a
		$ cat c
		c
		$ cat bb.rej
		--- bb
		+++ bb
		@@ -1,3 +1,5 @@
		+b
		+b
		a
		a
		a
		@@ -8,3 +10,5 @@
		a
		a
		a
		+c
		+c

Adrian Buehlmann tests: unify some of test-mq*	r12324	$ cd ..


		$ echo "[diff]" >> $HGRCPATH
		$ echo "git=1" >> $HGRCPATH

		$ hg init git
		$ cd git
		$ python ../writelines.py b 1 '\x00'
		$ hg ci -Am addb
		adding b
		$ echo a > a
		$ python ../writelines.py b 1 '\x01' 1 '\x00'
		$ echo c > c
		$ hg add a c
		$ hg qnew -f changeb
		$ hg qpop
		popping changeb
		patch queue now empty
		$ hg rm b
		$ hg ci -Am rmb

		Push git patch with missing target:

		$ hg qpush
		applying changeb
		unable to find 'b' for patching
		1 out of 1 hunks FAILED -- saving rejects to file b.rej
		patch failed, unable to continue (try -v)
Yuya Nishihara commands: say "working directory" in full spelling	r24365	patch failed, rejects left in working directory
timeless@mozdev.org mq: consistently use qrefresh	r26780	errors during apply, please fix and qrefresh changeb
Adrian Buehlmann tests: unify some of test-mq*	r12324	[2]
		$ hg st
		? b.rej

		Display added files:

		$ cat a
		a
		$ cat c
		c

		Display rejections:

		$ cat b.rej
		--- b
		+++ b
		GIT binary patch
		literal 2
		Jc${No0000400IC2

		$ cd ..

		Test push creating directory during git copy or rename:

		$ hg init missingdir
		$ cd missingdir
		$ echo a > a
		$ hg ci -Am adda
		adding a
		$ mkdir d
		$ hg copy a d/a2
		$ hg mv a d/a
		$ hg qnew -g -f patch
		$ hg qpop
		popping patch
		patch queue now empty
		$ hg qpush
		applying patch
		now at: patch

		$ cd ..