Show More
@@ -860,10 +860,10 b' class fixupstate(object):' | |||||
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 re |
|
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() |
General Comments 0
You need to be logged in to leave comments.
Login now