tests/test-merge2.t
author Arun Kulshreshtha <akulshreshtha@janestreet.com>
Tue, 30 Aug 2022 15:29:55 -0400
changeset 49491 c6a1beba27e9
parent 45827 8d72e29ad1e0
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:
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
     1
  $ hg init t
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     2
  $ cd t
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     3
  $ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     4
  $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
     5
  $ hg commit -m "commit #0"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     6
  $ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     7
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
     8
  $ hg commit -m "commit #1"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
     9
  $ rm b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    10
  $ hg update 0
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    11
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    12
  $ echo This is file b2 > b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    13
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    14
  $ hg commit -m "commit #2"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    15
  created new head
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    16
  $ cd ..; rm -r t
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    17
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    18
  $ mkdir t
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    19
  $ cd t
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    20
  $ hg init
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    21
  $ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    22
  $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    23
  $ hg commit -m "commit #0"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    24
  $ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    25
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    26
  $ hg commit -m "commit #1"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    27
  $ rm b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    28
  $ hg update 0
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    29
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    30
  $ echo This is file b2 > b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    31
  $ hg commit -A -m "commit #2"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    32
  adding b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    33
  created new head
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    34
  $ cd ..; rm -r t
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
    35
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
    36
  $ hg init t
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    37
  $ cd t
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    38
  $ echo This is file a1 > a
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    39
  $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    40
  $ hg commit -m "commit #0"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    41
  $ echo This is file b1 > b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    42
  $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    43
  $ hg commit -m "commit #1"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    44
  $ rm b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    45
  $ hg remove b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    46
  $ hg update 0
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    47
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    48
  $ echo This is file b2 > b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11976
diff changeset
    49
  $ hg commit -A -m "commit #2"
11976
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    50
  adding b
b28fc3b3efd6 tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3988
diff changeset
    51
  created new head
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 13956
diff changeset
    52
44177
1850066f9e36 merge: don't auto-pick destination with `hg merge 'wdir()'`
Martin von Zweigbergk <martinvonz@google.com>
parents: 16913
diff changeset
    53
  $ hg merge 'wdir()'
1850066f9e36 merge: don't auto-pick destination with `hg merge 'wdir()'`
Martin von Zweigbergk <martinvonz@google.com>
parents: 16913
diff changeset
    54
  abort: merging with the working copy has no effect
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 44177
diff changeset
    55
  [10]
44177
1850066f9e36 merge: don't auto-pick destination with `hg merge 'wdir()'`
Martin von Zweigbergk <martinvonz@google.com>
parents: 16913
diff changeset
    56
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 13956
diff changeset
    57
  $ cd ..