equal
deleted
inserted
replaced
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: |