upstream/mercurial-mirror Files · tests/test-mq-qimport-fail-cleanup.t

exchange: turn on option that makes concurrent pushes work better...

exchange: turn on option that makes concurrent pushes work better The motivation is simply to make hg work better out of the box. This is a slight backwards compatibility break, because client extensions could have assumed that the list of heads the client sees during discovery will be the list of heads during the entirety of the push. It seems unlikely to matter, and not worth mentioning. There's a fair amount of diff in tests, but this is just due to sending a few more bytes on the wire, except for test-acl.t. The extra "invalid branch cache" lines in test-acl.t don't seem to indicate a problem: the branchcache now get computed during the bundle application (because of the check:updated-heads bundle part), but doesn't get rolled back when transactions rollback, thus causing a message in the next operation computing the branch cache. Before this change, I assume the branchcache was only computed on transaction commit, so not computed at all when the transactions roll back, thus no messages. Differential Revision: https://phab.mercurial-scm.org/D8202

timeless - - Load All Authors

File last commit:

r29968:0342bf29 default


                r44896:edc8504b

default

Download file

             test-mq-qimport-fail-cleanup.t
        
                    42 lines
            
             | 772 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qimport-fail-cleanup.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-mq-qimport-fail-cleanup

              r12465
            
      Failed qimport of patches from files should cleanup by recording successfully

      imported patches in series file.

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am'add a'

        adding a

        $ cat >b.patch<<EOF

        > diff --git a/a b/a

        > --- a/a

        > +++ b/a

        > @@ -1,1 +1,2 @@

        >  a

        > +b

        > EOF

      empty series

        $ hg qseries

      qimport valid patch followed by invalid patch

        $ hg qimport b.patch fakepatch

        adding b.patch to series file

        abort: unable to read file fakepatch

        [255]

      valid patches before fail added to series

        $ hg qseries

        b.patch

        Pierre-Yves David
    
phases: prevent mq to qimport immutable change.

              r15704
            
        $ hg pull -q -r 0 . # update phase

        $ hg qimport -r 0

        abort: revision 0 is not mutable

        timeless
    
mq: use single quotes in use warning

              r29968
            
        (see 'hg help phases' for details)

        Pierre-Yves David
    
phases: prevent mq to qimport immutable change.

              r15704
            
        [255]

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

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

Matt Mackall tests: unify test-mq-qimport-fail-cleanup	r12465	Failed qimport of patches from files should cleanup by recording successfully
		imported patches in series file.

		$ echo "[extensions]" >> $HGRCPATH
		$ echo "mq=" >> $HGRCPATH
		$ hg init repo
		$ cd repo
		$ echo a > a
		$ hg ci -Am'add a'
		adding a
		$ cat >b.patch<<EOF
		> diff --git a/a b/a
		> --- a/a
		> +++ b/a
		> @@ -1,1 +1,2 @@
		> a
		> +b
		> EOF

		empty series

		$ hg qseries

		qimport valid patch followed by invalid patch

		$ hg qimport b.patch fakepatch
		adding b.patch to series file
		abort: unable to read file fakepatch
		[255]

		valid patches before fail added to series

		$ hg qseries
		b.patch
Pierre-Yves David phases: prevent mq to qimport immutable change.	r15704
		$ hg pull -q -r 0 . # update phase
		$ hg qimport -r 0
		abort: revision 0 is not mutable
timeless mq: use single quotes in use warning	r29968	(see 'hg help phases' for details)
Pierre-Yves David phases: prevent mq to qimport immutable change.	r15704	[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..