234 def _computeobsoletenotrebased(orig, repo, *args, **kwargs): |
234 def _computeobsoletenotrebased(orig, repo, *args, **kwargs): |
235 r = orig(repo, *args, **kwargs) |
235 r = orig(repo, *args, **kwargs) |
236 repo._obsoletenotrebased = r.keys() |
236 repo._obsoletenotrebased = r.keys() |
237 return r |
237 return r |
238 |
238 |
239 def _clearrebased(orig, ui, repo, *args, **kwargs): |
239 def _clearrebased(orig, ui, repo, dest, state, skipped, collapsedas=None, |
240 r = orig(ui, repo, *args, **kwargs) |
240 keepf=False): |
|
241 r = orig(ui, repo, dest, state, skipped, collapsedas, keepf) |
|
242 if keepf: |
|
243 return r |
241 tonode = repo.changelog.node |
244 tonode = repo.changelog.node |
242 if util.safehasattr(repo, '_obsoletenotrebased'): |
245 if util.safehasattr(repo, '_obsoletenotrebased'): |
243 _deinhibitmarkers(repo, [tonode(k) for k in repo._obsoletenotrebased]) |
246 _deinhibitmarkers(repo, [tonode(k) for k in repo._obsoletenotrebased]) |
244 return r |
247 return r |
245 |
248 |