##// END OF EJS Templates
context: use new manifest.diff(clean=True) support...
Augie Fackler -
r23757:b5346480 default
parent child Browse files
Show More
@@ -137,13 +137,17 b' class basectx(object):'
137
137
138 modified, added = [], []
138 modified, added = [], []
139 removed = []
139 removed = []
140 clean = set()
140 clean = []
141 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
141 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
142 deletedset = set(deleted)
142 deletedset = set(deleted)
143 d = mf1.diff(mf2)
143 d = mf1.diff(mf2, clean=listclean)
144 for fn, ((node1, flag1), (node2, flag2)) in d.iteritems():
144 for fn, value in d.iteritems():
145 if fn in deletedset:
145 if fn in deletedset:
146 continue
146 continue
147 if value is None:
148 clean.append(fn)
149 continue
150 (node1, flag1), (node2, flag2) = value
147 if node1 is None:
151 if node1 is None:
148 added.append(fn)
152 added.append(fn)
149 elif node2 is None:
153 elif node2 is None:
@@ -157,12 +161,7 b' class basectx(object):'
157 # match the one in mf1.
161 # match the one in mf1.
158 modified.append(fn)
162 modified.append(fn)
159 else:
163 else:
160 clean.add(fn)
164 clean.append(fn)
161 if listclean:
162 nondiff = (set(mf1) | set(mf2)) - set(d)
163 clean = list((clean | nondiff) - deletedset)
164 else:
165 clean = []
166
165
167 if removed:
166 if removed:
168 # need to filter files if they are already reported as removed
167 # need to filter files if they are already reported as removed
General Comments 0
You need to be logged in to leave comments. Login now