tests/test-qrecord.t
author Pierre-Yves David <pierre-yves.david@logilab.fr>
Wed, 16 Jan 2013 00:09:26 +0100
changeset 18395 904b7109938e
parent 18028 5dbefa846903
child 19445 29c726e9c3ab
permissions -rw-r--r--
destroyed: drop complex branchcache rebuilt logic The strip code used a trick to lower the cost of branchcache update after a strip. However is less necessary since we have branchcache collaboration. Invalid branchcache are likely to be cheaply rebuilt again a near subset of the repo. Moreover, this trick would need update to be relevant in the now filtered repository world. It currently update the unfiltered branchcache that few people cares about. Make it smarter on that aspect would need complexes update of the calling logic So this mechanism is: - Arguably needed, - Currently irrelevant, - Hard to update and I'm dropping it. We now update the branchcache in all case by courtesy of the read only reader. This changeset have a few expected impact on the testsuite are different cache are updated.
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
d71ada5a6a33 help: format all output using RST
Olav Reinert <seroton10@gmail.com>
parents: 16458
diff changeset
    10
  commit/qrefresh
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    11
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    12
  use "hg help extensions" for information on enabling extensions
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    13
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    14
help qrecord (no record)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    15
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    16
  $ hg help qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    17
  'qrecord' is provided by the following extension:
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    18
  
