##// END OF EJS Templates
rebase: pass in a regular set to _setrebasesetvisibility()...
Martin von Zweigbergk -
r31296:98658f73 default
parent child Browse files
Show More
@@ -250,7 +250,7 class rebaseruntime(object):
250 250 repo.ui.debug('computed skipped revs: %s\n' %
251 251 (' '.join(str(r) for r in sorted(skipped)) or None))
252 252 repo.ui.debug('rebase status resumed\n')
253 _setrebasesetvisibility(repo, state.keys())
253 _setrebasesetvisibility(repo, set(state.keys()))
254 254
255 255 self.originalwd = originalwd
256 256 self.target = target
@@ -1203,7 +1203,7 def buildstate(repo, dest, rebaseset, co
1203 1203 dest: context
1204 1204 rebaseset: set of rev
1205 1205 '''
1206 _setrebasesetvisibility(repo, rebaseset)
1206 _setrebasesetvisibility(repo, set(rebaseset))
1207 1207
1208 1208 # This check isn't strictly necessary, since mq detects commits over an
1209 1209 # applied patch. But it prevents messing up the working directory when
@@ -1389,7 +1389,6 def _setrebasesetvisibility(repo, revs):
1389 1389 This is used by another function to prevent rebased revision to because
1390 1390 hidden (see issue4504)"""
1391 1391 repo = repo.unfiltered()
1392 revs = set(revs)
1393 1392 repo._rebaseset = revs
1394 1393 # invalidate cache if visibility changes
1395 1394 hiddens = repo.filteredrevcache.get('visible', set())
General Comments 0
You need to be logged in to leave comments. Login now