r49997 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r49996‎ | r49997 | r49998 >
Date:06:01, 28 April 2009
Author:shinjiman
Status:reverted (Comments)
Tags:
Comment:
Follow up r49996, changing pathrev to revision on non-trunk preventing the 404 error.
Modified paths:
  • /trunk/phase3/includes/specials/SpecialVersion.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialVersion.php
——@@ -405,7 +405,11 @@
406406 return false;
407407 } else {
408408 $viewvcStart = 'http://svn.wikimedia.org/viewvc/mediawiki/';
409 - $viewvcEnd = '/?pathrev=';
 409+ if (strstr( $content[4], 'trunk' ))
 410+ $viewvcEnd = '/?pathrev=';
 411+ else
 412+ // Avoids 404 error using pathrev when it does not found
 413+ $viewvcEnd = '/?revision=';
410414 $viewvc = $viewvcStart . $endPath . $viewvcEnd;
411415 return $viewvc;
412416 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r50106Follow up r49997, showing both last modified and checkout revision number for...shinjiman14:09, 1 May 2009
r56713* (bug 20730) Fix to Special:Version ViewVC link for branch checkouts...brion16:33, 21 September 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r49996Localisation updates Cantonese, Chinese and Literary Chineseshinjiman05:34, 28 April 2009

Comments

#Comment by Brion VIBBER (talk | contribs)   18:09, 28 April 2009

Refers to r49995, not r49996.

I'm not 100% sure 'revision=' actually does anything... pathrev issue seems to be because the *contents* of the branch directories generally haven't changed since *before* the branch was made, so it.... sounds kind of confusing. ;)

More relevantly -- in that situation you can't check out the specified revision with the specified path, either: 

$ svn co [http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_14/extensions/MetaKeywords@45037 http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_14/extensions/MetaKeywords@45037]
svn: URL '[http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_14/extensions/MetaKeywords' http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_14/extensions/MetaKeywords'] doesn't exist

note the above shows wrong -- this is a bug in comment format processing in CodeReview, will need to poke that ;)

Probably we want to be using the checkout revision (eg, 50010), not the directory's last-changed revision (eg 45037). The latter doesn't update to reflect other changes such as surrounding path structure, and I'm not sure it'll track changes in subdirectories either.

Ideally we want the path and revision number that can be used to check out the same code we've got.

#Comment by Shinjiman (talk | contribs)   12:23, 1 May 2009

There's a mockup shown in http://www.flickr.com/photos/83734473@N00/3491323904/sizes/l . (Color coding for this display purposes only)

  • Red for the directory last modified revision number
  • Blue for the directory checkout revision number

I think is that the best way to showing both the last modified directory revision number and the directory checkout revision number?

In most cases the SVN checkout would do both phase3 and extersions together so IMO showing the checkout revision number on the extensions would be not much useful, even though an earlier revision can be checkout-ed from the SVN.

#Comment by Tim Starling (talk | contribs)   08:32, 16 August 2009

Should be fixed as of r55130.

#Comment by Brion VIBBER (talk | contribs)   16:34, 21 September 2009

Per later changes, I've reverted this path change in r56713 as a fix for bug 20730.

The link is now using the checkout revision which makes pathrev work properly again for branches, so we don't need to use the (apparently non-functional) revision parameter instead.

Status & tagging log