Mercurial > hg-stable
comparison mercurial/debugcommands.py @ 34145:ada8a19672ab
debuginstall: do not pass exception object to formatter (issue5676)
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 07 Sep 2017 22:36:54 +0900 |
| parents | 902219a99901 |
| children | 311f6ccf8f23 |
comparison
equal
deleted
inserted
replaced
| 34144:902219a99901 | 34145:ada8a19672ab |
|---|---|
| 998 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding) | 998 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding) |
| 999 err = None | 999 err = None |
| 1000 try: | 1000 try: |
| 1001 codecs.lookup(pycompat.sysstr(encoding.encoding)) | 1001 codecs.lookup(pycompat.sysstr(encoding.encoding)) |
| 1002 except LookupError as inst: | 1002 except LookupError as inst: |
| 1003 err = inst | 1003 err = util.forcebytestr(inst) |
| 1004 problems += 1 | 1004 problems += 1 |
| 1005 fm.condwrite(err, 'encodingerror', _(" %s\n" | 1005 fm.condwrite(err, 'encodingerror', _(" %s\n" |
| 1006 " (check that your locale is properly set)\n"), err) | 1006 " (check that your locale is properly set)\n"), err) |
| 1007 | 1007 |
| 1008 # Python | 1008 # Python |
| 1054 mpatch, | 1054 mpatch, |
| 1055 osutil, | 1055 osutil, |
| 1056 ) | 1056 ) |
| 1057 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes | 1057 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
| 1058 except Exception as inst: | 1058 except Exception as inst: |
| 1059 err = inst | 1059 err = util.forcebytestr(inst) |
| 1060 problems += 1 | 1060 problems += 1 |
| 1061 fm.condwrite(err, 'extensionserror', " %s\n", err) | 1061 fm.condwrite(err, 'extensionserror', " %s\n", err) |
| 1062 | 1062 |
| 1063 compengines = util.compengines._engines.values() | 1063 compengines = util.compengines._engines.values() |
| 1064 fm.write('compengines', _('checking registered compression engines (%s)\n'), | 1064 fm.write('compengines', _('checking registered compression engines (%s)\n'), |
| 1086 # template found, check if it is working | 1086 # template found, check if it is working |
| 1087 err = None | 1087 err = None |
| 1088 try: | 1088 try: |
| 1089 templater.templater.frommapfile(m) | 1089 templater.templater.frommapfile(m) |
| 1090 except Exception as inst: | 1090 except Exception as inst: |
| 1091 err = inst | 1091 err = util.forcebytestr(inst) |
| 1092 p = None | 1092 p = None |
| 1093 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err) | 1093 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err) |
| 1094 else: | 1094 else: |
| 1095 p = None | 1095 p = None |
| 1096 fm.condwrite(p, 'defaulttemplate', | 1096 fm.condwrite(p, 'defaulttemplate', |
| 1122 username = None | 1122 username = None |
| 1123 err = None | 1123 err = None |
| 1124 try: | 1124 try: |
| 1125 username = ui.username() | 1125 username = ui.username() |
| 1126 except error.Abort as e: | 1126 except error.Abort as e: |
| 1127 err = e | 1127 err = util.forcebytestr(e) |
| 1128 problems += 1 | 1128 problems += 1 |
| 1129 | 1129 |
| 1130 fm.condwrite(username, 'username', _("checking username (%s)\n"), username) | 1130 fm.condwrite(username, 'username', _("checking username (%s)\n"), username) |
| 1131 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n" | 1131 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n" |
| 1132 " (specify a username in your configuration file)\n"), err) | 1132 " (specify a username in your configuration file)\n"), err) |