This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5494

histedit: add user input to warning message on editing tagged commits
ClosedPublic

Authored by navaneeth.suresh on Jan 5 2019, 11:06 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG7b7e081f8954: histedit: add user input to warning message on editing tagged commits
Summary

This is a follow-up patch to D5489.

Now, the user will be able to input yes/no(default) on the warning message. Initially, it was the sleep of 1s and histedit window opens. Changes were made as suggested by @mharbison72 and @yuja.

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

navaneeth.suresh edited the summary of this revision. (Show Details)Jan 5 2019, 11:11 PM
navaneeth.suresh added subscribers: mharbison72, yuja.
Closed by commit rHG7b7e081f8954: histedit: add user input to warning message on editing tagged commits (authored by navaneeth.suresh). · Explain WhyJan 9 2019, 3:00 PM
This revision was automatically updated to reflect the committed changes.
pulkit added a subscriber: pulkit.Jan 9 2019, 3:03 PM

Sorry for bumping on this now, can you add tests for this as follow-up?

navaneeth.suresh added a comment.Jan 10 2019, 3:24 AM
In D5494#81855, @pulkit wrote:

Sorry for bumping on this now, can you add tests for this as follow-up?

My bad. Doing that right away!

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (8 lines)

Diff 13104

hgext/histedit.py

import termios import termios
except ImportError: except ImportError:
fcntl = None fcntl = None
termios = None termios = None
import functools import functools
import os import os
import struct import struct
import time
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
bundle2, bundle2,
cmdutil, cmdutil,
context, context,
copies, copies,
destutil, destutil,
if revs: if revs:
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
ctxs = [repo[rev] for rev in revs] ctxs = [repo[rev] for rev in revs]
for ctx in ctxs: for ctx in ctxs:
tags = [tag for tag in ctx.tags() if tag != 'tip'] tags = [tag for tag in ctx.tags() if tag != 'tip']
if not hastags: if not hastags:
hastags = len(tags) hastags = len(tags)
if hastags: if hastags:
ui.warn(_('warning: tags associated with the given changeset ' if ui.promptchoice(_('warning: tags associated with the given'
'will be lost after histedit \n')) ' changeset will be lost after histedit. \n'
time.sleep(1) 'do you want to continue (yN)? $$ &Yes $$ &No'), default=1):
raise error.Abort(_('histedit cancelled\n'))
# rebuild state # rebuild state
if goal == goalcontinue: if goal == goalcontinue:
state.read() state.read()
state = bootstrapcontinue(ui, state, opts) state = bootstrapcontinue(ui, state, opts)
elif goal == goaleditplan: elif goal == goaleditplan:
_edithisteditplan(ui, repo, state, rules) _edithisteditplan(ui, repo, state, rules)
return return
elif goal == goalabort: elif goal == goalabort: