Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
prev: use the `hint` argument of bail if changed
authorPierre-Yves David <pierre-yves.david@octobus.net>
Sat, 10 Nov 2018 15:59:16 +0100
changeset 4238 18648e1aded0
parent 4237 9e64a7d09895
child 4239 7e274734cc2c
prev: use the `hint` argument of bail if changed The argument is availabel since Mercurial 4.1. So let's use it.
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Sat Nov 10 15:28:44 2018 +0100
+++ b/hgext3rd/evolve/__init__.py	Sat Nov 10 15:59:16 2018 +0100
@@ -1071,11 +1071,7 @@
             if ui.config('commands', 'update.check') == 'noconflict':
                 pass
             else:
-                try:
-                    cmdutil.bailifchanged(repo)
-                except error.Abort as exc:
-                    exc.hint = _('do you want --merge?')
-                    raise
+                cmdutil.bailifchanged(repo, hint=_('do you want --merge?'))
 
         topic = not opts.get("no_topic", False)
         hastopic = bool(_getcurrenttopic(repo))
evolve