##// END OF EJS Templates
context.status: make _dirstatestatus() return an status tuple...
Martin von Zweigbergk -
r23302:24f67ad4 default
parent child Browse files
Show More
@@ -129,7 +129,8 b' class basectx(object):'
129 unknown = [fn for fn in unknown if fn not in mf1]
129 unknown = [fn for fn in unknown if fn not in mf1]
130 ignored = [fn for fn in ignored if fn not in mf1]
130 ignored = [fn for fn in ignored if fn not in mf1]
131
131
132 return [modified, added, removed, deleted, unknown, ignored, clean]
132 return scmutil.status(modified, added, removed, deleted, unknown,
133 ignored, clean)
133
134
134 @propertycache
135 @propertycache
135 def substate(self):
136 def substate(self):
@@ -304,7 +305,6 b' class basectx(object):'
304 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
305 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
305 listunknown)
306 listunknown)
306
307
307 r = scmutil.status(*r)
308 if reversed:
308 if reversed:
309 # Reverse added and removed. Clear deleted, unknown and ignored as
309 # Reverse added and removed. Clear deleted, unknown and ignored as
310 # these make no sense to reverse.
310 # these make no sense to reverse.
@@ -1419,7 +1419,8 b' class workingctx(committablectx):'
1419 if fixup and listclean:
1419 if fixup and listclean:
1420 clean += fixup
1420 clean += fixup
1421
1421
1422 return [modified, added, removed, deleted, unknown, ignored, clean]
1422 return scmutil.status(modified, added, removed, deleted, unknown,
1423 ignored, clean)
1423
1424
1424 def _buildstatus(self, other, s, match, listignored, listclean,
1425 def _buildstatus(self, other, s, match, listignored, listclean,
1425 listunknown):
1426 listunknown):
@@ -1434,12 +1435,12 b' class workingctx(committablectx):'
1434 # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
1435 # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
1435 # might have accidentally ended up with the entire contents of the file
1436 # might have accidentally ended up with the entire contents of the file
1436 # they are susposed to be linking to.
1437 # they are susposed to be linking to.
1437 s[0] = self._filtersuspectsymlink(s[0])
1438 s.modified[:] = self._filtersuspectsymlink(s.modified)
1438 if other != self._repo['.']:
1439 if other != self._repo['.']:
1439 s = super(workingctx, self)._buildstatus(other, s, match,
1440 s = super(workingctx, self)._buildstatus(other, s, match,
1440 listignored, listclean,
1441 listignored, listclean,
1441 listunknown)
1442 listunknown)
1442 self._status = scmutil.status(*s)
1443 self._status = s
1443 return s
1444 return s
1444
1445
1445 def _matchstatus(self, other, match):
1446 def _matchstatus(self, other, match):
General Comments 0
You need to be logged in to leave comments. Login now