equal
deleted
inserted
replaced
196 |
196 |
197 """ |
197 """ |
198 originalwd = target = None |
198 originalwd = target = None |
199 activebookmark = None |
199 activebookmark = None |
200 external = nullrev |
200 external = nullrev |
201 # Mapping between thes old revision id and either what is the new rebased |
201 # Mapping between the old revision id and either what is the new rebased |
202 # revision or what needs to be done with the old revsion. The state dict |
202 # revision or what needs to be done with the old revision. The state dict |
203 # will be what contains most of the rebase progress state. |
203 # will be what contains most of the rebase progress state. |
204 state = {} |
204 state = {} |
205 skipped = set() |
205 skipped = set() |
206 targetancestors = set() |
206 targetancestors = set() |
207 |
207 |
1170 def _computeobsoletenotrebased(repo, rebasesetrevs, dest): |
1170 def _computeobsoletenotrebased(repo, rebasesetrevs, dest): |
1171 """return a mapping obsolete => successor for all obsolete nodes to be |
1171 """return a mapping obsolete => successor for all obsolete nodes to be |
1172 rebased that have a successors in the destination""" |
1172 rebased that have a successors in the destination""" |
1173 obsoletenotrebased = {} |
1173 obsoletenotrebased = {} |
1174 |
1174 |
1175 # Build a mapping succesor => obsolete nodes for the obsolete |
1175 # Build a mapping successor => obsolete nodes for the obsolete |
1176 # nodes to be rebased |
1176 # nodes to be rebased |
1177 allsuccessors = {} |
1177 allsuccessors = {} |
1178 cl = repo.changelog |
1178 cl = repo.changelog |
1179 for r in rebasesetrevs: |
1179 for r in rebasesetrevs: |
1180 n = repo[r] |
1180 n = repo[r] |