# HG changeset patch # User Pierre-Yves David # Date 1449177260 28800 # Node ID 054cd38a2f19008ec2a95fb31586e76fb38c309e # Parent 15c6eb0a51bd734e79c01403c129ce9a0543c080 pathutil: use temporary variables instead of complicated wrapping The one-lining did not help readability, we get rid of it. diff -r 15c6eb0a51bd -r 054cd38a2f19 mercurial/pathutil.py --- a/mercurial/pathutil.py Thu Dec 03 13:23:46 2015 -0800 +++ b/mercurial/pathutil.py Thu Dec 03 13:14:20 2015 -0800 @@ -111,14 +111,13 @@ raise else: if stat.S_ISLNK(st.st_mode): - raise error.Abort( - _('path %r traverses symbolic link %r') - % (path, prefix)) + msg = _('path %r traverses symbolic link %r') % (path, prefix) + raise error.Abort(msg) elif (stat.S_ISDIR(st.st_mode) and os.path.isdir(os.path.join(curpath, '.hg'))): if not self.callback or not self.callback(curpath): - raise error.Abort(_("path '%s' is inside nested " - "repo %r") % (path, prefix)) + msg = _("path '%s' is inside nested repo %r") + raise error.Abort(msg % (path, prefix)) def check(self, path): try: