This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3828

rebase: add **opts to _prepareabortorcontinue
AbandonedPublic

Authored by khanchi97 on Jun 22 2018, 10:13 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Added keyword arguments option so that we can pass some options
to abort method like nobackup option.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Jun 22 2018, 10:13 AM
pulkit added a subscriber: pulkit.Jun 22 2018, 10:18 AM
pulkit added inline comments.
hgext/rebase.py
328

As mentioned on IRC also, we should prevent using keyword arguments because in Python 3, we need to convert the keys to unicodes and then maybe back to bytes too. Can't we just pass this as a dictionary or add a new argument?

khanchi97 added a comment.Jun 22 2018, 1:13 PM

@pulkit I have added a new argument in _prepareabortorcontinue. Now I think
there is no need to split that patch, if I am not wrong. We can leave this
patch here.
Thanks :)

khanchi97 abandoned this revision.Aug 3 2018, 4:36 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 9257

hgext/rebase.py

self.obsoletewithoutsuccessorindestination, self.obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors) = _computeobsoletenotrebased( obsoleteextinctsuccessors) = _computeobsoletenotrebased(
self.repo, obsoleteset, destmap) self.repo, obsoleteset, destmap)
skippedset = set(self.obsoletenotrebased) skippedset = set(self.obsoletenotrebased)
skippedset.update(self.obsoletewithoutsuccessorindestination) skippedset.update(self.obsoletewithoutsuccessorindestination)
skippedset.update(obsoleteextinctsuccessors) skippedset.update(obsoleteextinctsuccessors)
_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
def _prepareabortorcontinue(self, isabort): def _prepareabortorcontinue(self, isabort, **opts):
pulkitUnsubmitted
Not Done

As mentioned on IRC also, we should prevent using keyword arguments because in Python 3, we need to convert the keys to unicodes and then maybe back to bytes too. Can't we just pass this as a dictionary or add a new argument?

pulkit: As mentioned on IRC also, we should prevent using keyword arguments because in Python 3, we…
try: try:
self.restorestatus() self.restorestatus()
self.collapsemsg = restorecollapsemsg(self.repo, isabort) self.collapsemsg = restorecollapsemsg(self.repo, isabort)
except error.RepoLookupError: except error.RepoLookupError:
if isabort: if isabort:
clearstatus(self.repo) clearstatus(self.repo)
clearcollapsemsg(self.repo) clearcollapsemsg(self.repo)
self.repo.ui.warn(_('rebase aborted (no revision is removed,' self.repo.ui.warn(_('rebase aborted (no revision is removed,'