tests/test-censor2.t
author Arun Kulshreshtha <akulshreshtha@janestreet.com>
Tue, 30 Aug 2022 15:29:55 -0400
changeset 49491 c6a1beba27e9
parent 49166 77b5a190571c
child 51267 195ab99cf791
permissions -rw-r--r--
bisect: avoid copying ancestor list for non-merge commits During a bisection, hg needs to compute a list of all ancestors for every candidate commit. This is accomplished via a bottom-up traversal of the set of candidates, during which each revision's ancestor list is populated using the ancestor list of its parent(s). Previously, this involved copying the entire list, which could be very long in if the bisection range was large. To help improve this, we can observe that each candidate commit is visited exactly once, at which point its ancestor list is copied into its children's lists and then dropped. In the case of non-merge commits, a commit's ancestor list consists exactly of its parent's list plus itself. This means that we can trivially reuse the parent's existing list for one of its non-merge children, which avoids copying entirely if that commit is the parent's only child. This makes bisections over linear ranges of commits much faster. During some informal testing in the large publicly-available `mozilla-central` repository, this noticeably sped up bisections over large ranges of history: Setup: $ cd mozilla-central $ hg bisect --reset $ hg bisect --good 0 $ hg log -r tip -T '{rev}\n' 628417 Test: $ time hg bisect --bad tip --noupdate Before: real 3m35.927s user 3m35.553s sys 0m0.319s After: real 1m41.142s user 1m40.810s sys 0m0.285s
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