This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6027

mq: make unshelve to apply on modified mq patch (issue4318)
Needs RevisionPublic

Authored by navaneeth.suresh on Feb 26 2019, 7:24 AM.

Details

Reviewers
martinvonz
baymax
Group Reviewers
hg-reviewers
Summary

unshelve wasn't working on a modified mq patch. I added checks for
not aborting on a modified mq patch in both rebase and mq.

Checking repo.vfs.exists('unshelverebasestate') works in rebase,
not in mq. I used cmdutil.unfinishedstates to find shelvedstate
in mq.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

navaneeth.suresh added a comment.Mar 24 2019, 2:09 PM

Gentle ping for review.

yuja added a subscriber: yuja.Mar 25 2019, 6:29 PM
  • a/hgext/mq.py

+++ b/hgext/mq.py
@@ -3518,7 +3518,10 @@

        delattr(self.unfiltered(), r'mq')
def abortifwdirpatched(self, errmsg, force=False):
  • if self.mq.applied and self.mq.checkapplied and not force:

+ shelveinprogress = any('shelvedstate' in state
+ for state in cmdutil.unfinishedstates)
+ if (self.mq.applied and self.mq.checkapplied and not force and
+ not shelveinprogress):

It doesn't make sense to check the existence of 'shelvedstate' in a static
table.

Can't we somehow get around the mq in a similar way to shelve.getcommitfunc()?
I don't think it's good idea to rely on state files saved on disk.

navaneeth.suresh added a comment.Mar 26 2019, 2:21 PM

It doesn't make sense to check the existence of 'shelvedstate' in a static
table.
Can't we somehow get around the mq in a similar way to shelve.getcommitfunc()?
I don't think it's good idea to rely on state files saved on disk.

I felt that the only workaround to stop aborting unshelve on a modified mq patch should be adding a check on mq.abortifwdirpatched(). Will try to investigate in shelve.getcommitfunc() for sure. Thanks.

marmoute added a subscriber: marmoute.Jan 23 2020, 12:17 PM

Waht'a sup on this. Seems to be open for a long while.

baymax requested changes to this revision.Apr 28 2020, 4:18 AM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Apr 28 2020, 4:18 AM

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (5 lines)
Mhgext/rebase.py (3 lines)
Mtests/test-mq.t (21 lines)

Diff 14400

hgext/mq.py

def invalidateall(self): def invalidateall(self):
super(mqrepo, self).invalidateall() super(mqrepo, self).invalidateall()
if localrepo.hasunfilteredcache(self, r'mq'): if localrepo.hasunfilteredcache(self, r'mq'):
# recreate mq in case queue path was changed # recreate mq in case queue path was changed
delattr(self.unfiltered(), r'mq') delattr(self.unfiltered(), r'mq')
def abortifwdirpatched(self, errmsg, force=False): def abortifwdirpatched(self, errmsg, force=False):
if self.mq.applied and self.mq.checkapplied and not force: shelveinprogress = any('shelvedstate' in state
for state in cmdutil.unfinishedstates)
if (self.mq.applied and self.mq.checkapplied and not force and
not shelveinprogress):
parents = self.dirstate.parents() parents = self.dirstate.parents()
patches = [s.node for s in self.mq.applied] patches = [s.node for s in self.mq.applied]
if parents[0] in patches or parents[1] in patches: if parents[0] in patches or parents[1] in patches:
raise error.Abort(errmsg) raise error.Abort(errmsg)
def commit(self, text="", user=None, date=None, match=None, def commit(self, text="", user=None, date=None, match=None,
force=False, editor=False, extra=None): force=False, editor=False, extra=None):
if extra is None: if extra is None:

hgext/rebase.py

rebaseset = destmap.keys() rebaseset = destmap.keys()
originalwd = repo['.'].rev() originalwd = repo['.'].rev()
# This check isn't strictly necessary, since mq detects commits over an # This check isn't strictly necessary, since mq detects commits over an
# applied patch. But it prevents messing up the working directory when # applied patch. But it prevents messing up the working directory when
# a partially completed rebase is blocked by mq. # a partially completed rebase is blocked by mq.
if 'qtip' in repo.tags(): if 'qtip' in repo.tags():
mqapplied = set(repo[s.node].rev() for s in repo.mq.applied) mqapplied = set(repo[s.node].rev() for s in repo.mq.applied)
if set(destmap.values()) & mqapplied: if (set(destmap.values()) & mqapplied and
not repo.vfs.exists('unshelverebasestate')):
raise error.Abort(_('cannot rebase onto an applied mq patch')) raise error.Abort(_('cannot rebase onto an applied mq patch'))
# Get "cycle" error early by exhausting the generator. # Get "cycle" error early by exhausting the generator.
sortedsrc = list(sortsource(destmap)) # a list of sorted revs sortedsrc = list(sortsource(destmap)) # a list of sorted revs
if not sortedsrc: if not sortedsrc:
raise error.Abort(_('no matching revisions')) raise error.Abort(_('no matching revisions'))
# Only check the first batch of revisions to rebase not depending on other # Only check the first batch of revisions to rebase not depending on other

tests/test-mq.t

reimport things reimport things
$ hg qimport -r 1:: $ hg qimport -r 1::
abort: revision 2 is already managed abort: revision 2 is already managed
[255] [255]
$ cd .. $ cd ..
unshelve shouldn't be refusing on modified mq patch
$ hg init issue4318
$ cd issue4318
$ echo '[extensions]' >> $HGRCPATH
$ echo 'mq =' >> $HGRCPATH
$ echo 'shelve =' >> $HGRCPATH
$ echo a>a
$ hg add a
$ hg qnew -ma a.patch
$ echo a2>>a
$ hg shelve
shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b>b
$ hg add b
$ hg qref
$ hg unshelve
unshelving change 'default'
rebasing shelved changes