Mercurial > hg

annotate tests/sitecustomize.py @ 23482:208ec8ca7c79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make 'keep' message more descriptive Most merge action messages don't describe the action itself, they describe the reason the action was taken. The only exeption is the 'k' action, for which the message is just "keep" and instead there is a code comment folling it that says "remote unchanged". Let's move that comment into the merge action message.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 03 Dec 2014 14:03:20 -0800
parents 0b21ae0a2366
children 031947baf4d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10648
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
1 try:
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
2 import coverage
14971
0b21ae0a2366 tests: use getattr instead of hasattr
Augie Fackler <durin42@gmail.com>
parents: 10648
diff changeset
3 getattr(coverage, 'process_startup', lambda: None)()
10648
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
4 except ImportError:
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
5 pass