loggerhead

Merge lp:~spiv/loggerhead/diff-of-r1 into lp:loggerhead

Proposed by Andrew Bennetts on 2011-06-28

Status:	Merged
Merged at revision:	452
Proposed branch:	lp:~spiv/loggerhead/diff-of-r1
Merge into:	lp:loggerhead
Diff against target:	42 lines (+5/-3) 2 files modified loggerhead/controllers/diff_ui.py (+4/-2) loggerhead/templates/revision.pt (+1/-1)
To merge this branch:	bzr merge lp:~spiv/loggerhead/diff-of-r1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Loggerhead Reviewers		2011-06-28	Pending
Review via email: mp+66184@code.launchpad.net

Fix /diff/1

This fixes /diff/1. i.e. if a revision has no left-hand parent then use NULL_REVISION instead.

This also reenables the 'download diff' link in this situation too, which had been suppressed, presumably to workaround this limitation.

Revision history for this message

John A Meinel (jameinel) wrote on 2011-06-28:

Merge: approve

=:->
On Jun 28, 2011 5:53 PM, "Andrew Bennetts" <email address hidden>
wrote:
> Andrew Bennetts has proposed merging lp:~spiv/loggerhead/diff-of-r1 into
lp:loggerhead.
>
> Requested reviews:
> Loggerhead Reviewers (loggerhead-reviewers)
>
> For more details, see:
> https://code.launchpad.net/~spiv/loggerhead/diff-of-r1/+merge/66184
>
> This fixes /diff/1. i.e. if a revision has no left-hand parent then use
NULL_REVISION instead.
>
> This also reenables the 'download diff' link in this situation too, which
had been suppressed, presumably to workaround this limitation.
> --
> https://code.launchpad.net/~spiv/loggerhead/diff-of-r1/+merge/66184
> You are subscribed to branch lp:loggerhead.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'loggerhead/controllers/diff_ui.py'
2	--- loggerhead/controllers/diff_ui.py 2011-03-18 09:39:01 +0000
3	+++ loggerhead/controllers/diff_ui.py 2011-06-28 16:53:11 +0000
4	@@ -17,12 +17,12 @@
5	#
6
7	from cStringIO import StringIO
8	-import logging
9	import time
10
11	from paste.request import path_info_pop
12
13	from bzrlib.diff import show_diff_trees
14	+from bzrlib.revision import NULL_REVISION
15
16	from loggerhead.controllers import TemplatedBranchView
17
18	@@ -47,8 +47,10 @@
19	revid_from = self._history.fix_revid(revid_from)
20	change = self._history.get_changes([revid_from])[0]
21
22	- if len(args) is 2:
23	+ if len(args) == 2:
24	revid_to = self._history.fix_revid(args[1])
25	+ elif len(change.parents) == 0:
26	+ revid_to = NULL_REVISION
27	else:
28	revid_to = change.parents[0].revid
29
30
31	=== modified file 'loggerhead/templates/revision.pt'
32	--- loggerhead/templates/revision.pt 2011-02-23 03:01:15 +0000
33	+++ loggerhead/templates/revision.pt 2011-06-28 16:53:11 +0000
34	@@ -80,7 +80,7 @@
35	</a>
36	</li>
37	<li>
38	- <a tal:condition="python:len(change.parents) > 0 and compare_revid is None"
39	+ <a tal:condition="python:compare_revid is None"
40	tal:attributes="href python:url(['/diff', change.revno], clear=1)">download diff</a>
41	<a tal:condition="python:compare_revid is not None"
42	tal:attributes="href python:url(['/diff', change.revno, history.get_revno(compare_revid)], clear=1)">download diff</a>