1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
# Copyright (C) 2008 Canonical Ltd.
# (Authored by Martin Albisetti <argentina@gmail.com>)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
from cStringIO import StringIO
import logging
import time
from paste.request import path_info_pop
from bzrlib.diff import show_diff_trees
from loggerhead.controllers import TemplatedBranchView
log = logging.getLogger("loggerhead.controllers")
class DiffUI(TemplatedBranchView):
"""Class to output a diff for a single file or revisions."""
def __call__(self, environ, start_response):
# /diff/<rev_id>/<rev_id>
"""Default method called from /diff URL."""
z = time.time()
args = []
while True:
arg = path_info_pop(environ)
if arg is None:
break
args.append(arg)
revid_from = args[0]
# Convert a revno to a revid if we get a revno
revid_from = self._history.fix_revid(revid_from)
change = self._history.get_changes([revid_from])[0]
if len(args) is 2:
revid_to = self._history.fix_revid(args[1])
else:
revid_to = change.parents[0].revid
repo = self._branch.branch.repository
revtree1 = repo.revision_tree(revid_to)
revtree2 = repo.revision_tree(revid_from)
diff_content_stream = StringIO()
show_diff_trees(revtree1, revtree2, diff_content_stream,
old_label='', new_label='')
content = diff_content_stream.getvalue()
self.log.info('/diff %r:%r in %r secs' % (revid_from, revid_to,
time.time() - z))
revno1 = self._history.get_revno(revid_from)
revno2 = self._history.get_revno(revid_to)
filename = '%s_%s.diff' % (revno1, revno2)
headers = [
('Content-Type', 'application/octet-stream'),
('Content-Length', len(content)),
('Content-Disposition', 'attachment; filename=%s' % (filename,)),
]
start_response('200 OK', headers)
return [content]
|