Mercurial > hg
view tests/mockmakedate.py @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
line wrap: on
line source
# mock out util.makedate() to supply testable values from __future__ import absolute_import import os from mercurial import pycompat from mercurial.utils import dateutil def mockmakedate(): filename = os.path.join(os.environ['TESTTMP'], 'testtime') try: with open(filename, 'rb') as timef: time = float(timef.read()) + 1 except IOError: time = 0.0 with open(filename, 'wb') as timef: timef.write(pycompat.bytestr(time)) return (time, 0) dateutil.makedate = mockmakedate