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, set(state.keys())) |
253 _setrebasesetvisibility(repo, set(state.keys()) | set([originalwd])) |
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, set(rebaseset)) |
1206 originalwd = repo['.'].rev() |
|
1207 _setrebasesetvisibility(repo, set(rebaseset) | set([originalwd])) |
1207 |
1208 |
1208 # This check isn't strictly necessary, since mq detects commits over an |
1209 # This check isn't strictly necessary, since mq detects commits over an |
1209 # applied patch. But it prevents messing up the working directory when |
1210 # applied patch. But it prevents messing up the working directory when |
1210 # a partially completed rebase is blocked by mq. |
1211 # a partially completed rebase is blocked by mq. |
1211 if 'qtip' in repo.tags() and (dest.node() in |
1212 if 'qtip' in repo.tags() and (dest.node() in |
1286 for r in obsoletenotrebased: |
1287 for r in obsoletenotrebased: |
1287 if obsoletenotrebased[r] is None: |
1288 if obsoletenotrebased[r] is None: |
1288 state[r] = revpruned |
1289 state[r] = revpruned |
1289 else: |
1290 else: |
1290 state[r] = revprecursor |
1291 state[r] = revprecursor |
1291 return repo['.'].rev(), dest.rev(), state |
1292 return originalwd, dest.rev(), state |
1292 |
1293 |
1293 def clearrebased(ui, repo, state, skipped, collapsedas=None): |
1294 def clearrebased(ui, repo, state, skipped, collapsedas=None): |
1294 """dispose of rebased revision at the end of the rebase |
1295 """dispose of rebased revision at the end of the rebase |
1295 |
1296 |
1296 If `collapsedas` is not None, the rebase was a collapse whose result if the |
1297 If `collapsedas` is not None, the rebase was a collapse whose result if the |