tests/test-fileset-generated.t
author Durham Goode <durham@fb.com>
Fri, 03 Apr 2015 15:18:34 -0700
changeset 24625 2cebf17c0fcc
parent 24438 5b85a5bc5bbb
child 24813 2553ef7355ab
permissions -rw-r--r--
copies: pass changectx instead of manifest to _computenonoverlap The _computenonoverlap function takes two manifests to allow extensions to hook in and read the manifest nodes produced by the function. The remotefilelog extension actually needs the entire changectx instead (which includes the manifest) so it can prefetch the subset of files necessary for a sparse checkout (and the sparse checkout depends on which commit is being accessed, hence the need for the changectx). I have tests in the remotefilelog extension that cover this.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     1
  $ hg init
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     2
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     3
Set up history and working copy
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     4
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     5
  $ python $TESTDIR/generate-working-copy-states.py state 2 1
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     6
  $ hg addremove -q --similarity 0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     7
  $ hg commit -m first
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     8
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
     9
  $ python $TESTDIR/generate-working-copy-states.py state 2 2
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    10
  $ hg addremove -q --similarity 0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    11
  $ hg commit -m second
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    12
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    13
  $ python $TESTDIR/generate-working-copy-states.py state 2 wc
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    14
  $ hg addremove -q --similarity 0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    15
  $ hg forget *_*_*-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    16
  $ rm *_*_missing-*
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    17
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    18
Test status
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    19
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    20
  $ hg st -A 'set:modified()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    21
  M content1_content1_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    22
  M content1_content2_content1-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    23
  M content1_content2_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    24
  M missing_content2_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    25
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    26
  $ hg st -A 'set:added()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    27
  A content1_missing_content1-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    28
  A content1_missing_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    29
  A missing_missing_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    30
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    31
  $ hg st -A 'set:removed()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    32
  R content1_content1_content1-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    33
  R content1_content1_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    34
  R content1_content1_missing-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    35
  R content1_content2_content1-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    36
  R content1_content2_content2-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    37
  R content1_content2_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    38
  R content1_content2_missing-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    39
  R missing_content2_content2-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    40
  R missing_content2_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    41
  R missing_content2_missing-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    42
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    43
  $ hg st -A 'set:deleted()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    44
  ! content1_content1_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    45
  ! content1_content2_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    46
  ! content1_missing_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    47
  ! missing_content2_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    48
  ! missing_missing_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    49
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    50
  $ hg st -A 'set:unknown()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    51
  ? content1_missing_content1-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    52
  ? content1_missing_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    53
  ? missing_missing_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    54
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    55
  $ hg st -A 'set:clean()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    56
  C content1_content1_content1-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    57
  C content1_content2_content2-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    58
  C missing_content2_content2-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    59
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    60
Test log
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    61
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    62
  $ hg log -T '{rev}\n' --stat 'set:modified()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    63
  1
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    64
   content1_content2_content1-tracked |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    65
   content1_content2_content3-tracked |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    66
   missing_content2_content3-tracked  |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    67
   3 files changed, 3 insertions(+), 2 deletions(-)
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    68
  
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    69
  0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    70
   content1_content1_content3-tracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    71
   content1_content2_content1-tracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    72
   content1_content2_content3-tracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    73
   3 files changed, 3 insertions(+), 0 deletions(-)
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    74
  
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    75
  $ hg log -T '{rev}\n' --stat 'set:added()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    76
  1
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    77
   content1_missing_content1-tracked |  1 -
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    78
   content1_missing_content3-tracked |  1 -
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    79
   2 files changed, 0 insertions(+), 2 deletions(-)
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    80
  
