upstream/mercurial-mirror Files · tests/test-rebase-legacy.t

dispatch: don't show list of commands on bogus command...

dispatch: don't show list of commands on bogus command If a command is ambiguous, you get this: $ hg ve hg: command 've' is ambiguous: verify version [255] If you typo a command, you get this: $ hg comit hg: unknown command 'comit' (did you mean one of commit, incoming, mycommit?) [255] But if you completely mistype a command so it no longer looks like any existing commands, you get a full list of commands. That might be useful the first time you use Mercurial, but after that it's probably more annoying than help, especially if you have the pager enabled and have a short terminal. Let's instead give a short hint telling the user to run `hg help` for more help. Differential Revision: https://phab.mercurial-scm.org/D4024

Jun Wu - - Load All Authors

File last commit:

r34006:af609bb3 default


                r38810:81fb4421

default

Download file

             test-rebase-legacy.t
        
                    76 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-legacy.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test rebase --continue with rebasestate written by legacy client

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > drawdag=$TESTDIR/drawdag.py

        > EOF

        $ hg init

        $ hg debugdrawdag <<'EOF'

        >    D H

        >    | |

        >    C G

        >    | |

        >    B F

        >    | |

        >  Z A E

        >   \|/

        >    R

        > EOF

      rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"

        $ touch .hg/last-message.txt

        $ cat > .hg/rebasestate <<EOF

        > 0000000000000000000000000000000000000000

        > f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f

        > 0000000000000000000000000000000000000000

        > 0

        > 0

        > 0

        > 

        > 21a6c45028857f500f56ae84fbf40689c429305b:-2

        > de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000

        > c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000

        > aeba276fcb7df8e10153a07ee728d5540693f5aa:-3

        > bd5548558fcf354d37613005737a143871bf3723:-3

        > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000

        > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000

        > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000

        > EOF

        $ hg rebase --continue

        rebasing 4:c1e6b162678d "B" (B)

        rebasing 8:6f7a236de685 "D" (D)

        rebasing 2:de008c61a447 "E" (E)

        rebasing 7:d2fa1c02b240 "G" (G)

        rebasing 9:6582e6951a9c "H" (H tip)

        warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447

        saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg

        $ hg log -G -T '{rev}:{node|short} {desc}\n'

        o  11:721b8da0a708 H

        |

        o  10:9d65695ec3c2 G

        |

        o  9:21c8397a5d68 E

        |

        | o  8:fc52970345e8 D

        | |

        | o  7:eac96551b107 B

        |/

        | o  6:bd5548558fcf C

        | |

        | | o  5:aeba276fcb7d F

        | | |

        | o |  4:c1e6b162678d B

        | | |

        o | |  3:f424eb6a8c01 Z

        | | |

        +---o  2:de008c61a447 E

        | |

        | o  1:21a6c4502885 A

        |/

        o  0:b41ce7760717 R

	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

				Test rebase --continue with rebasestate written by legacy client

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> drawdag=$TESTDIR/drawdag.py
				> EOF

				$ hg init
				$ hg debugdrawdag <<'EOF'
				> D H
				> \| \|
				> C G
				> \| \|
				> B F
				> \| \|
				> Z A E
				> \\|/
				> R
				> EOF

				rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"

				$ touch .hg/last-message.txt
				$ cat > .hg/rebasestate <<EOF
				> 0000000000000000000000000000000000000000
				> f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f
				> 0000000000000000000000000000000000000000
				> 0
				> 0
				> 0
				>
				> 21a6c45028857f500f56ae84fbf40689c429305b:-2
				> de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000
				> c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000
				> aeba276fcb7df8e10153a07ee728d5540693f5aa:-3
				> bd5548558fcf354d37613005737a143871bf3723:-3
				> d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000
				> 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000
				> 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000
				> EOF

				$ hg rebase --continue
				rebasing 4:c1e6b162678d "B" (B)
				rebasing 8:6f7a236de685 "D" (D)
				rebasing 2:de008c61a447 "E" (E)
				rebasing 7:d2fa1c02b240 "G" (G)
				rebasing 9:6582e6951a9c "H" (H tip)
				warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447
				saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg

				$ hg log -G -T '{rev}:{node\|short} {desc}\n'
				o 11:721b8da0a708 H
				\|
				o 10:9d65695ec3c2 G
				\|
				o 9:21c8397a5d68 E
				\|
				\| o 8:fc52970345e8 D
				\| \|
				\| o 7:eac96551b107 B
				\|/
				\| o 6:bd5548558fcf C
				\| \|
				\| \| o 5:aeba276fcb7d F
				\| \| \|
				\| o \| 4:c1e6b162678d B
				\| \| \|
				o \| \| 3:f424eb6a8c01 Z
				\| \| \|
				+---o 2:de008c61a447 E
				\| \|
				\| o 1:21a6c4502885 A
				\|/
				o 0:b41ce7760717 R