tests/test-censor2.t
author Anton Shestakov <av6@dwimlabs.net>
Thu, 12 May 2022 13:53:50 +0400
branchstable
changeset 49315 2f326ea19fbc
parent 49166 77b5a190571c
child 51267 195ab99cf791
permissions -rw-r--r--
logcmdutil: use the same data as {file*} template keywords (issue6642) Since 0c72eddb4be5 template keywords that show files use a different source of data than ctx.p1().status(ctx). These two functions in logcmdutil also show file lists when needed (e.g. log with --debug flag), but previously they used the old way of just looking at status compared to p1 and it resulted in differences between e.g. hg log --debug and hg log -T '{file*}'. test-phases.t needs an adjustment because 7 is a merge commit of two topological branches and one of them introduces files C, D and E.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
49165
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     2
  > [censor]
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     3
  > policy=ignore
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     4
  > EOF
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     5
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     6
  $ mkdir r
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     7
  $ cd r
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     8
  $ hg init
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
     9
  $ echo secret > target
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    10
  $ hg commit -Am "secret"
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    11
  adding target
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    12
  $ touch bystander
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    13
  $ hg commit -Am "innocent"
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    14
  adding bystander
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    15
  $ echo erased-secret > target
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    16
  $ hg commit -m "erased secret"
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    17
  $ hg censor target --config extensions.censor= -r ".^^"
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    18
  $ hg update ".^"
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    19
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    20
  $ cat target
72936be2a21b censor: demonstrate a bug
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff changeset
    21
  $ hg update tip
49166
77b5a190571c censor: fix [hg update] away from a revision with censored files
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49165
diff changeset
    22
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved