This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3753

graft: store the node from where we started the operation in graftstate
AbandonedPublic

Authored by pulkit on Jun 15 2018, 4:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This will help us in updating to the start node when the user does `hg graft
--abort`.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jun 15 2018, 4:09 PM
yuja added a subscriber: yuja.Jun 16 2018, 10:04 AM
  • a/mercurial/commands.py

+++ b/mercurial/commands.py
@@ -2233,6 +2233,8 @@

    raise error.Abort(_('no revisions specified'))
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)

+ # the node from where we started the graft operation
+ statedata['startnode'] = repo['.'].node()

Nit: Isn't it always the parent of the newnodes[0]?

I don't have strong opinion whether we should store the startnode, but if
we store it at the start of the graft, I think we won't need to care for
statedata.get('newnodes') is None case, in the first patch. I mean we can
always record newnodes no matter if it may be incomplete or not since the
existence of the startnode gives us a trust.

pulkit abandoned this revision.Jun 24 2018, 3:50 PM
In D3753#58884, @yuja wrote:
  • a/mercurial/commands.py

+++ b/mercurial/commands.py
@@ -2233,6 +2233,8 @@

    raise error.Abort(_('no revisions specified'))
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)

+ # the node from where we started the graft operation
+ statedata['startnode'] = repo['.'].node()

Nit: Isn't it always the parent of the newnodes[0]?

Oh, yes. Let's not store the startnode.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 9099

mercurial/commands.py

revs = [repo[node].rev() for node in nodes] revs = [repo[node].rev() for node in nodes]
else: else:
cmdutil.wrongtooltocontinue(repo, _('graft')) cmdutil.wrongtooltocontinue(repo, _('graft'))
else: else:
if not revs: if not revs:
raise error.Abort(_('no revisions specified')) raise error.Abort(_('no revisions specified'))
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
# the node from where we started the graft operation
statedata['startnode'] = repo['.'].node()
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
skipped = set() skipped = set()
# check for merges # check for merges
for rev in repo.revs('%ld and merge()', revs): for rev in repo.revs('%ld and merge()', revs):
ui.warn(_('skipping ungraftable merge revision %d\n') % rev) ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
skipped.add(rev) skipped.add(rev)
revs = [r for r in revs if r not in skipped] revs = [r for r in revs if r not in skipped]