This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5997

mq: disable qrecord during histedit (issue5981)
ClosedPublic

Authored by navaneeth.suresh on Feb 21 2019, 2:33 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4d21ebc4cb47: mq: disable qrecord during histedit (issue5981)
Summary

qrecord during histedit may lead to deadlock-like situations. qpop will throw
an error on called during histedit even after qrecord-ing those changes. This
patch makes qrecord to abort on histedit.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja added a subscriber: yuja.Feb 24 2019, 8:36 PM
with ui.configoverride(overrides, 'record'):

+ if repo.vfs.exists('histedit-state'):
+ raise error.Abort(_("histedit in progress, can't qrecord"))

cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False,

Maybe cmdutil.checkunfinished() will do the job.

pulkit accepted this revision.Feb 25 2019, 10:11 AM
Closed by commit rHG4d21ebc4cb47: mq: disable qrecord during histedit (issue5981) (authored by navaneeth.suresh). · Explain WhyFeb 25 2019, 10:40 AM
This revision was automatically updated to reflect the committed changes.
navaneeth.suresh added a comment.Feb 25 2019, 10:43 AM

Thanks for queuing @pulkit. @yuja thanks for the review.

Revision Contents
Changeset List

PathPackages
Mhgext/record.py (1 line)
Mtests/test-qrecord.t (40 lines)

Diff 14233

hgext/record.py

repo.mq.checkpatchname(patch) repo.mq.checkpatchname(patch)
def committomq(ui, repo, *pats, **opts): def committomq(ui, repo, *pats, **opts):
opts[r'checkname'] = False opts[r'checkname'] = False
mq.new(ui, repo, patch, *pats, **opts) mq.new(ui, repo, patch, *pats, **opts)
overrides = {('experimental', 'crecord'): False} overrides = {('experimental', 'crecord'): False}
with ui.configoverride(overrides, 'record'): with ui.configoverride(overrides, 'record'):
cmdutil.checkunfinished(repo)
cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False, cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False,
cmdutil.recordfilter, *pats, **opts) cmdutil.recordfilter, *pats, **opts)
def qnew(origfn, ui, repo, patch, *args, **opts): def qnew(origfn, ui, repo, patch, *args, **opts):
if opts[r'interactive']: if opts[r'interactive']:
return _qrecord(None, ui, repo, patch, *args, **opts) return _qrecord(None, ui, repo, patch, *args, **opts)
return origfn(ui, repo, patch, *args, **opts) return origfn(ui, repo, patch, *args, **opts)

tests/test-qrecord.t

up up
After qrecord b.patch 'diff' After qrecord b.patch 'diff'
$ hg diff --nodates $ hg diff --nodates
$ cd .. $ cd ..
qrecord should throw an error when histedit in process
$ hg init issue5981
$ cd issue5981
$ cat >> $HGRCPATH <<EOF
> [extensions]
> histedit=
> mq=
> EOF
$ echo > a
$ hg ci -Am 'foo bar'
adding a
$ hg log
changeset: 0:ea55e2ae468f
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo bar
$ hg histedit tip --commands - 2>&1 <<EOF
> edit ea55e2ae468f foo bar
> EOF
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding a
Editing (ea55e2ae468f), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ echo 'foo bar' > a
$ hg qrecord -d '0 0' -m aaa a.patch <<EOF
> y
> y
> n
> y
> y
> n
> EOF
abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort')
[255]