##// END OF EJS Templates
rebase, revlog: use set(x) instead of set(x.keys())...
Martin Geisler -
r8163:62d7287f default
parent child Browse files
Show More
@@ -128,8 +128,7 b' def rebase(ui, repo, **opts):'
128
128
129 if not keepf:
129 if not keepf:
130 # Remove no more useful revisions
130 # Remove no more useful revisions
131 if (set(repo.changelog.descendants(min(state)))
131 if set(repo.changelog.descendants(min(state))) - set(state):
132 - set(state.keys())):
133 ui.warn(_("warning: new changesets detected on source branch, "
132 ui.warn(_("warning: new changesets detected on source branch, "
134 "not stripping\n"))
133 "not stripping\n"))
135 else:
134 else:
@@ -678,7 +678,7 b' class revlog(object):'
678 # find from roots.
678 # find from roots.
679 heads = dict.fromkeys(heads, 0)
679 heads = dict.fromkeys(heads, 0)
680 # Start at the top and keep marking parents until we're done.
680 # Start at the top and keep marking parents until we're done.
681 nodestotag = set(heads.keys())
681 nodestotag = set(heads)
682 # Remember where the top was so we can use it as a limit later.
682 # Remember where the top was so we can use it as a limit later.
683 highestrev = max([self.rev(n) for n in nodestotag])
683 highestrev = max([self.rev(n) for n in nodestotag])
684 while nodestotag:
684 while nodestotag:
General Comments 0
You need to be logged in to leave comments. Login now