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

match: move entire uipath() implementation to basematcher...

match: move entire uipath() implementation to basematcher Even though most matchers will always want to use the relative path in uipath(), when we add support for intersecting matcher, we will want to control which form to use for any kind of matcher without knowing the type (see next patch), so we need the implementation on the base class. Also rename the attribute from "pathrestricted" to "relativeuipath" since there actually are cases where we match everything but still use relative paths (like when the user runs "hg files .." from inside mercurial/).

timeless - - Load All Authors

File last commit:

r29968:0342bf29 default


                r32496:ca77a243

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