| pulkit |
| hg-reviewers |
There were various mixing of str and bytes in here. This change
fixes most of the failures in test-githelp.t.
| Lint Skipped |
| Unit Tests Skipped |
| import getopt | import getopt | ||||
| import re | import re | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| fancyopts, | fancyopts, | ||||
| pycompat, | |||||
| registrar, | registrar, | ||||
| scmutil, | scmutil, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| procutil, | procutil, | ||||
| ) | ) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| cmdoptions = list(cmdoptions) | cmdoptions = list(cmdoptions) | ||||
| opts = {} | opts = {} | ||||
| args = list(args) | args = list(args) | ||||
| while True: | while True: | ||||
| try: | try: | ||||
| args = fancyopts.fancyopts(list(args), cmdoptions, opts, True) | args = fancyopts.fancyopts(list(args), cmdoptions, opts, True) | ||||
| break | break | ||||
| except getopt.GetoptError as ex: | except getopt.GetoptError as ex: | ||||
| if "requires argument" in ex.msg: | if r"requires argument" in ex.msg: | ||||
| raise | raise | ||||
| if ('--' + ex.opt) in ex.msg: | if (r'--' + ex.opt) in ex.msg: | ||||
| flag = '--' + ex.opt | flag = '--' + pycompat.bytestr(ex.opt) | ||||
| elif ('-' + ex.opt) in ex.msg: | elif (r'-' + ex.opt) in ex.msg: | ||||
| flag = '-' + ex.opt | flag = '-' + pycompat.bytestr(ex.opt) | ||||
| else: | else: | ||||
| raise error.Abort(_("unknown option %s") % ex.opt) | raise error.Abort(_("unknown option %s") % | ||||
| pycompat.bytestr(ex.opt)) | |||||
| try: | try: | ||||
| args.remove(flag) | args.remove(flag) | ||||
| except Exception: | except Exception: | ||||
| msg = _("unknown option '%s' packed with other options") | msg = _("unknown option '%s' packed with other options") | ||||
| hint = _("please try passing the option as its own flag: -%s") | hint = _("please try passing the option as its own flag: -%s") | ||||
| raise error.Abort(msg % ex.opt, hint=hint % ex.opt) | raise error.Abort(msg % pycompat.bytestr(ex.opt), | ||||
| hint=hint % pycompat.bytestr(ex.opt)) | |||||
| ui.warn(_("ignoring unknown option %s\n") % flag) | ui.warn(_("ignoring unknown option %s\n") % flag) | ||||
| args = list([convert(x) for x in args]) | args = list([convert(x) for x in args]) | ||||
| opts = dict([(k, convert(v)) if isinstance(v, str) else (k, v) | opts = dict([(k, convert(v)) if isinstance(v, str) else (k, v) | ||||
| for k, v in opts.iteritems()]) | for k, v in opts.iteritems()]) | ||||
| return args, opts | return args, opts | ||||