equal
deleted
inserted
replaced
228 oldnode = repo[rev].node() |
228 oldnode = repo[rev].node() |
229 newnode = repo[newrev].node() |
229 newnode = repo[newrev].node() |
230 repo.addobsolete(newnode, oldnode) |
230 repo.addobsolete(newnode, oldnode) |
231 return newrev |
231 return newrev |
232 |
232 |
233 def cmdrebase(orig, repo, ui, *args, **kwargs): |
233 def cmdrebase(orig, ui, repo, *args, **kwargs): |
234 oldkeep = kwargs.pop('keep', False) |
234 oldkeep = kwargs.pop('keep', False) |
235 if oldkeep: |
235 if oldkeep: |
236 ui.warn('WARNING --keep option ignored by experimental obsolete extension') |
236 ui.warn('WARNING --keep option ignored by experimental obsolete extension') |
237 kwargs['keep'] = True |
237 kwargs['keep'] = True |
238 return orig(repo, ui, *args, **kwargs) |
238 return orig(ui, repo, *args, **kwargs) |
239 |
239 |
240 |
240 |
241 |
241 |
242 def extsetup(ui): |
242 def extsetup(ui): |
243 |
243 |