equal
deleted
inserted
replaced
1061 |
1061 |
1062 @propertycache |
1062 @propertycache |
1063 def _manifest(self): |
1063 def _manifest(self): |
1064 """generate a manifest corresponding to the values in self._status""" |
1064 """generate a manifest corresponding to the values in self._status""" |
1065 |
1065 |
1066 man = self._parents[0].manifest().copy() |
1066 man1 = self._parents[0].manifest() |
|
1067 man = man1.copy() |
1067 if len(self._parents) > 1: |
1068 if len(self._parents) > 1: |
1068 man2 = self.p2().manifest() |
1069 man2 = self.p2().manifest() |
1069 def getman(f): |
1070 def getman(f): |
1070 if f in man: |
1071 if f in man1: |
1071 return man |
1072 return man1 |
1072 return man2 |
1073 return man2 |
1073 else: |
1074 else: |
1074 getman = lambda f: man |
1075 getman = lambda f: man1 |
1075 |
1076 |
1076 copied = self._repo.dirstate.copies() |
1077 copied = self._repo.dirstate.copies() |
1077 ff = self._flagfunc |
1078 ff = self._flagfunc |
1078 for i, l in (("a", self._status.added), ("m", self._status.modified)): |
1079 for i, l in (("a", self._status.added), ("m", self._status.modified)): |
1079 for f in l: |
1080 for f in l: |