##// END OF EJS Templates
context.status: pass status tuple into _buildstatus...
Martin von Zweigbergk -
r23304:dd3f8575 default
parent child Browse files
Show More
@@ -108,7 +108,7 b' class basectx(object):'
108 108 mf2 = self._manifestmatches(match, s)
109 109
110 110 modified, added, clean = [], [], []
111 deleted, unknown, ignored = s[3], s[4], s[5]
111 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
112 112 deletedset = set(deleted)
113 113 withflags = mf1.withflags() | mf2.withflags()
114 114 for fn, mf2node in mf2.iteritems():
@@ -301,7 +301,7 b' class basectx(object):'
301 301 ctx1, ctx2 = ctx2, ctx1
302 302
303 303 match = ctx2._matchstatus(ctx1, match)
304 r = [[], [], [], [], [], [], []]
304 r = scmutil.status([], [], [], [], [], [], [])
305 305 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
306 306 listunknown)
307 307
@@ -1389,11 +1389,10 b' class workingctx(committablectx):'
1389 1389 need to build a manifest and return what matches.
1390 1390 """
1391 1391 mf = self._repo['.']._manifestmatches(match, s)
1392 modified, added, removed = s[0:3]
1393 for f in modified + added:
1392 for f in s.modified + s.added:
1394 1393 mf[f] = None
1395 1394 mf.setflag(f, self.flags(f))
1396 for f in removed:
1395 for f in s.removed:
1397 1396 if f in mf:
1398 1397 del mf[f]
1399 1398 return mf
General Comments 0
You need to be logged in to leave comments. Login now