##// END OF EJS Templates
convert: use manifest.diff() instead of ctx.status()...
Martin von Zweigbergk -
r27719:7ce8a13b default
parent child Browse files
Show More
@@ -508,8 +508,16 b' class mercurial_source(converter_source)'
508 return None, None
508 return None, None
509
509
510 def _changedfiles(self, ctx1, ctx2):
510 def _changedfiles(self, ctx1, ctx2):
511 m, a, r = ctx1.status(ctx2)[:3]
511 ma, r = [], []
512 return (m + a, r)
512 maappend = ma.append
513 rappend = r.append
514 d = ctx1.manifest().diff(ctx2.manifest())
515 for f, ((node1, flag1), (node2, flag2)) in d.iteritems():
516 if node2 is None:
517 rappend(f)
518 else:
519 maappend(f)
520 return ma, r
513
521
514 def getchanges(self, rev, full):
522 def getchanges(self, rev, full):
515 ctx = self._changectx(rev)
523 ctx = self._changectx(rev)
@@ -529,8 +537,10 b' class mercurial_source(converter_source)'
529 copies = self._getcopies(ctx, parents, copyfiles)
537 copies = self._getcopies(ctx, parents, copyfiles)
530 cleanp2 = set()
538 cleanp2 = set()
531 if len(parents) == 2:
539 if len(parents) == 2:
532 cleanp2.update(self.repo.status(parents[1].node(), ctx.node(),
540 d = parents[1].manifest().diff(ctx.manifest(), clean=True)
533 clean=True).clean)
541 for f, value in d.iteritems():
542 if value is None:
543 cleanp2.add(f)
534 changes = [(f, rev) for f in files if f not in self.ignored]
544 changes = [(f, rev) for f in files if f not in self.ignored]
535 changes.sort()
545 changes.sort()
536 return changes, copies, cleanp2
546 return changes, copies, cleanp2
General Comments 0
You need to be logged in to leave comments. Login now