Mercurial > hg-stable
changeset 48124:fabf687df0ff
dirstate-item: update the attribute documentation
It was very outdated. We are about to change these attribute so we should has
well have them documented so that the change get easier to grasp.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 29 Sep 2021 01:23:10 +0200 |
| parents | d73b42f905f8 |
| children | e2da3ec94169 |
| files | mercurial/pure/parsers.py |
| diffstat | 1 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Fri Oct 01 03:50:37 2021 +0200 +++ b/mercurial/pure/parsers.py Wed Sep 29 01:23:10 2021 +0200 @@ -48,12 +48,28 @@ class DirstateItem(object): """represent a dirstate entry - It contains: + It hold multiple attributes + + # about file tracking + - wc_tracked: is the file tracked by the working copy + - p1_tracked: is the file tracked in working copy first parent + - p2_tracked: is the file tracked in working copy second parent - - state (one of 'n', 'a', 'r', 'm') - - mode, - - size, - - mtime, + # about what possible merge action related to this file + - clean_p1: merge picked the file content from p1 + - clean_p2: merge picked the file content from p2 + - merged: file gather changes from both side. + + # about the file state expected from p1 manifest: + - mode: the file mode in p1 + - size: the file size in p1 + + # about the file state on disk last time we saw it: + - mtime: the last known clean mtime for the file. + + The last three item (mode, size and mtime) can be None if no meaningful (or + trusted) value exists. + """ _wc_tracked = attr.ib()