23950
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
    81
  0
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
    82
   content1_missing_content1-tracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
    83
   content1_missing_content3-tracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
    84
   2 files changed, 2 insertions(+), 0 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
    85
  
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    86
  $ hg log -T '{rev}\n' --stat 'set:removed()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    87
  1
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    88
   content1_content2_content1-untracked |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    89
   content1_content2_content2-untracked |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    90
   content1_content2_content3-untracked |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    91
   content1_content2_missing-untracked  |  2 +-
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    92
   missing_content2_content2-untracked  |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    93
   missing_content2_content3-untracked  |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    94
   missing_content2_missing-untracked   |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    95
   7 files changed, 7 insertions(+), 4 deletions(-)
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    96
  
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    97
  0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    98
   content1_content1_content1-untracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
    99
   content1_content1_content3-untracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   100
   content1_content1_missing-untracked  |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   101
   content1_content2_content1-untracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   102
   content1_content2_content2-untracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   103
   content1_content2_content3-untracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   104
   content1_content2_missing-untracked  |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   105
   7 files changed, 7 insertions(+), 0 deletions(-)
23950
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   106
  
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   107
  $ hg log -T '{rev}\n' --stat 'set:deleted()'
23950
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   108
  1
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   109
   content1_content2_missing-tracked |  2 +-
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   110
   content1_missing_missing-tracked  |  1 -
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   111
   missing_content2_missing-tracked  |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   112
   3 files changed, 2 insertions(+), 2 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   113
  
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   114
  0
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   115
   content1_content1_missing-tracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   116
   content1_content2_missing-tracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   117
   content1_missing_missing-tracked  |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   118
   3 files changed, 3 insertions(+), 0 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   119
  
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   120
  $ hg log -T '{rev}\n' --stat 'set:unknown()'
23950
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   121
  1
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   122
   content1_missing_content1-untracked |  1 -
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   123
   content1_missing_content3-untracked |  1 -
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   124
   2 files changed, 0 insertions(+), 2 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   125
  
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   126
  0
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   127
   content1_missing_content1-untracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   128
   content1_missing_content3-untracked |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   129
   2 files changed, 2 insertions(+), 0 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   130
  
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   131
  $ hg log -T '{rev}\n' --stat 'set:clean()'
23950
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   132
  1
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   133
   content1_content2_content2-tracked |  2 +-
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   134
   missing_content2_content2-tracked  |  1 +
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   135
   2 files changed, 2 insertions(+), 1 deletions(-)
caff3675cba5 log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents: 23949
diff changeset
   136
  
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   137
  0
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   138
   content1_content1_content1-tracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   139
   content1_content2_content2-tracked |  1 +
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   140
   2 files changed, 2 insertions(+), 0 deletions(-)
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   141
  
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   142
Test revert
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   143
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   144
  $ hg revert 'set:modified()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   145
  reverting content1_content1_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   146
  reverting content1_content2_content1-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   147
  reverting content1_content2_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   148
  reverting missing_content2_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   149
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   150
  $ hg revert 'set:added()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   151
  forgetting content1_missing_content1-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   152
  forgetting content1_missing_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   153
  forgetting missing_missing_content3-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   154
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   155
  $ hg revert 'set:removed()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   156
  undeleting content1_content1_content1-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   157
  undeleting content1_content1_content3-untracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   158
  undeleting content1_content1_missing-untracked
24438
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   159
  undeleting content1_content2_content1-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   160
  undeleting content1_content2_content2-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   161
  undeleting content1_content2_content3-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   162
  undeleting content1_content2_missing-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   163
  undeleting missing_content2_content2-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   164
  undeleting missing_content2_content3-untracked
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   165
  undeleting missing_content2_missing-untracked
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   166
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   167
  $ hg revert 'set:deleted()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   168
  reverting content1_content1_missing-tracked
24438
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   169
  reverting content1_content2_missing-tracked
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   170
  forgetting content1_missing_missing-tracked
24438
5b85a5bc5bbb revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents: 23950
diff changeset
   171
  reverting missing_content2_missing-tracked
23949
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   172
  forgetting missing_missing_missing-tracked
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   173
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   174
  $ hg revert 'set:unknown()'
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   175
8efb7130a519 fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset
   176
  $ hg revert 'set:clean()'