144837 - bonsai file display always shows trunk revisions

Status: RESOLVED FIXED

(Webtools Graveyard :: Bonsai, defect)

Description

[Mark Smith [:mcs]]

The file display in Bonsai always shows trunk revisions, even when browsing a
branch. Steps to reproduce:

1) Start at this branch URL:

http://bonsai.mozilla.org/rview.cgi?cvsroot=/cvsroot&dir=mozilla&module=MozillaBranchTinderboxAll&rev=MOZILLA_1_0_0_BRANCH

2) Click on client.mk (or any file) in the "Files" section.

3) Click on "View Blame-Annotated Source". Notice that a trunk revision is shown.

The problem is that when clicking on a file, the branch information is discarded
by Bonsai (e.g., rev=MOZILLA_1_0_0_BRANCH is not in the URLs that are generated).

The URL for "View Blame-Annotated Source" that is generated is this:

http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/client.mk&rev=&root=/cvsroot

And it should be this:

http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/client.mk&rev=&root=/cvsroot&rev=MOZILLA_1_0_0_BRANCH


This is very annoying if you live in a branch intensive world.

Comment 1

[Mark Smith [:mcs]]

Actually, the precise problem is that the Directories and Files page does not
include &rev=<branch> in the links to specific files (it does include them in
the directory links).

Comment 2

[timeless]

Attachment: pass &rev along

Comment 3

[Mark Smith [:mcs]]

Comment on attachment 85375 [details] [diff] [review]
pass &rev along

I have never looked at the code for cvsblame before, but shouldn't the HREF
contain $revstr, not &revstr?

Comment 4

[Bradley Baetz (:bbaetz)]

&$revstring, actually, it looks like it should be,

Comment 5

[timeless]

Attachment: a corrected and tested patch

ok baloo's original testing caught some really foolish stuff
and mark was right the & was a thoughto'd $

Comment 6

[Tara Hernandez]

Comment on attachment 85543 [details] [diff] [review]
a corrected and tested patch

Verfied on landfill's test bonsai instance

Comment 7

[timeless]

.

Comment 8

[timeless]

checked in

Comment 9

[timeless]

*** Bug 46482 has been marked as a duplicate of this bug. ***