tests/test-archive-symlinks.t
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Tue, 02 Jul 2019 12:59:58 -0400
changeset 42621 99ebde4fec99
parent 29844 c4d03b6d9576
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:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 21216
diff changeset
     1
#require symlink
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     2
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     3
  $ origdir=`pwd`
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     4
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     5
  $ hg init repo
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     6
  $ cd repo
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     7
  $ ln -s nothing dangling
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     8
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
     9
avoid tar warnings about old timestamp
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    10
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    11
  $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    12
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    13
  $ hg archive -t files ../archive
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    14
  $ hg archive -t tar -p tar ../archive.tar
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    15
  $ hg archive -t zip -p zip ../archive.zip
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    16
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    17
files
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    18
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    19
  $ cd "$origdir"
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    20
  $ cd archive
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 22046
diff changeset
    21
  $ readlink.py dangling
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    22
  dangling -> nothing
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    23
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    24
tar
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    25
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    26
  $ cd "$origdir"
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    27
  $ tar xf archive.tar
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    28
  $ cd tar
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 22046
diff changeset
    29
  $ readlink.py dangling
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    30
  dangling -> nothing
4831
6f08bc1bd00b archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    31
29844
c4d03b6d9576 tests: guard test-archive-symlink with unziplinks check
Augie Fackler <augie@google.com>
parents: 25472
diff changeset
    32
#if unziplinks
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    33
zip
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    34
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    35
  $ cd "$origdir"
21216
6d632cf8a811 tests: suppress spurious lchmod error from unzip (issue4088)
Matt Mackall <mpm@selenic.com>
parents: 16913
diff changeset
    36
  $ unzip archive.zip > /dev/null 2>&1
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    37
  $ cd zip
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 22046
diff changeset
    38
  $ readlink.py dangling
11854
aa2abde72da1 tests: unify test-archive-symlinks
Martin Geisler <mg@lazybytes.net>
parents: 5683
diff changeset
    39
  dangling -> nothing
29844
c4d03b6d9576 tests: guard test-archive-symlink with unziplinks check
Augie Fackler <augie@google.com>
parents: 25472
diff changeset
    40
#endif
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
    41
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
    42
  $ cd ..