This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4282

rebase: cover restorestatus() by lock to prevent it from being updated
ClosedPublic

Authored by khanchi97 on Aug 15 2018, 2:00 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGffb34ee6de9e: rebase: cover restorestatus() by lock to prevent it from being updated
Summary

To prevent it from being updated by another process
restorestatus() is moved under lock.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Aug 15 2018, 2:00 AM
Closed by commit rHGffb34ee6de9e: rebase: cover restorestatus() by lock to prevent it from being updated (authored by khanchi97). · Explain WhyAug 16 2018, 6:33 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (21 lines)

Diff 10359

hgext/rebase.py

userrevs = list(repo.revs(opts.get('auto_orphans'))) userrevs = list(repo.revs(opts.get('auto_orphans')))
opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts['dest'] = '_destautoorphanrebase(SRC)' opts['dest'] = '_destautoorphanrebase(SRC)'
if dryrun: if dryrun:
return _dryrunrebase(ui, repo, opts) return _dryrunrebase(ui, repo, opts)
elif stop: elif stop:
rbsrt = rebaseruntime(repo, ui) rbsrt = rebaseruntime(repo, ui)
with repo.wlock(), repo.lock():
rbsrt.restorestatus() rbsrt.restorestatus()
if rbsrt.collapsef: if rbsrt.collapsef:
raise error.Abort(_("cannot stop in --collapse session")) raise error.Abort(_("cannot stop in --collapse session"))
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
if not (rbsrt.keepf or allowunstable): if not (rbsrt.keepf or allowunstable):
raise error.Abort(_("cannot remove original changesets with" raise error.Abort(_("cannot remove original changesets with"
" unrebased descendants"), " unrebased descendants"),
hint=_('either enable obsmarkers to allow unstable ' hint=_('either enable obsmarkers to allow unstable '
'revisions or use --keep to keep original ' 'revisions or use --keep to keep original '
'changesets')) 'changesets'))
with repo.wlock(), repo.lock():
if needupdate(repo, rbsrt.state): if needupdate(repo, rbsrt.state):
# update to the current working revision # update to the current working revision
# to clear interrupted merge # to clear interrupted merge
hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) hg.updaterepo(repo, rbsrt.originalwd, overwrite=True)
rbsrt._finishrebase() rbsrt._finishrebase()
return 0 return 0
elif inmemory: elif inmemory:
try: try: