This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3854

rebase: add lock to cover whole dryrun process
ClosedPublic

Authored by khanchi97 on Jun 28 2018, 4:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGba6d2c32f34a: rebase: add lock to cover whole dryrun process
Summary

Before this patch it is easy for another hg to interrupt
the dryrun. This patch make sure that dryrun will complete
without any interruption.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jun 28 2018, 4:09 PM
yuja added a subscriber: yuja.Jun 29 2018, 9:03 AM
if dryrun:
  • leaveunfinished = True
  • inmemory = True rbsrt = rebaseruntime(repo, ui, inmemory, opts)

Perhaps this is wrong. inmemory should be set to True, right?

khanchi97 added a comment.Jun 29 2018, 9:46 AM
In D3854#60248, @yuja wrote:
if dryrun:
  • leaveunfinished = True
  • inmemory = True rbsrt = rebaseruntime(repo, ui, inmemory, opts)

Perhaps this is wrong. inmemory should be set to True, right?

Oops!

khanchi97 updated this revision to Diff 9354.Jun 29 2018, 2:08 PM
Closed by commit rHGba6d2c32f34a: rebase: add lock to cover whole dryrun process (authored by khanchi97). · Explain WhyJun 29 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.
yuja added a comment.Jun 29 2018, 10:01 PM

Rebased on top of 2394cd58b81f and queued, thanks.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (31 lines)

Diff 9369

hgext/rebase.py

if key != r'auto_orphans' and opts.get(key): if key != r'auto_orphans' and opts.get(key):
raise error.Abort(_('--auto-orphans is incompatible with %s') % raise error.Abort(_('--auto-orphans is incompatible with %s') %
('--' + pycompat.bytestr(key))) ('--' + pycompat.bytestr(key)))
userrevs = list(repo.revs(opts.get(r'auto_orphans'))) userrevs = list(repo.revs(opts.get(r'auto_orphans')))
opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts[r'dest'] = '_destautoorphanrebase(SRC)' opts[r'dest'] = '_destautoorphanrebase(SRC)'
if dryrun: if dryrun:
leaveunfinished = True rbsrt = rebaseruntime(repo, ui, inmemory=True,
inmemory = True opts=pycompat.byteskwargs(opts))
rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) with repo.wlock(), repo.lock():
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, inmemory=True, rbsrt=rbsrt, _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
leaveunfinished=leaveunfinished, **opts) leaveunfinished=True, **opts)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1 return 1
else: else:
ui.status(_('there will be no conflict, you can rebase\n')) ui.status(_('there will be no conflict, you can rebase\n'))
return 0 return 0
finally: finally:
with repo.wlock(), repo.lock():
rbsrt._prepareabortorcontinue(isabort=True) rbsrt._prepareabortorcontinue(isabort=True)
elif inmemory: elif inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
return _origrebase(ui, repo, inmemory=inmemory, **opts) return _origrebase(ui, repo, inmemory=inmemory, **opts)