Show More
@@ -48,12 +48,28 b' AMBIGUOUS_TIME = -1' | |||||
48 | class DirstateItem(object): |
|
48 | class DirstateItem(object): | |
49 | """represent a dirstate entry |
|
49 | """represent a dirstate entry | |
50 |
|
50 | |||
51 | It contains: |
|
51 | It hold multiple attributes | |
|
52 | ||||
|
53 | # about file tracking | |||
|
54 | - wc_tracked: is the file tracked by the working copy | |||
|
55 | - p1_tracked: is the file tracked in working copy first parent | |||
|
56 | - p2_tracked: is the file tracked in working copy second parent | |||
52 |
|
57 | |||
53 | - state (one of 'n', 'a', 'r', 'm') |
|
58 | # about what possible merge action related to this file | |
54 | - mode, |
|
59 | - clean_p1: merge picked the file content from p1 | |
55 | - size, |
|
60 | - clean_p2: merge picked the file content from p2 | |
56 | - mtime, |
|
61 | - merged: file gather changes from both side. | |
|
62 | ||||
|
63 | # about the file state expected from p1 manifest: | |||
|
64 | - mode: the file mode in p1 | |||
|
65 | - size: the file size in p1 | |||
|
66 | ||||
|
67 | # about the file state on disk last time we saw it: | |||
|
68 | - mtime: the last known clean mtime for the file. | |||
|
69 | ||||
|
70 | The last three item (mode, size and mtime) can be None if no meaningful (or | |||
|
71 | trusted) value exists. | |||
|
72 | ||||
57 | """ |
|
73 | """ | |
58 |
|
74 | |||
59 | _wc_tracked = attr.ib() |
|
75 | _wc_tracked = attr.ib() |
General Comments 0
You need to be logged in to leave comments.
Login now