15861
ee8f5e4ce7b8 minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents: 15521
diff changeset
    19
      record        commands to interactively select changes for commit/qrefresh
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    20
  
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    21
  use "hg help extensions" for information on enabling extensions
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    22
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    23
  $ echo "[extensions]"     >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    24
  $ echo "record="          >> $HGRCPATH
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    25
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    26
help record (record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    27
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    28
  $ hg help record
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    29
  hg record [OPTION]... [FILE]...
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    30
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    31
  interactively select changes to commit
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    32
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    33
      If a list of files is omitted, all changes reported by "hg status" will be
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    34
      candidates for recording.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    35
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    36
      See "hg help dates" for a list of formats valid for -d/--date.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    37
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    38
      You will be prompted for whether to record changes to each modified file,
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    39
      and for files with multiple changes, for each change to use. For each
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    40
      query, the following responses are possible:
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    41
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    42
        y - record this change
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    43
        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
    44
        e - edit this change manually
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    45
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    46
        s - skip remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    47
        f - record remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    48
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    49
        d - done, skip remaining changes and files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    50
        a - record all changes to all remaining files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    51
        q - quit, recording no changes
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    52
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    53
        ? - display help
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    54
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    55
      This command is not available when committing a merge.
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    56
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    57
  options:
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    58
  
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    59
   -A --addremove           mark new/missing files as added/removed before
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    60
                            committing
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    61
      --close-branch        mark a branch as closed, hiding it from the branch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    62
                            list
16458
55982f62651f commit: add option to amend the working dir parent
Idan Kamara <idankk86@gmail.com>
parents: 16324
diff changeset
    63
      --amend               amend the parent of the working dir
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    64
   -I --include PATTERN [+] include names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    65
   -X --exclude PATTERN [+] exclude names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    66
   -m --message TEXT        use text as commit message
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    67
   -l --logfile FILE        read commit message from file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    68
   -d --date DATE           record the specified date as commit date
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    69
   -u --user USER           record the specified user as committer
15321
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents: 15202
diff changeset
    70
   -S --subrepos            recurse into subrepositories
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    71
   -w --ignore-all-space    ignore white space when comparing lines
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    72
   -b --ignore-space-change ignore changes in the amount of white space
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
    73
   -B --ignore-blank-lines  ignore changes whose lines are all blank
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    74
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    75
  [+] marked option can be specified multiple times
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    76
  
17837
b623e323c561 help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17492
diff changeset
    77
  use "hg -v help record" to show the global options
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    78
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    79
help (no mq, so no qrecord)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    80
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    81
  $ hg help qrecord
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    82
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    83
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    84
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    85
  
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    86
      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
    87
  
17837
b623e323c561 help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17492
diff changeset
    88
  use "hg -v help qrecord" to show the global options
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    89
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    90
  $ hg init a
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    91
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    92
qrecord (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    93
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    94
  $ hg -R a qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    95
  hg qrecord: invalid arguments
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    96
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    97
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    98
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    99
  
13950
14d0553bd48b help: do not show full help text for command on option errors
Adrian Buehlmann <adrian@cadifra.com>
parents: 13936
diff changeset
   100
  use "hg help qrecord" to show the full help text
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   101
  [255]
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   102
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   103
qrecord patch (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   104
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   105
  $ hg -R a qrecord patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
   106
  abort: 'mq' extension not loaded
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12075
diff changeset
   107
  [255]
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   108
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   109
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
   110
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
   111
  $ 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
   112
  $ hg help qrecord
18028
5dbefa846903 tests: don't hardcode errno==2 for ENOENT
Julien Cristau <julien.cristau@logilab.fr>
parents: 17837
diff changeset
   113
  *** 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
   114
  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
   115
  
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   116
  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
   117
  
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   118
      See "hg help qnew" & "hg help record" for more information and usage.
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   119
  
17837
b623e323c561 help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17492
diff changeset
   120
  use "hg -v help qrecord" to show the global options
14415
c238b12a1ed4 extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents: 14016
diff changeset
   121
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   122
help (mq present)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   123
17492
973c2b0b403c spelling: nonexistent
timeless@mozdev.org
parents: 16913
diff changeset
   124
  $ 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
   125
  $ 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
   126
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   127
  $ hg help qrecord
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   128
  hg qrecord [OPTION]... PATCH [FILE]...
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   129
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   130
  interactively record a new patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   131
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   132
      See "hg help qnew" & "hg help record" for more information and usage.
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   133
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   134
  options:
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   135
  
15145
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   136
   -e --edit                edit commit message
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   137
   -g --git                 use git extended diff format
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   138
   -U --currentuser         add "From: <current user>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   139
   -u --user USER           add "From: <USER>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   140
   -D --currentdate         add "Date: <current date>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   141
   -d --date DATE           add "Date: <DATE>" to patch
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   142
   -I --include PATTERN [+] include names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   143
   -X --exclude PATTERN [+] exclude names matching the given patterns
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   144
   -m --message TEXT        use text as commit message
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   145
   -l --logfile FILE        read commit message from file
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   146
   -w --ignore-all-space    ignore white space when comparing lines
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   147
   -b --ignore-space-change ignore changes in the amount of white space
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   148
   -B --ignore-blank-lines  ignore changes whose lines are all blank
ff26712a0c50 help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents: 14597
diff changeset
   149
      --mq                  operate on patch repository
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   150
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   151
  [+] marked option can be specified multiple times
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   152
  
17837
b623e323c561 help: indicate help omitting if help document is not fully displayed
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17492
diff changeset
   153
  use "hg -v help qrecord" to show the global options
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   154
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   155
  $ cd a
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   156
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   157
Base commit
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   158
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   159
  $ cat > 1.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   160
  > 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   161
  > 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   162
  > 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   163
  > 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   164
  > 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   165
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   166
  $ cat > 2.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   167
  > a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   168
  > b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   169
  > c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   170
  > d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   171
  > e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   172
  > f
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   173
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   174
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   175
  $ mkdir dir
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   176
  $ cat > dir/a.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   177
  > hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   178
  > 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   179
  > someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   180
  > up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   181
  > there
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   182
  > loves
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   183
  > me
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   184
  > EOF
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
  $ 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
   187
  $ hg commit -m 'initial checkin'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   188
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   189
Changing files
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   190
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   191
  $ 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
   192
  $ 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
   193
  $ 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
   194
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   195
  $ mv -f 1.txt.new 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   196
  $ mv -f 2.txt.new 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   197
  $ 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
   198
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   199
Whole diff
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   200
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   201
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   202
  diff -r 1057167b20ef 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   203
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   204
  +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   205
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   206
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   207
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   208
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   209
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   210
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   211
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   212
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   213
  diff -r 1057167b20ef 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   214
  --- a/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   215
  +++ b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   216
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   217
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   218
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   219
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   220
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   221
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   222
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   223
  diff -r 1057167b20ef dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   224
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   225
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   226
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   227
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   228
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   229
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   230
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   231
   up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   232
14424
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   233
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
   234
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   235
  $ hg qrecord .hg
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   236
  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
   237
  [255]
4eb88d296f63 record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents: 14415
diff changeset
   238
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   239
qrecord a.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   240
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   241
  $ 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
   242
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   243
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   244
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   245
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   246
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   247
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   248
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   249
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   250
  2 hunks, 2 lines changed
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   251
  examine changes to '1.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   252
  @@ -1,3 +1,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   253
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   254
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   255
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   256
   3
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   257
  record change 1/4 to '1.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   258
  @@ -3,3 +3,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   259
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   260
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   261
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   262
   5
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   263
  record change 2/4 to '1.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   264
  diff --git a/2.txt b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   265
  1 hunks, 1 lines changed
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   266
  examine changes to '2.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   267
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   268
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   269
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   270
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   271
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   272
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   273
   e
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   274
  record change 3/4 to '2.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   275
  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
   276
  1 hunks, 1 lines changed
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   277
  examine changes to 'dir/a.txt'? [Ynesfdaq?] 
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   278
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   279
After qrecord a.patch 'tip'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   280
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   281
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   282
  changeset:   1:5d1ca63427ee
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   283
  tag:         a.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   284
  tag:         qbase
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   285
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   286
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   287
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   288
  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
   289
  summary:     aaa
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   290
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   291
  diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   292
  --- 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
   293
  +++ 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
   294
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   295
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   296
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   297
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   298
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   299
   4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   300
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   301
  diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   302
  --- 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
   303
  +++ 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
   304
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   305
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   306
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   307
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   308
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   309
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   310
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   311
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   312
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   313
After qrecord a.patch 'diff'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   314
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   315
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   316
  diff -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   317
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   318
  +++ b/1.txt
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 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   322
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   323
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   324
  +4 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 5d1ca63427ee dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   327
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   328
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   329
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   330
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   331
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   332
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   333
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   334
   up
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   335
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   336
qrecord b.patch
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
  $ 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
   339
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   340
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   341
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   342
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   343
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   344
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   345
  1 hunks, 1 lines changed
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   346
  examine changes to '1.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   347
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   348
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   349
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   350
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   351
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   352
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   353
   5
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   354
  record change 1/2 to '1.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   355
  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
   356
  1 hunks, 1 lines changed
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   357
  examine changes to 'dir/a.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   358
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   359
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   360
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   361
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   362
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   363
   up
16324
46b991a1f428 record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents: 15861
diff changeset
   364
  record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   365
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   366
After qrecord b.patch 'tip'
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   367
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   368
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   369
  changeset:   2:b056198bf878
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   370
  tag:         b.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   371
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   372
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   373
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   374
  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
   375
  summary:     bbb
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   376
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   377
  diff -r 5d1ca63427ee -r b056198bf878 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   378
  --- 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
   379
  +++ 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
   380
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   381
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   382
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   383
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   384
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   385
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   386
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   387
  diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   388
  --- 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
   389
  +++ 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
   390
  @@ -1,4 +1,4 @@
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
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   393
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   394
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   395
   up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   396
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   397
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   398
After qrecord b.patch 'diff'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   399
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   400
  $ hg diff --nodates
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
   401
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16854
diff changeset
   402
  $ cd ..