tests/test-qrecord.t
author Adrian Buehlmann <adrian@cadifra.com>
Wed, 18 May 2011 09:12:27 +0200
changeset 14413 5ef18e28df19
parent 14016 bd738875943a
child 14415 c238b12a1ed4
permissions -rw-r--r--
pure: provide more correct implementation of posixfile for Windows requires ctypes Why is posixfile a class? Because the implementation needs to use the Python library call os.fdopen [1], which sets the 'name' attribute on the Python file object it creates to the mostly meaningless string '<fdopen>', since file descriptors don't have a name. But users of posixfile depend on the name attribute [2] being set to a proper value, like Python's built-in 'open' function sets it on file objects. Python file's name attribute is read-only, so we can't just assign to it after the file object has alrady been created. To solve this problem, we save the name of the file on a wrapper object, and delegate the file function calls to the wrapped (private) file object using __getattr__. [1] http://docs.python.org/library/os.html#os.fdopen [2] http://docs.python.org/library/stdtypes.html#file.name
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
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
     9
  record extension - commands to interactively select changes for commit/qrefresh
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    10
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    11
  use "hg help extensions" for information on enabling extensions
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    12
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    13
help qrecord (no record)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    14
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    15
  $ hg help qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    16
  'qrecord' is provided by the following extension:
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    17
  
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    18
      record  commands to interactively select changes for commit/qrefresh
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    19
  
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    20
  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
    21
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    22
  $ echo "[extensions]"     >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    23
  $ echo "record="          >> $HGRCPATH
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    24
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    25
help record (record)
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    26
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    27
  $ hg help record
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    28
  hg record [OPTION]... [FILE]...
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    29
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    30
  interactively select changes to commit
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
      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
    33
      candidates for recording.
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
      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
    36
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    37
      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
    38
      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
    39
      query, the following responses are possible:
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    40
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    41
        y - record this change
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    42
        n - skip this change
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    43
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    44
        s - skip remaining changes to this file
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    45
        f - record remaining changes to this file
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
        d - done, skip remaining changes and files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    48
        a - record all changes to all remaining files
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    49
        q - quit, recording no changes
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
        ? - display help
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
      This command is not available when committing a merge.
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
  options:
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
   -A --addremove            mark new/missing files as added/removed before
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    58
                             committing
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    59
      --close-branch         mark a branch as closed, hiding it from the branch
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    60
                             list
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    61
   -I --include PATTERN [+]  include names matching the given patterns
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    62
   -X --exclude PATTERN [+]  exclude names matching the given patterns
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    63
   -m --message TEXT         use text as commit message
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    64
   -l --logfile FILE         read commit message from file
14016
bd738875943a merge with stable
Martin Geisler <mg@aragost.com>
parents: 13950
diff changeset
    65
   -d --date DATE            record the specified date as commit date
13935
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    66
   -u --user USER            record the specified user as committer
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    67
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    68
  [+] marked option can be specified multiple times
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    69
  
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    70
  use "hg -v help record" to show global options
6e6d19738df9 record: improve help test coverage
timeless <timeless@mozdev.org>
parents: 13295
diff changeset
    71
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    72
help (no mq, so no qrecord)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
    73
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    74
  $ hg help qrecord
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    75
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    76
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    77
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    78
  
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    79
      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
    80
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    81
  use "hg -v help qrecord" to show global options
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    82
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    83
  $ hg init a
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    84
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    85
qrecord (mq not present)
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    86
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    87
  $ hg -R a qrecord
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    88
  hg qrecord: invalid arguments
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    89
  hg qrecord [OPTION]... PATCH [FILE]...
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
    90
  
13936
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    91
  interactively record a new patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    92
  
13950
14d0553bd48b help: do not show full help text for command on option errors
Adrian Buehlmann <adrian@cadifra.com>
parents: 13936
diff changeset
    93
  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
    94
  [255]
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    95
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    96
qrecord patch (mq not present)
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 -R a qrecord patch
f4e4faa92939 qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents: 13935
diff changeset
    99
  abort: 'mq' extension not loaded
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12075
diff changeset
   100
  [255]
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   101
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   102
help (mq present)
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   103
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   104
  $ echo "mq="              >> $HGRCPATH
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   105
  $ hg help qrecord
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   106
  hg qrecord [OPTION]... PATCH [FILE]...
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   107
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   108
  interactively record a new patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   109
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   110
      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
   111
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   112
  options:
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   113
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   114
   -e --edit                 edit commit message
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   115
   -g --git                  use git extended diff format
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   116
   -U --currentuser          add "From: <current user>" to patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   117
   -u --user USER            add "From: <USER>" to patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   118
   -D --currentdate          add "Date: <current date>" to patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   119
   -d --date DATE            add "Date: <DATE>" to patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   120
   -I --include PATTERN [+]  include names matching the given patterns
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   121
   -X --exclude PATTERN [+]  exclude names matching the given patterns
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   122
   -m --message TEXT         use text as commit message
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   123
   -l --logfile FILE         read commit message from file
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   124
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   125
  [+] marked option can be specified multiple times
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   126
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   127
  use "hg -v help qrecord" to show global options
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   128
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   129
  $ cd a
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   130
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   131
Base commit
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   132
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   133
  $ cat > 1.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   134
  > 1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   135
  > 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   136
  > 3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   137
  > 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   138
  > 5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   139
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   140
  $ cat > 2.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   141
  > a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   142
  > b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   143
  > c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   144
  > d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   145
  > e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   146
  > f
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   147
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   148
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   149
  $ mkdir dir
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   150
  $ cat > dir/a.txt <<EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   151
  > hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   152
  > 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   153
  > someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   154
  > up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   155
  > there
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   156
  > loves
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   157
  > me
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   158
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   159
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   160
  $ 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
   161
  $ hg commit -m 'initial checkin'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   162
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   163
Changing files
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   164
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   165
  $ 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
   166
  $ 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
   167
  $ 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
   168
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   169
  $ mv -f 1.txt.new 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   170
  $ mv -f 2.txt.new 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   171
  $ 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
   172
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   173
Whole diff
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
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   176
  diff -r 1057167b20ef 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   177
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   178
  +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   179
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   180
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   181
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   182
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   183
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   184
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   185
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   186
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   187
  diff -r 1057167b20ef 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   188
  --- a/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   189
  +++ b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   190
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   191
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   192
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   193
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   194
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   195
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   196
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   197
  diff -r 1057167b20ef dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   198
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   199
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   200
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   201
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   202
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   203
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   204
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   205
   up
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   206
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   207
qrecord a.patch
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   208
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   209
  $ 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
   210
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   211
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   212
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   213
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   214
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   215
  > n
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   216
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   217
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   218
  2 hunks, 2 lines changed
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   219
  examine changes to '1.txt'? [Ynsfdaq?] 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   220
  @@ -1,3 +1,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   221
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   222
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   223
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   224
   3
