comparison hgext/bugzilla.py @ 16876:fdc879042414 stable

bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484) Bugs should only be marked fixed if the comment parser gives them the fixed state. xmlrpc+email got this right, xmlrpc screwed it up.
author Jim Hague <jim.hague@acm.org>
date Wed, 06 Jun 2012 16:44:17 +0100
parents 822e75386c16
children 2255950e1f76
comparison
equal deleted inserted replaced
16869:00e1e40d709c 16876:fdc879042414
652 args['work_time'] = newstate['hours'] 652 args['work_time'] = newstate['hours']
653 653
654 if self.bzvermajor >= 4: 654 if self.bzvermajor >= 4:
655 args['ids'] = [bugid] 655 args['ids'] = [bugid]
656 args['comment'] = {'body' : text} 656 args['comment'] = {'body' : text}
657 args['status'] = self.fixstatus 657 if 'fix' in newstate:
658 args['resolution'] = self.fixresolution 658 args['status'] = self.fixstatus
659 args['resolution'] = self.fixresolution
659 self.bzproxy.Bug.update(args) 660 self.bzproxy.Bug.update(args)
660 else: 661 else:
661 if 'fix' in newstate: 662 if 'fix' in newstate:
662 self.ui.warn(_("Bugzilla/XMLRPC needs Bugzilla 4.0 or later " 663 self.ui.warn(_("Bugzilla/XMLRPC needs Bugzilla 4.0 or later "
663 "to mark bugs fixed\n")) 664 "to mark bugs fixed\n"))