tests/test-check-config.t
author Martijn Pieters <mj@zopatista.com>
Tue, 31 Jul 2018 19:37:54 +0200
changeset 38781 0a57945aaf7f
parent 35393 4441705b7111
child 39707 5abc47d4ca6b
permissions -rw-r--r--
manifest: persist the manifestfulltext cache Reconstructing the manifest from the revlog takes time, so much so that there already is a LRU cache to avoid having to load a manifest multiple times. This patch persists that LRU cache in the .hg/cache directory, so we can re-use this cache across hg commands. Commit benchmark (run on Macos 10.13 on a 2017-model Macbook Pro with Core i7 2.9GHz and flash drive), testing without and with patch run 5 times, baseline is r2a227782e754: * committing to an existing file, against the mozilla-central repository. Baseline real time average 1.9692, with patch 1.3786. A new debugcommand "hg debugmanifestfulltextcache" lets you inspect the cache, clear it, or add specific manifest nodeids to it. When calling repo.updatecaches(), the manifest(s) for the working copy parents are added to the cache. The hg perfmanifest command has an additional --clear-disk switch to clear this cache when testing manifest loading performance. Using this command to test performance on the firefox repository for revision f947d902ed91, whose manifest has a delta chain length of 60540, we see: $ hg perfmanifest f947d902ed91 --clear-disk ! wall 0.972253 comb 0.970000 user 0.850000 sys 0.120000 (best of 10) $ hg debugmanifestfulltextcache -a `hg log --debug -r f947d902ed91 | grep manifest | cut -d: -f3` Cache contains 1 manifest entries, in order of most to least recent: id: 0294517df4aad07c70701db43bc7ff24c3ce7dbc, size 25.6 MB Total cache data size 25.6 MB, on-disk 0 bytes $ hg perfmanifest f947d902ed91 ! wall 0.036748 comb 0.040000 user 0.020000 sys 0.020000 (best of 100) Worst-case scenario: a manifest text loaded from a single delta; in the firefox repository manifest node 9a1246ff762e is the chain base for the manifest attached to revision f947d902ed91. Loading this from a full cache file is just as fast as without the cache; the extra node ids ensure a big full cache: $ for node in 9a1246ff762e 1a1922c14a3e 54a31d11a36a 0294517df4aa; do > hgd debugmanifestfulltextcache -a $node > /dev/null > done $ hgd perfmanifest -m 9a1246ff762e ! wall 0.077513 comb 0.080000 user 0.030000 sys 0.050000 (best of 100) $ hgd perfmanifest -m 9a1246ff762e --clear-disk ! wall 0.078547 comb 0.080000 user 0.070000 sys 0.010000 (best of 100)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25854
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
#require test-repo
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 27992
diff changeset
     3
  $ . "$TESTDIR/helpers-testrepo.sh"
32846
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     4
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     5
Sanity check check-config.py
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     6
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     7
  $ cat > testfile.py << EOF
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     8
  > # Good
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
     9
  > foo = ui.config('ui', 'username')
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    10
  > # Missing
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    11
  > foo = ui.config('ui', 'doesnotexist')
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    12
  > # Missing different type
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    13
  > foo = ui.configint('ui', 'missingint')
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    14
  > # Missing with default value
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    15
  > foo = ui.configbool('ui', 'missingbool1', default=True)
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    16
  > foo = ui.configbool('ui', 'missingbool2', False)
33195
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    17
  > # Inconsistent values for defaults.
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    18
  > foo = ui.configint('ui', 'intdefault', default=1)
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    19
  > foo = ui.configint('ui', 'intdefault', default=42)
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    20
  > # Can suppress inconsistent value error
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    21
  > foo = ui.configint('ui', 'intdefault2', default=1)
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    22
  > # inconsistent config: ui.intdefault2
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    23
  > foo = ui.configint('ui', 'intdefault2', default=42)
32846
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    24
  > EOF
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    25
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    26
  $ cat > files << EOF
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    27
  > mercurial/help/config.txt
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    28
  > $TESTTMP/testfile.py
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    29
  > EOF
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    30
25854
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    31
  $ cd "$TESTDIR"/..
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    32
32940
75be14993fda cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents: 32851
diff changeset
    33
  $ $PYTHON contrib/check-config.py < $TESTTMP/files
33195
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    34
  foo = ui.configint('ui', 'intdefault', default=42)
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    35
  conflict on ui.intdefault: ('int', '42') != ('int', '1')
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33570
diff changeset
    36
  at $TESTTMP/testfile.py:12:
32846
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    37
  undocumented: ui.doesnotexist (str)
33195
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    38
  undocumented: ui.intdefault (int) [42]
5d8942dbe49e check-config: syntax to allow inconsistent config values
Gregory Szorc <gregory.szorc@gmail.com>
parents: 33116
diff changeset
    39
  undocumented: ui.intdefault2 (int) [42]
32846
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    40
  undocumented: ui.missingbool1 (bool) [True]
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    41
  undocumented: ui.missingbool2 (bool)
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    42
  undocumented: ui.missingint (int)
7c11869cf23a tests: add test coverage for check-config
Gregory Szorc <gregory.szorc@gmail.com>
parents: 29219
diff changeset
    43
25854
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    44
New errors are not allowed. Warnings are strongly discouraged.
eabba9c75061 tests: add a check-config pass
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    45
33204
ddd65b4f3ae6 tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents: 33195
diff changeset
    46
  $ testrepohg files "set:(**.py or **.txt) - tests/**" | sed 's|\\|/|g' |
32940
75be14993fda cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents: 32851
diff changeset
    47
  >   $PYTHON contrib/check-config.py