13295
fb446228c0d4 record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents: 12934
diff changeset
   225
  record change 1/4 to '1.txt'? [Ynsfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   226
  @@ -3,3 +3,3 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   227
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   228
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   229
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   230
   5
13295
fb446228c0d4 record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents: 12934
diff changeset
   231
  record change 2/4 to '1.txt'? [Ynsfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   232
  diff --git a/2.txt b/2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   233
  1 hunks, 1 lines changed
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   234
  examine changes to '2.txt'? [Ynsfdaq?] 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   235
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   236
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   237
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   238
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   239
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   240
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   241
   e
13295
fb446228c0d4 record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents: 12934
diff changeset
   242
  record change 3/4 to '2.txt'? [Ynsfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   243
  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
   244
  1 hunks, 1 lines changed
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   245
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   246
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   247
After qrecord a.patch 'tip'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   248
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   249
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   250
  changeset:   1:5d1ca63427ee
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   251
  tag:         a.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   252
  tag:         qbase
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   253
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   254
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   255
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   256
  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
   257
  summary:     aaa
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   258
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   259
  diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   260
  --- 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
   261
  +++ 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
   262
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   263
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   264
  -2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   265
  +2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   266
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   267
   4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   268
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   269
  diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   270
  --- 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
   271
  +++ 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
   272
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   273
   a
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   274
  -b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   275
  +b b
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   276
   c
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   277
   d
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   278
   e
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   279
  
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
After qrecord a.patch 'diff'"
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   282
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   283
  $ hg diff --nodates
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   284
  diff -r 5d1ca63427ee 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   285
  --- a/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   286
  +++ b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   287
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   288
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   289
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   290
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   291
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   292
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   293
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   294
  diff -r 5d1ca63427ee dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   295
  --- a/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   296
  +++ b/dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   297
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   298
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   299
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   300
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   301
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   302
   up
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
qrecord b.patch
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 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
   307
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   308
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   309
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   310
  > y
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   311
  > EOF
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   312
  diff --git a/1.txt b/1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   313
  1 hunks, 1 lines changed
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   314
  examine changes to '1.txt'? [Ynsfdaq?] 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   315
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   316
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   317
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   318
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   319
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   320
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   321
   5
13295
fb446228c0d4 record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents: 12934
diff changeset
   322
  record change 1/2 to '1.txt'? [Ynsfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   323
  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
   324
  1 hunks, 1 lines changed
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   325
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   326
  @@ -1,4 +1,4 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   327
  -hello world
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   328
  +hello world!
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   329
   
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   330
   someone
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   331
   up
13295
fb446228c0d4 record: do not include files into changes count
Patrick Mezard <pmezard@gmail.com>
parents: 12934
diff changeset
   332
  record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] 
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   333
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   334
After qrecord b.patch 'tip'
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
  $ hg tip -p
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   337
  changeset:   2:b056198bf878
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   338
  tag:         b.patch
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   339
  tag:         qtip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   340
  tag:         tip
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   341
  user:        test
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   342
  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
   343
  summary:     bbb
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   344
  
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   345
  diff -r 5d1ca63427ee -r b056198bf878 1.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   346
  --- 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
   347
  +++ 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
   348
  @@ -1,5 +1,5 @@
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   349
   1
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   350
   2 2
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   351
   3
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   352
  -4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   353
  +4 4
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   354
   5
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   355
  diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   356
  --- 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
   357
  +++ 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
   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
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   364
  
5933
28a79c259fcf qrecord: add tests
Kirill Smelkov <kirr@mns.spb.ru>
parents:
diff changeset
   365
12075
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   366
After qrecord b.patch 'diff'
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   367
f585c9bb85c1 tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 8167
diff changeset
   368
  $ hg diff --nodates