tests/test-hgk.t
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Tue, 02 Jul 2019 12:59:58 -0400
changeset 42621 99ebde4fec99
parent 23451 5fb1fc2e1281
permissions -rw-r--r--
commit: improve the files field of changelog for merges Currently, the files list of merge commits repeats all the deletions (either actual deletions, or files that got renamed) that happened between base and p2 of the merge. If p2 is the main branch, the list can easily be much bigger than the change being merged. This results in various problems worth improving: - changelog is bigger than necessary - `hg log directory` lists many unrelated merge commits, and `hg log -v -r commit` frequently fills multiple screens worth of files - it possibly slows down adjustlinkrev, by forcing it to read more manifests, and that function can certainly be a bottleneck - the server side of pulls can waste a lot of time simply opening the filelogs for pointless files (the constant factors for opening even a tiny filelog is apparently pretty bad) So stop listing such files as described in the code. Impacted merge commits and their descendants get a different hash than they would have without this. This doesn't seem problematic, except for convert. The previous commit helped with that in the hg->hg case (but if you do svn->hg twice from scratch, hashes can still change). The rest of the description is numbers. I don't have much to report, because recreating the files list of existing repositories is not easy: - debugupgradeformat and bundle/unbundle don't recreate the list - export/import tends to choke quickly applying patches or on description that contain diffs, - merge commits from the convert extension don't have the right files list for reasons orthogonal to the current commit - replaying the merge with hg update/hg merge/hg revert --all/hg commit can end up failing in hg revert - I wasn't sure that using debugsetparents + debugrebuilddirstate would really build the right thing I measured commit time before and after this change, in a case with no files filtered out, several files filtered out (no difference) and 5k files filtered out (+1% time). Recreating the 100 more recent merges in a private repo, the concatenated uncompressed files lists goes from 1.12MB to 0.52MB. Excluding 3 merges that are not representative, then the size goes from 570k to 15k. I converted part of mozilla-central, and observed file list shrinking quite a bit too, starting at the very first merge, 733641d9feaf, going from 550 files to 10 files (although they have relatively few merges, so they probably wouldn't care). Differential Revision: https://phab.mercurial-scm.org/D6613
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     1
Minimal hgk check
6800
cc7114d96548 hgk: ctx.parents() problem introduced by 2d54e7c1e69d
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     2
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     3
  $ echo "[extensions]" >> $HGRCPATH
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     4
  $ echo "hgk=" >> $HGRCPATH
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     5
  $ hg init repo
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     6
  $ cd repo
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     7
  $ echo a > a
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     8
  $ hg ci -Am adda
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
     9
  adding a
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    10
  $ hg debug-cat-file commit 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    11
  tree a0c8bcbbb45c
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    12
  parent 000000000000
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    13
  author test 0 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    14
  revision 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    15
  branch default
18807
cf72fd8b3072 hgk: add support for phases
Andrew Shadura <bugzilla@tut.by>
parents: 17959
diff changeset
    16
  phase draft
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    17
  
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
    18
  adda
23451
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    19
  $ echo b > b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    20
  $ hg ci -Am addb
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    21
  adding b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    22
  $ hg log -T '{node}\n'
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    23
  102a90ea7b4a3361e4082ed620918c261189a36a
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    24
  07f4944404050f47db2e5c5071e0e84e7a27bba9
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    25
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    26
  $ hg debug-diff-tree 07f494440405 102a90ea7b4a
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    27
  :000000 100664 000000000000 1e88685f5dde N	b	b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    28
  $ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    29
  diff --git a/b b/b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    30
  new file mode 100644
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    31
  --- /dev/null
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    32
  +++ b/b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    33
  @@ -0,0 +1,1 @@
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    34
  +b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    35
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    36
Ensure that diff-tree output isn't affected by diffopts
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    37
  $ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    38
  :000000 100664 000000000000 1e88685f5dde N	b	b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    39
  $ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    40
  diff --git a/b b/b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    41
  new file mode 100644
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    42
  --- /dev/null
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    43
  +++ b/b
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    44
  @@ -0,0 +1,1 @@
5fb1fc2e1281 hgk: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 18807
diff changeset
    45
  +b
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12431
diff changeset
    46
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12431
diff changeset
    47
  $ cd ..