equal
deleted
inserted
replaced
858 def _useobsolete(self): |
858 def _useobsolete(self): |
859 """() -> bool""" |
859 """() -> bool""" |
860 return obsolete.isenabled(self.repo, obsolete.createmarkersopt) |
860 return obsolete.isenabled(self.repo, obsolete.createmarkersopt) |
861 |
861 |
862 def _obsoleteoldcommits(self): |
862 def _obsoleteoldcommits(self): |
863 relations = [(self.repo[k], v and (self.repo[v],) or ()) |
863 replacements = {k: ([v] if v is not None else []) |
864 for k, v in self.replacemap.iteritems()] |
864 for k, v in self.replacemap.iteritems()} |
865 if relations: |
865 if replacements: |
866 obsolete.createmarkers(self.repo, relations) |
866 scmutil.cleanupnodes(self.repo, replacements, operation='absorb') |
867 |
867 |
868 def _stripoldcommits(self): |
868 def _stripoldcommits(self): |
869 nodelist = self.replacemap.keys() |
869 nodelist = self.replacemap.keys() |
870 # make sure we don't strip innocent children |
870 # make sure we don't strip innocent children |
871 revs = self.repo.revs('%ln - (::(heads(%ln::)-%ln))', nodelist, |
871 revs = self.repo.revs('%ln - (::(heads(%ln::)-%ln))', nodelist, |