Mercurial > hg
annotate tests/mocktime.py @ 46100:a771ffc378a8
simplemerge: write output only once it's complete
`simplemerge()` can write either to `ui.fout` or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.
Differential Revision: https://phab.mercurial-scm.org/D9550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Dec 2020 00:00:19 -0800 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
rev | line source |
---|---|
34316 | 1 from __future__ import absolute_import |
2 | |
3 import os | |
4 import time | |
5 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34316
diff
changeset
|
6 |
34316 | 7 class mocktime(object): |
8 def __init__(self, increment): | |
9 self.time = 0 | |
10 self.increment = [float(s) for s in increment.split()] | |
11 self.pos = 0 | |
12 | |
13 def __call__(self): | |
14 self.time += self.increment[self.pos % len(self.increment)] | |
15 self.pos += 1 | |
16 return self.time | |
17 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
34316
diff
changeset
|
18 |
34316 | 19 def uisetup(ui): |
20 time.time = mocktime(os.environ.get('MOCKTIME', '0.1')) |