Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 48271: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
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 19 21:03:13 2021 +0200
+++ b/mercurial/merge.py	Mon Oct 18 11:23:07 2021 +0200
@@ -9,13 +9,13 @@
 
 import collections
 import errno
-import stat
 import struct
 
 from .i18n import _
 from .node import nullrev
 from .thirdparty import attr
 from .utils import stringutil
+from .dirstateutils import timestamp
 from . import (
     copies,
     encoding,
@@ -1406,8 +1406,9 @@
             if wantfiledata:
                 s = wfctx.lstat()
                 mode = s.st_mode
-                mtime = s[stat.ST_MTIME]
-                filedata[f] = (mode, size, mtime)  # for dirstate.normal
+                mtime = timestamp.mtime_of(s)
+                # for dirstate.update_file's parentfiledata argument:
+                filedata[f] = (mode, size, mtime)
             if i == 100:
                 yield False, (i, f)
                 i = 0