loggerhead

Merge lp:loggerhead/1.18 into lp:loggerhead

  1. 1.18
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Approved by: John A Meinel
Approved revision: 424
Merged at revision: 457
Proposed branch: lp:loggerhead/1.18
Merge into: lp:loggerhead
Diff against target: 122 lines (+59/-1) (has conflicts)
4 files modified
NEWS (+14/-0)
loggerhead/__init__.py (+1/-1)
loggerhead/controllers/view_ui.py (+36/-0)
loggerhead/templatefunctions.py (+8/-0)
Text conflict in NEWS
Text conflict in loggerhead/controllers/view_ui.py
Text conflict in loggerhead/templatefunctions.py
To merge this branch: bzr merge lp:loggerhead/1.18
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+74532@code.launchpad.net

This proposal has been superseded by a proposal from 2011-09-08.

Description of the change

Merge in the 1.18 branch, for the right changelog entries.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/08/2011 01:37 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:loggerhead/1.18 into lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-reviewers)
> Related bugs:
> Bug #673999 in loggerhead: "missing import logging.handlers in start-loggerhead"
> https://bugs.launchpad.net/loggerhead/+bug/673999
> Bug #740142 in loggerhead: "persistent xss vector in (unescaped) filenames in revision views "
> https://bugs.launchpad.net/loggerhead/+bug/740142
>
> For more details, see:
> https://code.launchpad.net/~loggerhead-team/loggerhead/1.18/+merge/74532
>
> Merge in the 1.18 branch, for the right changelog entries.

 merge: approve
John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5odaAACgkQJdeBCYSNAAPyKACgwVS/dKagFCUlGfWzwdPk3B/P
tSsAnRNn8AJh/Lu85KLs/Tze7youyxve
=kZBo
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2011-03-25 11:38:43 +0000
3+++ NEWS 2011-09-07 23:36:17 +0000
4@@ -1,6 +1,7 @@
5 What's changed in loggerhead?
6 =============================
7
8+<<<<<<< TREE
9 1.19 [???]
10 ----------------
11
12@@ -46,6 +47,19 @@
13 (Jelmer Vernooij, #736026)
14
15
16+=======
17+1.18.1 [24Mar2011]
18+------------------
19+
20+ - Fix escaping of filenames in revision views.
21+ (William Grant, #740142)
22+
23+ - Add missing import to loggerhead.trace, allowing start-loggerhead
24+ to run when a log.roll config option is set.
25+ (Max Kanat-Alexander, #673999)
26+
27+
28+>>>>>>> MERGE-SOURCE
29 1.18 [10Nov2010]
30 ----------------
31
32
33=== modified file 'loggerhead/__init__.py'
34--- loggerhead/__init__.py 2010-11-11 03:30:43 +0000
35+++ loggerhead/__init__.py 2011-09-07 23:36:17 +0000
36@@ -22,7 +22,7 @@
37
38 import pkg_resources
39
40-__version__ = '1.18'
41+__version__ = '1.18.1'
42 required_bzrlib = (1, 17)
43
44 pkg_resources.get_distribution('Paste>=1.6')
45
46=== modified file 'loggerhead/controllers/view_ui.py'
47--- loggerhead/controllers/view_ui.py 2011-04-22 17:22:26 +0000
48+++ loggerhead/controllers/view_ui.py 2011-09-07 23:36:17 +0000
49@@ -73,9 +73,45 @@
50 file_lines = self.text_lines(file_id, revid)
51 except bzrlib.errors.BinaryFile:
52 # bail out; this isn't displayable text
53+<<<<<<< TREE
54 return ['(This is a binary file.)']
55
56 return file_lines
57+=======
58+ yield util.Container(parity=0, lineno=1, status='same',
59+ text='(This is a binary file.)',
60+ change=util.Container())
61+ else:
62+ if highlight is not None:
63+ hl_lines = highlight(file_name, file_text, encoding)
64+ hl_lines.extend([u''] * (len(file_lines) - len(hl_lines)))
65+ else:
66+ hl_lines = map(util.html_escape, file_lines)
67+
68+ change_cache = {}
69+
70+ last_line_revid = None
71+ for line_revid, text in tree.annotate_iter(file_id):
72+ if line_revid == last_line_revid:
73+ # remember which lines have a new revno and which don't
74+ status = 'same'
75+ else:
76+ status = 'changed'
77+ parity ^= 1
78+ last_line_revid = line_revid
79+ if line_revid in change_cache:
80+ change = change_cache[line_revid]
81+ else:
82+ change = self._history.get_changes([line_revid])[0]
83+ change_cache[line_revid] = change
84+
85+ yield util.Container(
86+ parity=parity, lineno=lineno, status=status,
87+ change=change, text=hl_lines[lineno - 1])
88+ lineno += 1
89+
90+ self.log.debug('annotate: %r secs' % (time.time() - z,))
91+>>>>>>> MERGE-SOURCE
92
93 def get_values(self, path, kwargs, headers):
94 history = self._history
95
96=== modified file 'loggerhead/templatefunctions.py'
97--- loggerhead/templatefunctions.py 2011-03-23 04:04:44 +0000
98+++ loggerhead/templatefunctions.py 2011-09-07 23:36:17 +0000
99@@ -127,11 +127,19 @@
100
101
102 @templatefunc
103+<<<<<<< TREE
104 def view_link(url, revno, path):
105 return html_format(
106 '<a href="%s" title="Annotate %s">%s</a>',
107 url(['/view', revno, path]), path, path)
108
109+=======
110+def annotate_link(url, revno, path):
111+ return html_format(
112+ '<a href="%s" title="Annotate %s">%s</a>',
113+ url(['/annotate', revno, path]), path, path)
114+
115+>>>>>>> MERGE-SOURCE
116
117 @templatefunc
118 def revision_link(url, revno, path, frag=''):
119
120=== modified file 'loggerhead/tests/__init__.py'
121=== modified file 'loggerhead/tests/test_simple.py'
122=== modified file 'loggerhead/util.py'

Subscribers

People subscribed via source and target branches