upstream/mercurial-mirror Files · tests/test-mq-qgoto.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.

Mads Kiilerich - - Load All Authors

File last commit:

r18342:de99de39 default


                r23525:5126d771

default

Download file

             test-mq-qgoto.t
        
                    93 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qgoto.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ hg qnew a.patch

        $ echo a >> a

        $ hg qrefresh

        $ hg qnew b.patch

        $ echo b > b

        $ hg add b

        $ hg qrefresh

        $ hg qnew c.patch

        $ echo c > c

        $ hg add c

        $ hg qrefresh

        $ hg qgoto a.patch

        popping c.patch

        popping b.patch

        now at: a.patch

        $ hg qgoto c.patch

        applying b.patch

        applying c.patch

        now at: c.patch

        $ hg qgoto b.patch

        popping c.patch

        now at: b.patch

      Using index:

        $ hg qgoto 0

        popping b.patch

        now at: a.patch

        $ hg qgoto 2

        applying b.patch

        applying c.patch

        now at: c.patch

      No warnings when using index ... and update from non-qtip and with pending

      changes in unrelated files:

        $ hg qnew bug314159

        $ echo d >> c

        $ hg qrefresh

        $ hg qnew bug141421

        $ echo e >> b

        $ hg qrefresh

        $ hg up -r bug314159

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo f >> a

        $ echo f >> b

        $ echo f >> c

        $ hg qgoto 1

        abort: local changes found, refresh first

        [255]

        $ hg qgoto 1 -f

        popping bug141421

        popping bug314159

        popping c.patch

        now at: b.patch

        $ hg st

        M a

        M b

        ? c.orig

        $ hg up -qCr.

        $ hg qgoto 3

        applying c.patch

        applying bug314159

        now at: bug314159

      Detect ambiguous non-index:

        $ hg qgoto 14

        patch name "14" is ambiguous:

          bug314159

          bug141421

        abort: patch 14 not in series

        [255]

        $ 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

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

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Ama
				adding a

				$ hg qnew a.patch
				$ echo a >> a
				$ hg qrefresh

				$ hg qnew b.patch
				$ echo b > b
				$ hg add b
				$ hg qrefresh

				$ hg qnew c.patch
				$ echo c > c
				$ hg add c
				$ hg qrefresh

				$ hg qgoto a.patch
				popping c.patch
				popping b.patch
				now at: a.patch

				$ hg qgoto c.patch
				applying b.patch
				applying c.patch
				now at: c.patch

				$ hg qgoto b.patch
				popping c.patch
				now at: b.patch

				Using index:

				$ hg qgoto 0
				popping b.patch
				now at: a.patch

				$ hg qgoto 2
				applying b.patch
				applying c.patch
				now at: c.patch

				No warnings when using index ... and update from non-qtip and with pending
				changes in unrelated files:

				$ hg qnew bug314159
				$ echo d >> c
				$ hg qrefresh
				$ hg qnew bug141421
				$ echo e >> b
				$ hg qrefresh

				$ hg up -r bug314159
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo f >> a
				$ echo f >> b
				$ echo f >> c

				$ hg qgoto 1
				abort: local changes found, refresh first
				[255]
				$ hg qgoto 1 -f
				popping bug141421
				popping bug314159
				popping c.patch
				now at: b.patch
				$ hg st
				M a
				M b
				? c.orig
				$ hg up -qCr.

				$ hg qgoto 3
				applying c.patch
				applying bug314159
				now at: bug314159

				Detect ambiguous non-index:

				$ hg qgoto 14
				patch name "14" is ambiguous:
				bug314159
				bug141421
				abort: patch 14 not in series
				[255]

				$ cd ..