equal
deleted
inserted
replaced
248 skipped.add(old) |
248 skipped.add(old) |
249 seen.add(new) |
249 seen.add(new) |
250 repo.ui.debug('computed skipped revs: %s\n' % |
250 repo.ui.debug('computed skipped revs: %s\n' % |
251 (' '.join(str(r) for r in sorted(skipped)) or None)) |
251 (' '.join(str(r) for r in sorted(skipped)) or None)) |
252 repo.ui.debug('rebase status resumed\n') |
252 repo.ui.debug('rebase status resumed\n') |
253 _setrebasesetvisibility(repo, state.keys()) |
253 _setrebasesetvisibility(repo, set(state.keys())) |
254 |
254 |
255 self.originalwd = originalwd |
255 self.originalwd = originalwd |
256 self.target = target |
256 self.target = target |
257 self.state = state |
257 self.state = state |
258 self.skipped = skipped |
258 self.skipped = skipped |
1201 |
1201 |
1202 repo: repo |
1202 repo: repo |
1203 dest: context |
1203 dest: context |
1204 rebaseset: set of rev |
1204 rebaseset: set of rev |
1205 ''' |
1205 ''' |
1206 _setrebasesetvisibility(repo, rebaseset) |
1206 _setrebasesetvisibility(repo, set(rebaseset)) |
1207 |
1207 |
1208 # This check isn't strictly necessary, since mq detects commits over an |
1208 # This check isn't strictly necessary, since mq detects commits over an |
1209 # applied patch. But it prevents messing up the working directory when |
1209 # applied patch. But it prevents messing up the working directory when |
1210 # a partially completed rebase is blocked by mq. |
1210 # a partially completed rebase is blocked by mq. |
1211 if 'qtip' in repo.tags() and (dest.node() in |
1211 if 'qtip' in repo.tags() and (dest.node() in |
1387 """store the currently rebased set on the repo object |
1387 """store the currently rebased set on the repo object |
1388 |
1388 |
1389 This is used by another function to prevent rebased revision to because |
1389 This is used by another function to prevent rebased revision to because |
1390 hidden (see issue4504)""" |
1390 hidden (see issue4504)""" |
1391 repo = repo.unfiltered() |
1391 repo = repo.unfiltered() |
1392 revs = set(revs) |
|
1393 repo._rebaseset = revs |
1392 repo._rebaseset = revs |
1394 # invalidate cache if visibility changes |
1393 # invalidate cache if visibility changes |
1395 hiddens = repo.filteredrevcache.get('visible', set()) |
1394 hiddens = repo.filteredrevcache.get('visible', set()) |
1396 if revs & hiddens: |
1395 if revs & hiddens: |
1397 repo.invalidatevolatilesets() |
1396 repo.invalidatevolatilesets() |