# HG changeset patch # User Gregory Szorc # Date 2015-12-24 18:16:30 # Node ID d13bcc9fd656f04422e10f3015a04cabd4f822d8 # Parent b5b54825de6ba111090c91c45963c75346a7a797 destutil: use scmutil.revrange for desthistedit (issue5001) This allows user aliases to be expanded. It also prevents the user-provided revset from being treated as a revset expression. diff --git a/mercurial/destutil.py b/mercurial/destutil.py --- a/mercurial/destutil.py +++ b/mercurial/destutil.py @@ -205,9 +205,12 @@ histeditdefaultrevset = 'reverse(only(.) def desthistedit(ui, repo): """Default base revision to edit for `hg histedit`.""" + # Avoid cycle: scmutil -> revset -> destutil + from . import scmutil + default = ui.config('histedit', 'defaultrev', histeditdefaultrevset) if default: - revs = repo.revs(default) + revs = scmutil.revrange(repo, [default]) if revs: # The revset supplied by the user may not be in ascending order nor # take the first revision. So do this manually.