tests/test-qrecord.t
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Wed, 11 Jan 2023 19:53:58 +0000
changeset 49895 07792fd1837f
parent 49771 f0e9dda408b3
child 52088 51057ab0dffa
permissions -rw-r--r--
doc: add a few comments
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
     1
Create configuration
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
     2
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
     3
  $ echo "[ui]" >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
     4
  $ echo "interactive=true" >> $HGRCPATH
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
     5
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
     6
help record (no record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
     7
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
     8
  $ hg help record
16854
d71ada5a6a33 help: format all output using RST
Olav Reinert <seroton10@gmail.com>
parents: 16458
diff changeset
     9
  record extension - commands to interactively select changes for
28697
d001d6d27570 record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27729
diff changeset
    10
  commit/qrefresh (DEPRECATED)
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    11
  
30306
5581b294f3c6 help: show help for disabled extensions (issue5228)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30152
diff changeset
    12
  The feature provided by this extension has been moved into core Mercurial as
5581b294f3c6 help: show help for disabled extensions (issue5228)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30152
diff changeset
    13
  'hg commit --interactive'.
5581b294f3c6 help: show help for disabled extensions (issue5228)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 30152
diff changeset
    14
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28697
diff changeset
    15
  (use 'hg help extensions' for information on enabling extensions)
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    16
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    17
help qrecord (no record)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    18
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    19
  $ hg help qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    20
  'qrecord' is provided by the following extension:
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    21
  
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15521
diff changeset
    22
      record        commands to interactively select changes for commit/qrefresh
28697
d001d6d27570 record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27729
diff changeset
    23
                    (DEPRECATED)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    24
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28697
diff changeset
    25
  (use 'hg help extensions' for information on enabling extensions)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    26
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    27
  $ echo "[extensions]"     >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    28
  $ echo "record="          >> $HGRCPATH
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    29
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    30
help record (record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    31
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    32
  $ hg help record
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    33
  hg record [OPTION]... [FILE]...
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    34
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    35
  interactively select changes to commit
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    36
  
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 25304
diff changeset
    37
      If a list of files is omitted, all changes reported by 'hg status' will be
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    38
      candidates for recording.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    39
  
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 25304
diff changeset
    40
      See 'hg help dates' for a list of formats valid for -d/--date.
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    41
  
31065
7074589cf22a record: update help to describe ui.interface
eloimorlaas <eloimorlaas@fb.com>
parents: 30306
diff changeset
    42
      If using the text interface (see 'hg help config'), you will be prompted
7074589cf22a record: update help to describe ui.interface
eloimorlaas <eloimorlaas@fb.com>
parents: 30306
diff changeset
    43
      for whether to record changes to each modified file, and for files with
7074589cf22a record: update help to describe ui.interface
eloimorlaas <eloimorlaas@fb.com>
parents: 30306
diff changeset
    44
      multiple changes, for each change to use. For each query, the following
7074589cf22a record: update help to describe ui.interface
eloimorlaas <eloimorlaas@fb.com>
parents: 30306
diff changeset
    45
      responses are possible:
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    46
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    47
        y - record this change
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    48
        n - skip this change
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
    49
        e - edit this change manually
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    50
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    51
        s - skip remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    52
        f - record remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    53
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    54
        d - done, skip remaining changes and files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    55
        a - record all changes to all remaining files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    56
        q - quit, recording no changes
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    57
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    58
        ? - display help
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    59
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    60
      This command is not available when committing a merge.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    61
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28697
diff changeset
    62
  (use 'hg help -e record' to show help for the record extension)
28697
d001d6d27570 record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27729
diff changeset
    63
  
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22113
diff changeset
    64
  options ([+] can be repeated):
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    65
  
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    66
   -A --addremove           mark new/missing files as added/removed before
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    67
                            committing
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    68
      --close-branch        mark a branch head as closed
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    69
      --amend               amend the parent of the working directory
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    70
   -s --secret              use the secret phase for committing
49771
f0e9dda408b3 commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com>
parents: 48360
diff changeset
    71
      --draft               use the draft phase for committing
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    72
   -e --edit                invoke editor on commit messages
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    73
   -I --include PATTERN [+] include names matching the given patterns
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    74
   -X --exclude PATTERN [+] exclude names matching the given patterns
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    75
   -m --message TEXT        use text as commit message
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    76
   -l --logfile FILE        read commit message from file
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    77
   -d --date DATE           record the specified date as commit date
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    78
   -u --user USER           record the specified user as committer
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    79
   -S --subrepos            recurse into subrepositories
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    80
   -w --ignore-all-space    ignore white space when comparing lines
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    81
   -b --ignore-space-change ignore changes in the amount of white space
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
    82
   -B --ignore-blank-lines  ignore changes whose lines are all blank
34013
da07367d683b mdiff: add a --ignore-space-at-eol option
David Soria Parra <davidsp@fb.com>
parents: 31556
diff changeset
    83
   -Z --ignore-space-at-eol ignore changes in whitespace at EOL
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    84
  
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
    85
  (some details hidden, use --verbose to show complete help)
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    86
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    87
help (no mq, so no qrecord)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    88
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    89
  $ hg help qrecord
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    90
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    91
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    92
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    93
  
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 25304
diff changeset
    94
      See 'hg help qnew' & 'hg help record' for more information and usage.
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    95
  
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
    96
  (some details hidden, use --verbose to show complete help)
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    97
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    98
  $ hg init a
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    99
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   100
qrecord (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   101
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   102
  $ hg -R a qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   103
  hg qrecord: invalid arguments
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   104
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   105
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   106
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   107
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28697
diff changeset
   108
  (use 'hg qrecord -h' to show more help)
46262
9c9e0b4b2ca7 error: use detailed exit code 10 for command errors
Martin von Zweigbergk <martinvonz@google.com>
parents: 46103
diff changeset
   109
  [10]
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   110
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   111
qrecord patch (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   112
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   113
  $ hg -R a qrecord patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   114
  abort: 'mq' extension not loaded
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12075
diff changeset
   115
  [255]
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   116
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   117
help (bad mq)
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   118
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
   119
  $ echo "mq=nonexistent" >> $HGRCPATH
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   120
  $ hg help qrecord
48360
e4acdf5d94a2 extensions: highlight the name of the faulty extensions in the error message
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 46262
diff changeset
   121
  *** failed to import extension "mq" from nonexistent: [Errno *] * (glob)
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   122
  hg qrecord [OPTION]... PATCH [FILE]...
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   123
  
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   124
  interactively record a new patch
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   125
  
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 25304
diff changeset
   126
      See 'hg help qnew' & 'hg help record' for more information and usage.
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   127
  
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
   128
  (some details hidden, use --verbose to show complete help)
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   129
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   130
help (mq present)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   131
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
   132
  $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   133
  $ mv hgrc.tmp $HGRCPATH
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   134
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   135
  $ hg help qrecord
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   136
  hg qrecord [OPTION]... PATCH [FILE]...
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   137
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   138
  interactively record a new patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   139
  
27729
58f8b29c37ff minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents: 25304
diff changeset
   140
      See 'hg help qnew' & 'hg help record' for more information and usage.
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   141
  
22117
c1d93edcf004 help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents: 22113
diff changeset
   142
  options ([+] can be repeated):
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   143
  
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   144
   -e --edit                invoke editor on commit messages
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   145
   -g --git                 use git extended diff format
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   146
   -U --currentuser         add "From: <current user>" to patch
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   147
   -u --user USER           add "From: <USER>" to patch
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   148
   -D --currentdate         add "Date: <current date>" to patch
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   149
   -d --date DATE           add "Date: <DATE>" to patch
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   150
   -I --include PATTERN [+] include names matching the given patterns
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   151
   -X --exclude PATTERN [+] exclude names matching the given patterns
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   152
   -m --message TEXT        use text as commit message
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   153
   -l --logfile FILE        read commit message from file
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   154
   -w --ignore-all-space    ignore white space when comparing lines
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   155
   -b --ignore-space-change ignore changes in the amount of white space
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   156
   -B --ignore-blank-lines  ignore changes whose lines are all blank
34013
da07367d683b mdiff: add a --ignore-space-at-eol option
David Soria Parra <davidsp@fb.com>
parents: 31556
diff changeset
   157
   -Z --ignore-space-at-eol ignore changes in whitespace at EOL
30152
d65e246100ed help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 30024
diff changeset
   158
      --mq                  operate on patch repository
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   159
  
22110
26f7c8033bed help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents: 21952
diff changeset
   160
  (some details hidden, use --verbose to show complete help)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   161
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   162
  $ cd a
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   163
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   164
Base commit
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   165
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   166
  $ cat > 1.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   167
  > 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   168
  > 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   169
  > 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   170
  > 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   171
  > 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   172
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   173
  $ cat > 2.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   174
  > a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   175
  > b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   176
  > c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   177
  > d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   178
  > e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   179
  > f
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   180
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   181
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   182
  $ mkdir dir
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   183
  $ cat > dir/a.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   184
  > hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   185
  > 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   186
  > someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   187
  > up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   188
  > there
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   189
  > loves
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   190
  > me
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   191
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   192
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   193
  $ hg add 1.txt 2.txt dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   194
  $ hg commit -m 'initial checkin'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   195
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   196
Changing files
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   197
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   198
  $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   199
  $ sed -e 's/b/b b/' 2.txt > 2.txt.new
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   200
  $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   201
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   202
  $ mv -f 1.txt.new 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   203
  $ mv -f 2.txt.new 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   204
  $ mv -f dir/a.txt.new dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   205
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   206
Whole diff
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   207
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   208
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   209
  diff -r 1057167b20ef 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   210
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   211
  +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   212
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   213
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   214
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   215
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   216
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   217
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   218
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   219
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   220
  diff -r 1057167b20ef 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   221
  --- a/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   222
  +++ b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   223
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   224
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   225
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   226
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   227
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   228
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   229
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   230
  diff -r 1057167b20ef dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   231
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   232
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   233
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   234
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   235
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   236
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   237
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   238
   up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   239
14424
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   240
qrecord with bad patch name, should abort before prompting
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   241
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   242
  $ hg qrecord .hg
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   243
  abort: patch name cannot begin with ".hg"
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   244
  [255]
31556
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   245
  $ hg qrecord ' foo'
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   246
  abort: patch name cannot begin or end with whitespace
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   247
  [255]
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   248
  $ hg qrecord 'foo '
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   249
  abort: patch name cannot begin or end with whitespace
448acdee9161 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org>
parents: 31065
diff changeset
   250
  [255]
14424
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   251
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   252
qrecord a.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   253
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   254
  $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   255
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   256
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   257
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   258
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   259
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   260
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   261
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   262
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   263
  2 hunks, 2 lines changed
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   264
  examine changes to '1.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   265
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   266
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   267
  @@ -1,3 +1,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   268
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   269
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   270
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   271
   3
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   272
  record change 1/4 to '1.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   273
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   274
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   275
  @@ -3,3 +3,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   276
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   277
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   278
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   279
   5
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   280
  record change 2/4 to '1.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   281
  (enter ? for help) [Ynesfdaq?] n
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   282
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   283
  diff --git a/2.txt b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   284
  1 hunks, 1 lines changed
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   285
  examine changes to '2.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   286
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   287
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   288
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   289
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   290
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   291
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   292
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   293
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   294
   e
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   295
  record change 3/4 to '2.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   296
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   297
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   298
  diff --git a/dir/a.txt b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   299
  1 hunks, 1 lines changed
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   300
  examine changes to 'dir/a.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   301
  (enter ? for help) [Ynesfdaq?] n
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   302
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   303
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   304
After qrecord a.patch 'tip'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   305
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   306
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   307
  changeset:   1:5d1ca63427ee
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   308
  tag:         a.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   309
  tag:         qbase
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   310
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   311
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   312
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   313
  date:        Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   314
  summary:     aaa
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   315
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   316
  diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   317
  --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   318
  +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   319
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   320
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   321
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   322
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   323
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   324
   4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   325
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   326
  diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   327
  --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   328
  +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   329
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   330
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   331
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   332
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   333
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   334
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   335
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   336
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   337
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   338
After qrecord a.patch 'diff'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   339
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   340
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   341
  diff -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   342
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   343
  +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   344
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   345
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   346
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   347
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   348
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   349
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   350
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   351
  diff -r 5d1ca63427ee dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   352
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   353
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   354
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   355
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   356
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   357
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   358
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   359
   up
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   360
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   361
qrecord b.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   362
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   363
  $ hg qrecord -d '0 0' -m bbb b.patch <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   364
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   365
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   366
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   367
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   368
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   369
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   370
  1 hunks, 1 lines changed
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   371
  examine changes to '1.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   372
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   373
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   374
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   375
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   376
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   377
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   378
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   379
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   380
   5
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   381
  record change 1/2 to '1.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   382
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   383
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   384
  diff --git a/dir/a.txt b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   385
  1 hunks, 1 lines changed
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   386
  examine changes to 'dir/a.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   387
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   388
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   389
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   390
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   391
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   392
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   393
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   394
   up
42566
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   395
  record change 2/2 to 'dir/a.txt'?
f802a75da585 patch: use a short, fixed-size message for last line of prompt (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 42052
diff changeset
   396
  (enter ? for help) [Ynesfdaq?] y
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22117
diff changeset
   397
  
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   398
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   399
After qrecord b.patch 'tip'
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   400
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   401
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   402
  changeset:   2:b056198bf878
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   403
  tag:         b.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   404
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   405
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   406
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   407
  date:        Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   408
  summary:     bbb
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   409
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   410
  diff -r 5d1ca63427ee -r b056198bf878 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   411
  --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   412
  +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   413
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   414
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   415
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   416
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   417
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   418
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   419
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   420
  diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   421
  --- a/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   422
  +++ b/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   423
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   424
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   425
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   426
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   427
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   428
   up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   429
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   430
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   431
After qrecord b.patch 'diff'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   432
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   433
  $ hg diff --nodates
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
   434
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
   435
  $ cd ..
41790
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   436
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   437
qrecord should throw an error when histedit in process
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   438
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   439
  $ hg init issue5981
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   440
  $ cd issue5981
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   441
  $ cat >> $HGRCPATH <<EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   442
  > [extensions]
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   443
  > histedit=
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   444
  > mq=
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   445
  > EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   446
  $ echo > a
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   447
  $ hg ci -Am 'foo bar'
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   448
  adding a
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   449
  $ hg log
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   450
  changeset:   0:ea55e2ae468f
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   451
  tag:         tip
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   452
  user:        test
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   453
  date:        Thu Jan 01 00:00:00 1970 +0000
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   454
  summary:     foo bar
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   455
  
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   456
  $ hg histedit tip --commands - 2>&1 <<EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   457
  > edit ea55e2ae468f foo bar
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   458
  > EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   459
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46103
3f82a915ab2a histedit: tweak `edit` message to try and guide users to our workflow
Augie Fackler <augie@google.com>
parents: 45840
diff changeset
   460
  Editing (ea55e2ae468f), commit as needed now to split the change
3f82a915ab2a histedit: tweak `edit` message to try and guide users to our workflow
Augie Fackler <augie@google.com>
parents: 45840
diff changeset
   461
  (to edit ea55e2ae468f, `hg histedit --continue` after making changes)
45826
21733e8c924f errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents: 42566
diff changeset
   462
  [240]
41790
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   463
  $ echo 'foo bar' > a
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   464
  $ hg qrecord -d '0 0' -m aaa a.patch <<EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   465
  > y
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   466
  > y
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   467
  > n
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   468
  > y
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   469
  > y
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   470
  > n
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   471
  > EOF
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   472
  abort: histedit in progress
4d21ebc4cb47 mq: disable qrecord during histedit (issue5981)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 34013
diff changeset
   473
  (use 'hg histedit --continue' or 'hg histedit --abort')
45840
527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45826
diff changeset
   474
  [20]