##// END OF EJS Templates
bugzilla: allow change comment to mark bugs fixed...
bugzilla: allow change comment to mark bugs fixed Add a second regular expression used when scanning change comments. Bugs matched by this new regular expression have the bug comments and optionally hours updated as with the first regular expression, but they are also marked as fixed. The bug status and resolution to set to mark a bug as fixed can be configured. By default status is set to RESOLVED and resolution to FIXED, the default Bugzilla settings. For example, a change comment containing 'Fixes 1234 h1.5' will be added to bug 1234, the bug will have its working time increased by 1.65 hours, and the bug will be marked RESOLVED/FIXED. Change comments may contain both bug update and fix instructions. If the same bug ID occurs in both, the last instruction found takes precedence. The patch adds new bug states 'bug_status' and 'resolution' and actions to update them to the XMLRPC and XMLRPC/email access methods. XMLRPC does not support marking bugs as fixed when used with Bugzilla versions prior to 4.0. When used with an earlier Bugzilla version, a warning is issued and only comment and hours updated.

File last commit:

r16155:1b2b42e8 stable
r16223:ac4fd323 default
Show More
proto.py
166 lines | 6.2 KiB | text/x-python | PythonLexer
various
hgext: add largefiles extension...
r15168 # Copyright 2011 Fog Creek Software
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
import os
import urllib2
from mercurial import error, httprepo, util, wireproto
from mercurial.i18n import _
import lfutil
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 LARGEFILES_REQUIRED_MSG = ('\nThis repository uses the largefiles extension.'
'\n\nPlease enable it in your Mercurial config '
'file.\n')
various
hgext: add largefiles extension...
r15168
def putlfile(repo, proto, sha):
Benjamin Pollack
largefiles: make the store primary, and the user cache secondary...
r15317 '''Put a largefile into a repository's local store and into the
user cache.'''
various
hgext: add largefiles extension...
r15168 proto.redirect()
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 tmpfp = util.atomictempfile(lfutil.storepath(repo, sha),
createmode=repo.store.createmode)
various
hgext: add largefiles extension...
r15168 try:
try:
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 proto.getfile(tmpfp)
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 tmpfp._fp.seek(0)
if sha != lfutil.hexsha1(tmpfp._fp):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 raise IOError(0, _('largefile contents do not match hash'))
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 tmpfp.close()
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 lfutil.linktousercache(repo, sha)
Hao Lian
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp...
r15391 except IOError, e:
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 repo.ui.warn(_('largefiles: failed to put %s into store: %s') %
(sha, e.strerror))
various
hgext: add largefiles extension...
r15168 return wireproto.pushres(1)
finally:
Martin Geisler
largefiles: respect store.createmode and avoid extra file copy...
r16155 tmpfp.discard()
various
hgext: add largefiles extension...
r15168
return wireproto.pushres(0)
def getlfile(repo, proto, sha):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''Retrieve a largefile from the repository-local cache or system
cache.'''
various
hgext: add largefiles extension...
r15168 filename = lfutil.findfile(repo, sha)
if not filename:
raise util.Abort(_('requested largefile %s not present in cache') % sha)
f = open(filename, 'rb')
length = os.fstat(f.fileno())[6]
Greg Ward
largefiles: improve comments, internal docstrings...
r15252
# Since we can't set an HTTP content-length header here, and
# Mercurial core provides no way to give the length of a streamres
# (and reading the entire file into RAM would be ill-advised), we
# just send the length on the first line of the response, like the
# ssh proto does for string responses.
various
hgext: add largefiles extension...
r15168 def generator():
yield '%d\n' % length
for chunk in f:
yield chunk
return wireproto.streamres(generator())
def statlfile(repo, proto, sha):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 '''Return '2\n' if the largefile is missing, '1\n' if it has a
mismatched checksum, or '0\n' if it is in good condition'''
various
hgext: add largefiles extension...
r15168 filename = lfutil.findfile(repo, sha)
if not filename:
return '2\n'
fd = None
try:
fd = open(filename, 'rb')
return lfutil.hexsha1(fd) == sha and '0\n' or '1\n'
finally:
if fd:
fd.close()
def wirereposetup(ui, repo):
class lfileswirerepository(repo.__class__):
def putlfile(self, sha, fd):
# unfortunately, httprepository._callpush tries to convert its
# input file-like into a bundle before sending it, so we can't use
# it ...
if issubclass(self.__class__, httprepo.httprepository):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 res = None
various
hgext: add largefiles extension...
r15168 try:
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 res = self._call('putlfile', data=fd, sha=sha,
headers={'content-type':'application/mercurial-0.1'})
d, output = res.split('\n', 1)
for l in output.splitlines(True):
self.ui.warn(_('remote: '), l, '\n')
return int(d)
various
hgext: add largefiles extension...
r15168 except (ValueError, urllib2.HTTPError):
Kevin Gessner
largefiles: display remote errors from putlfile (issue3123) (issue3149)
r15778 self.ui.warn(_('unexpected putlfile response: %s') % res)
various
hgext: add largefiles extension...
r15168 return 1
# ... but we can't use sshrepository._call because the data=
# argument won't get sent, and _callpush does exactly what we want
# in this case: send the data straight through
else:
try:
ret, output = self._callpush("putlfile", fd, sha=sha)
if ret == "":
raise error.ResponseError(_('putlfile failed:'),
output)
return int(ret)
except IOError:
return 1
except ValueError:
raise error.ResponseError(
_('putlfile failed (unexpected response):'), ret)
def getlfile(self, sha):
stream = self._callstream("getlfile", sha=sha)
length = stream.readline()
try:
length = int(length)
except ValueError:
Matt Mackall
largefiles: fix over-long lines
r15170 self._abort(error.ResponseError(_("unexpected response:"),
length))
various
hgext: add largefiles extension...
r15168 return (length, stream)
def statlfile(self, sha):
try:
return int(self._call("statlfile", sha=sha))
except (ValueError, urllib2.HTTPError):
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # If the server returns anything but an integer followed by a
various
hgext: add largefiles extension...
r15168 # newline, newline, it's not speaking our language; if we get
# an HTTP error, we can't be sure the largefile is present;
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # either way, consider it missing.
various
hgext: add largefiles extension...
r15168 return 2
repo.__class__ = lfileswirerepository
# advertise the largefiles=serve capability
def capabilities(repo, proto):
return capabilities_orig(repo, proto) + ' largefiles=serve'
# duplicate what Mercurial's new out-of-band errors mechanism does, because
# clients old and new alike both handle it well
def webproto_refuseclient(self, message):
self.req.header([('Content-Type', 'application/hg-error')])
return message
def sshproto_refuseclient(self, message):
self.ui.write_err('%s\n-\n' % message)
self.fout.write('\n')
self.fout.flush()
return ''
def heads(repo, proto):
if lfutil.islfilesrepo(repo):
Na'Tosha Bard
largefiles: remove pre-1.9 code from extension first bundled with 1.9
r15224 return wireproto.ooberror(LARGEFILES_REQUIRED_MSG)
various
hgext: add largefiles extension...
r15168 return wireproto.heads(repo, proto)
def sshrepo_callstream(self, cmd, **args):
if cmd == 'heads' and self.capable('largefiles'):
cmd = 'lheads'
if cmd == 'batch' and self.capable('largefiles'):
args['cmds'] = args['cmds'].replace('heads ', 'lheads ')
return ssh_oldcallstream(self, cmd, **args)
def httprepo_callstream(self, cmd, **args):
if cmd == 'heads' and self.capable('largefiles'):
cmd = 'lheads'
if cmd == 'batch' and self.capable('largefiles'):
args['cmds'] = args['cmds'].replace('heads ', 'lheads ')
return http_oldcallstream(self, cmd, **args)