Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 48260:269ff8978086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: store mtimes with nanosecond precision in memory Keep integer seconds since the Unix epoch, together with integer nanoseconds in the `0 <= n < 1e9` range. For now, nanoseconds are still always zero. This commit is about data structure changes. Differential Revision: https://phab.mercurial-scm.org/D11684
author Simon Sapin <simon.sapin@octobus.net>
date Mon, 18 Oct 2021 11:23:07 +0200
parents c8d6e23fb14a
children 96aa3a68d3b5
comparison
equal deleted inserted replaced
48259:84f6b0c41b90 48260:269ff8978086
7 7
8 from __future__ import absolute_import 8 from __future__ import absolute_import
9 9
10 import collections 10 import collections
11 import errno 11 import errno
12 import stat
13 import struct 12 import struct
14 13
15 from .i18n import _ 14 from .i18n import _
16 from .node import nullrev 15 from .node import nullrev
17 from .thirdparty import attr 16 from .thirdparty import attr
18 from .utils import stringutil 17 from .utils import stringutil
18 from .dirstateutils import timestamp
19 from . import ( 19 from . import (
20 copies, 20 copies,
21 encoding, 21 encoding,
22 error, 22 error,
23 filemerge, 23 filemerge,
1404 atomictemp=atomictemp, 1404 atomictemp=atomictemp,
1405 ) 1405 )
1406 if wantfiledata: 1406 if wantfiledata:
1407 s = wfctx.lstat() 1407 s = wfctx.lstat()
1408 mode = s.st_mode 1408 mode = s.st_mode
1409 mtime = s[stat.ST_MTIME] 1409 mtime = timestamp.mtime_of(s)
1410 filedata[f] = (mode, size, mtime) # for dirstate.normal 1410 # for dirstate.update_file's parentfiledata argument:
1411 filedata[f] = (mode, size, mtime)
1411 if i == 100: 1412 if i == 100:
1412 yield False, (i, f) 1413 yield False, (i, f)
1413 i = 0 1414 i = 0
1414 i += 1 1415 i += 1
1415 if i > 0: 1416 if i > 0: