| SimonSapin | |
| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/pure/parsers.py (7 lines) |
| # a special value used internally for `size` if the file come from the other parent | # a special value used internally for `size` if the file come from the other parent | ||||
| FROM_P2 = -2 | FROM_P2 = -2 | ||||
| # a special value used internally for `size` if the file is modified/merged/added | # a special value used internally for `size` if the file is modified/merged/added | ||||
| NONNORMAL = -1 | NONNORMAL = -1 | ||||
| # a special value used internally for `time` if the time is ambigeous | |||||
| AMBIGUOUS_TIME = -1 | |||||
| class DirstateItem(object): | class DirstateItem(object): | ||||
| """represent a dirstate entry | """represent a dirstate entry | ||||
| It contains: | It contains: | ||||
| - state (one of 'n', 'a', 'r', 'm') | - state (one of 'n', 'a', 'r', 'm') | ||||
| - mode, | - mode, | ||||
| def pack_dirstate(dmap, copymap, pl, now): | def pack_dirstate(dmap, copymap, pl, now): | ||||
| now = int(now) | now = int(now) | ||||
| cs = stringio() | cs = stringio() | ||||
| write = cs.write | write = cs.write | ||||
| write(b"".join(pl)) | write(b"".join(pl)) | ||||
| for f, e in pycompat.iteritems(dmap): | for f, e in pycompat.iteritems(dmap): | ||||
| if e[0] == b'n' and e[3] == now: | if e.need_delay(now): | ||||
| # The file was last modified "simultaneously" with the current | # The file was last modified "simultaneously" with the current | ||||
| # write to dirstate (i.e. within the same second for file- | # write to dirstate (i.e. within the same second for file- | ||||
| # systems with a granularity of 1 sec). This commonly happens | # systems with a granularity of 1 sec). This commonly happens | ||||
| # for at least a couple of files on 'update'. | # for at least a couple of files on 'update'. | ||||
| # The user could change the file without changing its size | # The user could change the file without changing its size | ||||
| # within the same second. Invalidate the file's mtime in | # within the same second. Invalidate the file's mtime in | ||||
| # dirstate, forcing future 'status' calls to compare the | # dirstate, forcing future 'status' calls to compare the | ||||
| # contents of the file if the size is the same. This prevents | # contents of the file if the size is the same. This prevents | ||||
| # mistakenly treating such files as clean. | # mistakenly treating such files as clean. | ||||
| e = DirstateItem(e[0], e[1], e[2], -1) | e = DirstateItem(e.state, e.mode, e.size, AMBIGUOUS_TIME) | ||||
| dmap[f] = e | dmap[f] = e | ||||
| if f in copymap: | if f in copymap: | ||||
| f = b"%s\0%s" % (f, copymap[f]) | f = b"%s\0%s" % (f, copymap[f]) | ||||
| e = _pack( | e = _pack( | ||||
| b">cllll", | b">cllll", | ||||
| e.v1_state(), | e.v1_state(), | ||||
| e.v1_mode(), | e.v1_mode(), | ||||
| e.v1_size(), | e.v1_size(), | ||||
| e.v1_mtime(), | e.v1_mtime(), | ||||
| len(f), | len(f), | ||||
| ) | ) | ||||
| write(e) | write(e) | ||||
| write(f) | write(f) | ||||
| return cs.getvalue() | return cs.getvalue() | ||||