tests/test-dispatch.out
author Mads Kiilerich <mads@kiilerich.com>
Thu, 09 Jul 2009 23:59:03 +0200
changeset 9110 561ff8d9e4f0
parent 9051 f8e25885d975
child 9291 cd5b6a11b607
permissions -rw-r--r--
mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4563
8044be585b91 dispatch: restore a dropped shlex import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     1
adding a
4621
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     2
# missing arg
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     3
hg cat: invalid arguments
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     4
hg cat [OPTION]... FILE...
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     5
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     6
output the current or given revision of files
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
     7
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
     8
    Print the specified files as they were at the given revision. If no
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
     9
    revision is given, the parent of the working directory is used, or tip if
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
    10
    no revision is checked out.
4621
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    11
9051
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
    12
    Output may be to a file, in which case the name of the file is given using
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
    13
    a format string. The formatting rules are the same as for the export
f8e25885d975 commands: wrapped docstrings at 78 characters
Martin Geisler <mg@lazybytes.net>
parents: 8637
diff changeset
    14
    command, with the following additions:
4621
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    15
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    16
    %s   basename of file being printed
8027
9c7ca86fc658 expand "repo" to "repository" in help texts
Martin Geisler <mg@lazybytes.net>
parents: 8004
diff changeset
    17
    %d   dirname of file being printed, or '.' if in repository root
4621
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    18
    %p   root-relative path name of file being printed
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    19
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    20
options:
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    21
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    22
 -o --output   print output to file with formatted name
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    23
 -r --rev      print the given revision
6094
3998c1b0828f cat --decode: Drop short option, use opts.get() instead of opts[]
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6093
diff changeset
    24
    --decode   apply any matching decode filter
4621
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    25
 -I --include  include names matching the given patterns
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    26
 -X --exclude  exclude names matching the given patterns
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    27
6fc26982f203 dispatch: fix handling of incorrect number of arguments
Matt Mackall <mpm@selenic.com>
parents: 4563
diff changeset
    28
use "hg -v help cat" to show global options
4563
8044be585b91 dispatch: restore a dropped shlex import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    29
% [defaults]
8044be585b91 dispatch: restore a dropped shlex import
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    30
a
8637
c88c8d59979f tests: test for dispatch on [defaults]: more clearly differing output
Cédric Duval <cedricduval@free.fr>
parents: 8027
diff changeset
    31
a: No such file in rev 000000000000
4654
e0e73ba37983 Fix dispatch error message when not in a repo
Brendan Cully <brendan@kublai.com>
parents: 4621
diff changeset
    32
% no repo
e0e73ba37983 Fix dispatch error message when not in a repo
Brendan Cully <brendan@kublai.com>
parents: 4621
diff changeset
    33
abort: There is no Mercurial repository here (.hg not found)!