Mercurial > evolve
changeset 4238:18648e1aded0
prev: use the `hint` argument of bail if changed
The argument is availabel since Mercurial 4.1. So let's use it.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 10 Nov 2018 15:59:16 +0100 |
| parents | 9e64a7d09895 |
| children | 7e274734cc2c |
| files | hgext3rd/evolve/__init__.py |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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))