This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5543

histedit: crashing with a more useful error message on empty defaultrev
ClosedPublic

Authored by rdamazio on Jan 9 2019, 11:05 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfbd168455b26: histedit: crashing with a more useful error message on empty defaultrev
Summary

Before this, hg --config histedit.defaultrev= histedit would crash with
File "destutil.py", line 385, in desthistedit

if revs:

UnboundLocalError: local variable 'revs' referenced before assignment

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

rdamazio created this revision.Jan 9 2019, 11:05 PM
rdamazio added a comment.Jan 9 2019, 11:10 PM

(and btw I'd be happier with '' meaning the default, but the original author went through the trouble of checking both cases explicitly, so I kept that)

yuja added a subscriber: yuja.Jan 10 2019, 6:23 AM

Queued for stable, thanks.

+ else:
+ raise error.Abort('config option histedit.defaultrev can\'t be empty')

Wrapped the message with _().

Closed by commit rHGfbd168455b26: histedit: crashing with a more useful error message on empty defaultrev (authored by rdamazio). · Explain WhyJan 10 2019, 6:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13132

mercurial/destutil.py

def desthistedit(ui, repo): def desthistedit(ui, repo):
"""Default base revision to edit for `hg histedit`.""" """Default base revision to edit for `hg histedit`."""
default = ui.config('histedit', 'defaultrev') default = ui.config('histedit', 'defaultrev')
if default is None: if default is None:
revs = stack.getstack(repo) revs = stack.getstack(repo)
elif default: elif default:
revs = scmutil.revrange(repo, [default]) revs = scmutil.revrange(repo, [default])
else:
raise error.Abort(_("config option histedit.defaultrev can't be empty"))
if revs: if revs:
# Take the first revision of the revset as the root # Take the first revision of the revset as the root
return revs.min() return revs.min()
return None return None
def stackbase(ui, repo): def stackbase(ui, repo):

tests/test-histedit-arguments.t

Test config specified default Test config specified default
----------------------------- -----------------------------
$ HGEDITOR=cat hg histedit --config "histedit.defaultrev=only(.) - ::eb57da33312f" --commands - << EOF $ HGEDITOR=cat hg histedit --config "histedit.defaultrev=only(.) - ::eb57da33312f" --commands - << EOF
> pick c8e68270e35a 3 four > pick c8e68270e35a 3 four
> pick 08d98a8350f3 4 five > pick 08d98a8350f3 4 five
> EOF > EOF
Test invalid config default
---------------------------
$ hg histedit --config "histedit.defaultrev="
abort: config option histedit.defaultrev can't be empty
[255]
Run on a revision not descendants of the initial parent Run on a revision not descendants of the initial parent
-------------------------------------------------------------------- --------------------------------------------------------------------
Test the message shown for inconsistent histedit state, which may be Test the message shown for inconsistent histedit state, which may be
created (and forgotten) by Mercurial earlier than 2.7. This emulates created (and forgotten) by Mercurial earlier than 2.7. This emulates
Mercurial earlier than 2.7 by renaming ".hg/histedit-state" Mercurial earlier than 2.7 by renaming ".hg/histedit-state"
temporarily. temporarily.