r71773 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r71772‎ | r71773 | r71774 >
Date:23:53, 26 August 2010
Author:tomasz
Status:deferred (Comments)
Tags:
Comment:
Picking up changes from r71098
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/CentralNotice (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Article.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/ChangesList.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/ConfEditor.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/DefaultSettings.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/EditPage.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/HTMLForm.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/HistoryPage.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Html.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/HttpFunctions.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/LocalisationCache.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/LogEventsList.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/OutputPage.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Pager.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Preferences.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/Sanitizer.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/UserMailer.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiBase.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiLogin.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiQueryAllUsers.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/diff (modified) (history)
  • /branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/filerepo (modified) (history)
  • /branches/wmf/1.16wmf4/includes/json/Services_JSON.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/media (modified) (history)
  • /branches/wmf/1.16wmf4/includes/media/Bitmap.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/parser (modified) (history)
  • /branches/wmf/1.16wmf4/includes/specials (modified) (history)
  • /branches/wmf/1.16wmf4/includes/specials/SpecialAllmessages.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/specials/SpecialRevisiondelete.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/CentralNotice/TemplatePager.php
——@@ -30,7 +30,7 @@
3131 * Sort the banner list by tmp_id
3232 */
3333 function getIndexField() {
34 - return 'tmp_id';
 34+ return 'cn_templates.tmp_id';
3535 }
3636
3737 /**
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
3838 Merged /trunk/extensions/CentralNotice:r71748-71753
Property changes on: branches/wmf/1.16wmf4/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
3939 Merged /trunk/phase3/includes/ChangesList.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Article.php
___________________________________________________________________
Modified: svn:mergeinfo
4040 Merged /trunk/phase3/includes/Article.php:r71059,71098
Index: branches/wmf/1.16wmf4/includes/Pager.php
——@@ -190,8 +190,12 @@
191191 function extractResultInfo( $offset, $limit, ResultWrapper $res ) {
192192 $numRows = $res->numRows();
193193 if ( $numRows ) {
 194+ # Remove any table prefix from index field
 195+ $parts = explode( '.', $this->mIndexField );
 196+ $indexColumn = end( $parts );
 197+
194198 $row = $res->fetchRow();
195 - $firstIndex = $row[$this->mIndexField];
 199+ $firstIndex = $row[$indexColumn];
196200
197201 # Discard the extra result row if there is one
198202 if ( $numRows > $this->mLimit && $numRows > 1 ) {
——@@ -201,7 +205,7 @@
202206 $this->mPastTheEndIndex = $this->mPastTheEndRow->$indexField;
203207 $res->seek( $numRows - 2 );
204208 $row = $res->fetchRow();
205 - $lastIndex = $row[$this->mIndexField];
 209+ $lastIndex = $row[$indexColumn];
206210 } else {
207211 $this->mPastTheEndRow = null;
208212 # Setting indexes to an empty string means that they will be
——@@ -211,7 +215,7 @@
212216 $this->mPastTheEndIndex = '';
213217 $res->seek( $numRows - 1 );
214218 $row = $res->fetchRow();
215 - $lastIndex = $row[$this->mIndexField];
 219+ $lastIndex = $row[$indexColumn];
216220 }
217221 } else {
218222 $firstIndex = '';
Property changes on: branches/wmf/1.16wmf4/includes/Sanitizer.php
___________________________________________________________________
Modified: svn:mergeinfo
219223 Merged /trunk/phase3/includes/Sanitizer.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/filerepo
___________________________________________________________________
Modified: svn:mergeinfo
220224 Merged /trunk/phase3/includes/filerepo:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/media/Bitmap.php
___________________________________________________________________
Modified: svn:mergeinfo
221225 Merged /trunk/phase3/includes/media/Bitmap.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/media
___________________________________________________________________
Modified: svn:mergeinfo
222226 Merged /trunk/phase3/includes/media:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Preferences.php
___________________________________________________________________
Modified: svn:mergeinfo
223227 Merged /trunk/phase3/includes/Preferences.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/Html.php
___________________________________________________________________
Modified: svn:mergeinfo
224228 Merged /trunk/phase3/includes/Html.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/parser
___________________________________________________________________
Modified: svn:mergeinfo
225229 Merged /trunk/phase3/includes/parser:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/UserMailer.php
___________________________________________________________________
Modified: svn:mergeinfo
226230 Merged /trunk/phase3/includes/UserMailer.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/diff/DifferenceInterface.php
___________________________________________________________________
Modified: svn:mergeinfo
227231 Merged /trunk/phase3/includes/diff/DifferenceInterface.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/diff
___________________________________________________________________
Modified: svn:mergeinfo
228232 Merged /trunk/phase3/includes/diff:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiLogin.php
___________________________________________________________________
Modified: svn:mergeinfo
229233 Merged /trunk/phase3/includes/api/ApiLogin.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiBase.php
___________________________________________________________________
Modified: svn:mergeinfo
230234 Merged /trunk/phase3/includes/api/ApiBase.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api/ApiQueryAllUsers.php
___________________________________________________________________
Modified: svn:mergeinfo
231235 Merged /trunk/phase3/includes/api/ApiQueryAllUsers.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
232236 Merged /trunk/phase3/includes/api:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
233237 Merged /trunk/phase3/includes/json/Services_JSON.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
234238 Merged /trunk/phase3/includes/OutputPage.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php
___________________________________________________________________
Modified: svn:mergeinfo
235239 Merged /trunk/phase3/includes/specials/SpecialUpload.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialAllmessages.php
___________________________________________________________________
Modified: svn:mergeinfo
236240 Merged /trunk/phase3/includes/specials/SpecialAllmessages.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
___________________________________________________________________
Modified: svn:mergeinfo
237241 Merged /trunk/phase3/includes/specials/SpecialUserlogin.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialRevisiondelete.php
___________________________________________________________________
Modified: svn:mergeinfo
238242 Merged /trunk/phase3/includes/specials/SpecialRevisiondelete.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
239243 Merged /trunk/phase3/includes/specials:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/LogEventsList.php
___________________________________________________________________
Modified: svn:mergeinfo
240244 Merged /trunk/phase3/includes/LogEventsList.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php
___________________________________________________________________
Modified: svn:mergeinfo
241245 Merged /trunk/phase3/includes/DefaultSettings.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/EditPage.php
___________________________________________________________________
Modified: svn:mergeinfo
242246 Merged /trunk/phase3/includes/EditPage.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HTMLForm.php
___________________________________________________________________
Modified: svn:mergeinfo
243247 Merged /trunk/phase3/includes/HTMLForm.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
244248 Merged /trunk/phase3/includes/ConfEditor.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
245249 Merged /trunk/phase3/includes/HistoryPage.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/LocalisationCache.php
___________________________________________________________________
Modified: svn:mergeinfo
246250 Merged /trunk/phase3/includes/LocalisationCache.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes/HttpFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
247251 Merged /trunk/phase3/includes/HttpFunctions.php:r71059,71098
Property changes on: branches/wmf/1.16wmf4/includes
___________________________________________________________________
Modified: svn:mergeinfo
248252 Merged /trunk/phase3/includes:r71059,71098

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r71098Fixed E_STRICT from r71059maxsem07:03, 15 August 2010

Comments

#Comment by Tfinc (talk | contribs)   23:54, 26 August 2010

Sigh. I really wish svn knew better then to pick up empty changes.

#Comment by Catrope (talk | contribs)   00:00, 27 August 2010

This is caused by SVN overzealously setting svn:mergeinfo properties on files. My remedy for this: 

svn st | grep '^ M' | awk '{ print $2 }' | xargs svn revert

This will revert all files that only have property changes and no content changes (note that this may be bad in case you're actually trying to merge legit property changes without content changes).

#Comment by Tim Starling (talk | contribs)   08:44, 27 August 2010

Simpler way: 

cd includes
svn merge -c 71098 ^/trunk/phase3/includes/Pager.php

That sets mergeinfo only on that one file. Roan's way would be useful if you had to merge lots of different files.

Status & tagging log