| pulkit |
| hg-reviewers |
Some assorted fixes required in the extension itself, all around
bytes/str issues.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/python3-whitelist (1 line) | |||
| M | hgext/bugzilla.py (29 lines) | |||
| M | tests/test-bugzilla.t (19 lines) |
| test-bookmarks-pushpull.t | test-bookmarks-pushpull.t | ||||
| test-bookmarks-rebase.t | test-bookmarks-rebase.t | ||||
| test-bookmarks-strip.t | test-bookmarks-strip.t | ||||
| test-bookmarks.t | test-bookmarks.t | ||||
| test-branch-change.t | test-branch-change.t | ||||
| test-branch-option.t | test-branch-option.t | ||||
| test-branch-tag-confict.t | test-branch-tag-confict.t | ||||
| test-branches.t | test-branches.t | ||||
| test-bugzilla.t | |||||
| test-bundle-phases.t | test-bundle-phases.t | ||||
| test-bundle-r.t | test-bundle-r.t | ||||
| test-bundle-type.t | test-bundle-type.t | ||||
| test-bundle-vs-outgoing.t | test-bundle-vs-outgoing.t | ||||
| test-bundle.t | test-bundle.t | ||||
| test-bundle2-exchange.t | test-bundle2-exchange.t | ||||
| test-bundle2-format.t | test-bundle2-format.t | ||||
| test-bundle2-multiple-changegroups.t | test-bundle2-multiple-changegroups.t | ||||
| import time | import time | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial.node import short | from mercurial.node import short | ||||
| from mercurial import ( | from mercurial import ( | ||||
| error, | error, | ||||
| logcmdutil, | logcmdutil, | ||||
| mail, | mail, | ||||
| pycompat, | |||||
| registrar, | registrar, | ||||
| url, | url, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| procutil, | procutil, | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| ) | ) | ||||
| configitem('bugzilla', 'bzuser', | configitem('bugzilla', 'bzuser', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| configitem('bugzilla', 'db', | configitem('bugzilla', 'db', | ||||
| default='bugs', | default='bugs', | ||||
| ) | ) | ||||
| configitem('bugzilla', 'fixregexp', | configitem('bugzilla', 'fixregexp', | ||||
| default=(r'fix(?:es)?\s*(?:bugs?\s*)?,?\s*' | default=(br'fix(?:es)?\s*(?:bugs?\s*)?,?\s*' | ||||
| r'(?:nos?\.?|num(?:ber)?s?)?\s*' | br'(?:nos?\.?|num(?:ber)?s?)?\s*' | ||||
| r'(?P<ids>(?:#?\d+\s*(?:,?\s*(?:and)?)?\s*)+)' | br'(?P<ids>(?:#?\d+\s*(?:,?\s*(?:and)?)?\s*)+)' | ||||
| r'\.?\s*(?:h(?:ours?)?\s*(?P<hours>\d*(?:\.\d+)?))?') | br'\.?\s*(?:h(?:ours?)?\s*(?P<hours>\d*(?:\.\d+)?))?') | ||||
| ) | ) | ||||
| configitem('bugzilla', 'fixresolution', | configitem('bugzilla', 'fixresolution', | ||||
| default='FIXED', | default='FIXED', | ||||
| ) | ) | ||||
| configitem('bugzilla', 'fixstatus', | configitem('bugzilla', 'fixstatus', | ||||
| default='RESOLVED', | default='RESOLVED', | ||||
| ) | ) | ||||
| configitem('bugzilla', 'host', | configitem('bugzilla', 'host', | ||||
| default='localhost', | default='localhost', | ||||
| ) | ) | ||||
| configitem('bugzilla', 'notify', | configitem('bugzilla', 'notify', | ||||
| default=configitem.dynamicdefault, | default=configitem.dynamicdefault, | ||||
| ) | ) | ||||
| configitem('bugzilla', 'password', | configitem('bugzilla', 'password', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| configitem('bugzilla', 'regexp', | configitem('bugzilla', 'regexp', | ||||
| default=(r'bugs?\s*,?\s*(?:#|nos?\.?|num(?:ber)?s?)?\s*' | default=(br'bugs?\s*,?\s*(?:#|nos?\.?|num(?:ber)?s?)?\s*' | ||||
| r'(?P<ids>(?:\d+\s*(?:,?\s*(?:and)?)?\s*)+)' | br'(?P<ids>(?:\d+\s*(?:,?\s*(?:and)?)?\s*)+)' | ||||
| r'\.?\s*(?:h(?:ours?)?\s*(?P<hours>\d*(?:\.\d+)?))?') | br'\.?\s*(?:h(?:ours?)?\s*(?P<hours>\d*(?:\.\d+)?))?') | ||||
| ) | ) | ||||
| configitem('bugzilla', 'strip', | configitem('bugzilla', 'strip', | ||||
| default=0, | default=0, | ||||
| ) | ) | ||||
| configitem('bugzilla', 'style', | configitem('bugzilla', 'style', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| configitem('bugzilla', 'template', | configitem('bugzilla', 'template', | ||||
| else: | else: | ||||
| return cookietransport() | return cookietransport() | ||||
| def get_bug_comments(self, id): | def get_bug_comments(self, id): | ||||
| """Return a string with all comment text for a bug.""" | """Return a string with all comment text for a bug.""" | ||||
| c = self.bzproxy.Bug.comments({'ids': [id], | c = self.bzproxy.Bug.comments({'ids': [id], | ||||
| 'include_fields': ['text'], | 'include_fields': ['text'], | ||||
| 'token': self.bztoken}) | 'token': self.bztoken}) | ||||
| return ''.join([t['text'] for t in c['bugs'][str(id)]['comments']]) | return ''.join([t['text'] for t in c['bugs']['%d' % id]['comments']]) | ||||
| def filter_real_bug_ids(self, bugs): | def filter_real_bug_ids(self, bugs): | ||||
| probe = self.bzproxy.Bug.get({'ids': sorted(bugs.keys()), | probe = self.bzproxy.Bug.get({'ids': sorted(bugs.keys()), | ||||
| 'include_fields': [], | 'include_fields': [], | ||||
| 'permissive': True, | 'permissive': True, | ||||
| 'token': self.bztoken, | 'token': self.bztoken, | ||||
| }) | }) | ||||
| for badbug in probe['faults']: | for badbug in probe['faults']: | ||||
| self.bzemail = self.ui.config('bugzilla', 'bzemail') | self.bzemail = self.ui.config('bugzilla', 'bzemail') | ||||
| if not self.bzemail: | if not self.bzemail: | ||||
| raise error.Abort(_("configuration 'bzemail' missing")) | raise error.Abort(_("configuration 'bzemail' missing")) | ||||
| mail.validateconfig(self.ui) | mail.validateconfig(self.ui) | ||||
| def makecommandline(self, fieldname, value): | def makecommandline(self, fieldname, value): | ||||
| if self.bzvermajor >= 4: | if self.bzvermajor >= 4: | ||||
| return "@%s %s" % (fieldname, str(value)) | return "@%s %s" % (fieldname, pycompat.bytestr(value)) | ||||
| else: | else: | ||||
| if fieldname == "id": | if fieldname == "id": | ||||
| fieldname = "bug_id" | fieldname = "bug_id" | ||||
| return "@%s = %s" % (fieldname, str(value)) | return "@%s = %s" % (fieldname, pycompat.bytestr(value)) | ||||
| def send_bug_modify_email(self, bugid, commands, comment, committer): | def send_bug_modify_email(self, bugid, commands, comment, committer): | ||||
| '''send modification message to Bugzilla bug via email. | '''send modification message to Bugzilla bug via email. | ||||
| The message format is documented in the Bugzilla email_in.pl | The message format is documented in the Bugzilla email_in.pl | ||||
| specification. commands is a list of command lines, comment is the | specification. commands is a list of command lines, comment is the | ||||
| comment text. | comment text. | ||||
| self.bzroot = '/'.join([bz, 'rest']) | self.bzroot = '/'.join([bz, 'rest']) | ||||
| self.apikey = self.ui.config('bugzilla', 'apikey') | self.apikey = self.ui.config('bugzilla', 'apikey') | ||||
| self.user = self.ui.config('bugzilla', 'user') | self.user = self.ui.config('bugzilla', 'user') | ||||
| self.passwd = self.ui.config('bugzilla', 'password') | self.passwd = self.ui.config('bugzilla', 'password') | ||||
| self.fixstatus = self.ui.config('bugzilla', 'fixstatus') | self.fixstatus = self.ui.config('bugzilla', 'fixstatus') | ||||
| self.fixresolution = self.ui.config('bugzilla', 'fixresolution') | self.fixresolution = self.ui.config('bugzilla', 'fixresolution') | ||||
| def apiurl(self, targets, include_fields=None): | def apiurl(self, targets, include_fields=None): | ||||
| url = '/'.join([self.bzroot] + [str(t) for t in targets]) | url = '/'.join([self.bzroot] + [pycompat.bytestr(t) for t in targets]) | ||||
| qv = {} | qv = {} | ||||
| if self.apikey: | if self.apikey: | ||||
| qv['api_key'] = self.apikey | qv['api_key'] = self.apikey | ||||
| elif self.user and self.passwd: | elif self.user and self.passwd: | ||||
| qv['login'] = self.user | qv['login'] = self.user | ||||
| qv['password'] = self.passwd | qv['password'] = self.passwd | ||||
| if include_fields: | if include_fields: | ||||
| qv['include_fields'] = include_fields | qv['include_fields'] = include_fields | ||||
| del bugs[bugid] | del bugs[bugid] | ||||
| def filter_cset_known_bug_ids(self, node, bugs): | def filter_cset_known_bug_ids(self, node, bugs): | ||||
| '''remove bug IDs where node occurs in comment text from bugs.''' | '''remove bug IDs where node occurs in comment text from bugs.''' | ||||
| sn = short(node) | sn = short(node) | ||||
| for bugid in bugs.keys(): | for bugid in bugs.keys(): | ||||
| burl = self.apiurl(('bug', bugid, 'comment'), include_fields='text') | burl = self.apiurl(('bug', bugid, 'comment'), include_fields='text') | ||||
| result = self._fetch(burl) | result = self._fetch(burl) | ||||
| comments = result['bugs'][str(bugid)]['comments'] | comments = result['bugs'][pycompat.bytestr(bugid)]['comments'] | ||||
| if any(sn in c['text'] for c in comments): | if any(sn in c['text'] for c in comments): | ||||
| self.ui.status(_('bug %d already knows about changeset %s\n') % | self.ui.status(_('bug %d already knows about changeset %s\n') % | ||||
| (bugid, sn)) | (bugid, sn)) | ||||
| del bugs[bugid] | del bugs[bugid] | ||||
| def updatebug(self, bugid, newstate, text, committer): | def updatebug(self, bugid, newstate, text, committer): | ||||
| '''update the specified bug. Add comment text and set new states. | '''update the specified bug. Add comment text and set new states. | ||||
| raise error.Abort(_('bugzilla version %s not supported') % | raise error.Abort(_('bugzilla version %s not supported') % | ||||
| bzversion) | bzversion) | ||||
| self.bzdriver = bzclass(self.ui) | self.bzdriver = bzclass(self.ui) | ||||
| self.bug_re = re.compile( | self.bug_re = re.compile( | ||||
| self.ui.config('bugzilla', 'regexp'), re.IGNORECASE) | self.ui.config('bugzilla', 'regexp'), re.IGNORECASE) | ||||
| self.fix_re = re.compile( | self.fix_re = re.compile( | ||||
| self.ui.config('bugzilla', 'fixregexp'), re.IGNORECASE) | self.ui.config('bugzilla', 'fixregexp'), re.IGNORECASE) | ||||
| self.split_re = re.compile(r'\D+') | self.split_re = re.compile(br'\D+') | ||||
| def find_bugs(self, ctx): | def find_bugs(self, ctx): | ||||
| '''return bugs dictionary created from commit comment. | '''return bugs dictionary created from commit comment. | ||||
| Extract bug info from changeset comments. Filter out any that are | Extract bug info from changeset comments. Filter out any that are | ||||
| not known to Bugzilla, and any that already have a reference to | not known to Bugzilla, and any that already have a reference to | ||||
| the given changeset in their comments. | the given changeset in their comments. | ||||
| ''' | ''' | ||||
| mapfile = self.ui.config('bugzilla', 'style') | mapfile = self.ui.config('bugzilla', 'style') | ||||
| if not mapfile and not tmpl: | if not mapfile and not tmpl: | ||||
| tmpl = _('changeset {node|short} in repo {root} refers ' | tmpl = _('changeset {node|short} in repo {root} refers ' | ||||
| 'to bug {bug}.\ndetails:\n\t{desc|tabindent}') | 'to bug {bug}.\ndetails:\n\t{desc|tabindent}') | ||||
| spec = logcmdutil.templatespec(tmpl, mapfile) | spec = logcmdutil.templatespec(tmpl, mapfile) | ||||
| t = logcmdutil.changesettemplater(self.ui, self.repo, spec) | t = logcmdutil.changesettemplater(self.ui, self.repo, spec) | ||||
| self.ui.pushbuffer() | self.ui.pushbuffer() | ||||
| t.show(ctx, changes=ctx.changeset(), | t.show(ctx, changes=ctx.changeset(), | ||||
| bug=str(bugid), | bug=pycompat.bytestr(bugid), | ||||
| hgweb=self.ui.config('web', 'baseurl'), | hgweb=self.ui.config('web', 'baseurl'), | ||||
| root=self.repo.root, | root=self.repo.root, | ||||
| webroot=webroot(self.repo.root)) | webroot=webroot(self.repo.root)) | ||||
| data = self.ui.popbuffer() | data = self.ui.popbuffer() | ||||
| self.bzdriver.updatebug(bugid, newstate, data, | self.bzdriver.updatebug(bugid, newstate, data, | ||||
| stringutil.email(ctx.user())) | stringutil.email(ctx.user())) | ||||
| def notify(self, bugs, committer): | def notify(self, bugs, committer): | ||||
| mock bugzilla driver for testing template output: | mock bugzilla driver for testing template output: | ||||
| $ cat <<EOF > bzmock.py | $ cat <<EOF > bzmock.py | ||||
| > from __future__ import absolute_import | > from __future__ import absolute_import | ||||
| > from mercurial import extensions | > from mercurial import extensions | ||||
| > from mercurial import pycompat | |||||
| > from mercurial import registrar | > from mercurial import registrar | ||||
| > from mercurial.utils import stringutil | |||||
| > | > | ||||
| > configtable = {} | > configtable = {} | ||||
| > configitem = registrar.configitem(configtable) | > configitem = registrar.configitem(configtable) | ||||
| > | > | ||||
| > configitem(b'bugzilla', b'mocklog', | > configitem(b'bugzilla', b'mocklog', | ||||
| > default=None, | > default=None, | ||||
| > ) | > ) | ||||
| > def extsetup(ui): | > def extsetup(ui): | ||||
| > bugzilla = extensions.find(b'bugzilla') | > bugzilla = extensions.find(b'bugzilla') | ||||
| > class bzmock(bugzilla.bzaccess): | > class bzmock(bugzilla.bzaccess): | ||||
| > def __init__(self, ui): | > def __init__(self, ui): | ||||
| > super(bzmock, self).__init__(ui) | > super(bzmock, self).__init__(ui) | ||||
| > self._logfile = ui.config(b'bugzilla', b'mocklog') | > self._logfile = ui.config(b'bugzilla', b'mocklog') | ||||
| > def updatebug(self, bugid, newstate, text, committer): | > def updatebug(self, bugid, newstate, text, committer): | ||||
| > with open(self._logfile, 'a') as f: | > with open(pycompat.fsdecode(self._logfile), 'ab') as f: | ||||
| > f.write('update bugid=%r, newstate=%r, committer=%r\n' | > f.write(b'update bugid=%s, newstate=%s, committer=%s\n' | ||||
| > % (bugid, newstate, committer)) | > % (stringutil.pprint(bugid), | ||||
| > f.write('----\n' + text + '\n----\n') | > stringutil.pprint(newstate), | ||||
| > stringutil.pprint(committer))) | |||||
| > f.write(b'----\n' + text + b'\n----\n') | |||||
| > def notify(self, bugs, committer): | > def notify(self, bugs, committer): | ||||
| > with open(self._logfile, 'a') as f: | > with open(pycompat.fsdecode(self._logfile), 'ab') as f: | ||||
| > f.write('notify bugs=%r, committer=%r\n' | > f.write(b'notify bugs=%s, committer=%s\n' | ||||
| > % (bugs, committer)) | > % (stringutil.pprint(bugs), | ||||
| > stringutil.pprint(committer))) | |||||
| > bugzilla.bugzilla._versions[b'mock'] = bzmock | > bugzilla.bugzilla._versions[b'mock'] = bzmock | ||||
| > EOF | > EOF | ||||
| set up mock repository: | set up mock repository: | ||||
| $ hg init mockremote | $ hg init mockremote | ||||
| $ cat <<EOF > mockremote/.hg/hgrc | $ cat <<EOF > mockremote/.hg/hgrc | ||||
| > [extensions] | > [extensions] | ||||