Show More
@@ -1051,8 +1051,7 b' class committablectx(basectx):' | |||
|
1051 | 1051 | |
|
1052 | 1052 | copied = self._repo.dirstate.copies() |
|
1053 | 1053 | ff = self._flagfunc |
|
1054 | modified, added, removed, deleted = self._status[:4] | |
|
1055 | for i, l in (("a", added), ("m", modified)): | |
|
1054 | for i, l in (("a", self._status.added), ("m", self._status.modified)): | |
|
1056 | 1055 | for f in l: |
|
1057 | 1056 | orig = copied.get(f, f) |
|
1058 | 1057 | man[f] = getman(orig).get(orig, nullid) + i |
@@ -1061,7 +1060,7 b' class committablectx(basectx):' | |||
|
1061 | 1060 | except OSError: |
|
1062 | 1061 | pass |
|
1063 | 1062 | |
|
1064 | for f in deleted + removed: | |
|
1063 | for f in self._status.deleted + self._status.removed: | |
|
1065 | 1064 | if f in man: |
|
1066 | 1065 | del man[f] |
|
1067 | 1066 | |
@@ -1089,22 +1088,23 b' class committablectx(basectx):' | |||
|
1089 | 1088 | def description(self): |
|
1090 | 1089 | return self._text |
|
1091 | 1090 | def files(self): |
|
1092 |
return sorted(self._status |
|
|
1091 | return sorted(self._status.modified + self._status.added + | |
|
1092 | self._status.removed) | |
|
1093 | 1093 | |
|
1094 | 1094 | def modified(self): |
|
1095 |
return self._status |
|
|
1095 | return self._status.modified | |
|
1096 | 1096 | def added(self): |
|
1097 |
return self._status |
|
|
1097 | return self._status.added | |
|
1098 | 1098 | def removed(self): |
|
1099 |
return self._status |
|
|
1099 | return self._status.removed | |
|
1100 | 1100 | def deleted(self): |
|
1101 |
return self._status |
|
|
1101 | return self._status.deleted | |
|
1102 | 1102 | def unknown(self): |
|
1103 |
return self._status |
|
|
1103 | return self._status.unknown | |
|
1104 | 1104 | def ignored(self): |
|
1105 |
return self._status |
|
|
1105 | return self._status.ignored | |
|
1106 | 1106 | def clean(self): |
|
1107 |
return self._status |
|
|
1107 | return self._status.clean | |
|
1108 | 1108 | def branch(self): |
|
1109 | 1109 | return encoding.tolocal(self._extra['branch']) |
|
1110 | 1110 | def closesbranch(self): |
@@ -1407,7 +1407,7 b' class workingctx(committablectx):' | |||
|
1407 | 1407 | susposed to be linking to. |
|
1408 | 1408 | """ |
|
1409 | 1409 | s[0] = self._filtersuspectsymlink(s[0]) |
|
1410 |
self._status = s |
|
|
1410 | self._status = scmutil.status(*s) | |
|
1411 | 1411 | return s |
|
1412 | 1412 | |
|
1413 | 1413 | def _dirstatestatus(self, match=None, ignored=False, clean=False, |
@@ -1613,7 +1613,7 b' class memctx(committablectx):' | |||
|
1613 | 1613 | p1, p2 = parents |
|
1614 | 1614 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
|
1615 | 1615 | files = sorted(set(files)) |
|
1616 |
self._status = |
|
|
1616 | self._status = scmutil.status(files, [], [], [], [], [], []) | |
|
1617 | 1617 | self._filectxfn = filectxfn |
|
1618 | 1618 | self.substate = {} |
|
1619 | 1619 |
General Comments 0
You need to be logged in to leave comments.
Login now