Show More
@@ -51,7 +51,13 b' class idirstate(interfaceutil.Interface)' | |||
|
51 | 51 | pass |
|
52 | 52 | |
|
53 | 53 | def flagfunc(buildfallback): |
|
54 | pass | |
|
54 | """build a callable that returns flags associated with a filename | |
|
55 | ||
|
56 | The information is extracted from three possible layers: | |
|
57 | 1. the file system if it supports the information | |
|
58 | 2. the "fallback" information stored in the dirstate if any | |
|
59 | 3. a more expensive mechanism inferring the flags from the parents. | |
|
60 | """ | |
|
55 | 61 | |
|
56 | 62 | def getcwd(): |
|
57 | 63 | """Return the path from which a canonical path is calculated. |
@@ -96,7 +102,7 b' class idirstate(interfaceutil.Interface)' | |||
|
96 | 102 | def setparents(p1, p2=None): |
|
97 | 103 | """Set dirstate parents to p1 and p2. |
|
98 | 104 | |
|
99 |
When moving from two parents to one, |
|
|
105 | When moving from two parents to one, "merged" entries a | |
|
100 | 106 | adjusted to normal and previous copy records discarded and |
|
101 | 107 | returned by the call. |
|
102 | 108 | |
@@ -147,7 +153,7 b' class idirstate(interfaceutil.Interface)' | |||
|
147 | 153 | pass |
|
148 | 154 | |
|
149 | 155 | def identity(): |
|
150 | """Return identity of dirstate it to detect changing in storage | |
|
156 | """Return identity of dirstate itself to detect changing in storage | |
|
151 | 157 | |
|
152 | 158 | If identity of previous dirstate is equal to this, writing |
|
153 | 159 | changes based on the former dirstate out can keep consistency. |
General Comments 0
You need to be logged in to leave comments.
Login now