1084 if p2 == nullid: |
1084 if p2 == nullid: |
1085 for f, s in sorted(self.dirstate.copies().items()): |
1085 for f, s in sorted(self.dirstate.copies().items()): |
1086 if f not in pctx and s not in pctx: |
1086 if f not in pctx and s not in pctx: |
1087 self.dirstate.copy(None, f) |
1087 self.dirstate.copy(None, f) |
1088 |
1088 |
1089 def filectx(self, path, changeid=None, fileid=None): |
1089 def filectx(self, path, changeid=None, fileid=None, changectx=None): |
1090 """changeid can be a changeset revision, node, or tag. |
1090 """changeid can be a changeset revision, node, or tag. |
1091 fileid can be a file revision or node.""" |
1091 fileid can be a file revision or node.""" |
1092 return context.filectx(self, path, changeid, fileid) |
1092 return context.filectx(self, path, changeid, fileid, |
|
1093 changectx=changectx) |
1093 |
1094 |
1094 def getcwd(self): |
1095 def getcwd(self): |
1095 return self.dirstate.getcwd() |
1096 return self.dirstate.getcwd() |
1096 |
1097 |
1097 def pathto(self, f, cwd=None): |
1098 def pathto(self, f, cwd=None): |