Hello,
could all developpers please ensure that their text editor doesn't mess up whitespaces in the files? Those CVS commit messages are totally useless if the text editor adds or removes whitespace all over the file. Thank you.
JeLuF
On Sat, Jul 24, 2004 at 01:18:17PM +0000, Timwi wrote:
Update of /cvsroot/wikipedia/phase3/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27133/includes
Modified Files: Skin.php Log Message: Tim Starling removed the line where $func is set to 'makeLink', but left it in where it is used as a function name. I'm pretty sure that would give rise to a bug. :) Replacing $func with makeLink.
Index: Skin.php
RCS file: /cvsroot/wikipedia/phase3/includes/Skin.php,v retrieving revision 1.234 retrieving revision 1.235 diff -C2 -d -r1.234 -r1.235 *** Skin.php 24 Jul 2004 10:55:35 -0000 1.234 --- Skin.php 24 Jul 2004 13:18:14 -0000 1.235
*** 67,71 **** return "standard"; } ! # Get/set accessor for delayed link colouring function postParseLinkColour( $setting = NULL ) { --- 67,71 ---- return "standard"; } ! # Get/set accessor for delayed link colouring function postParseLinkColour( $setting = NULL ) {
*** 1477,1483 **** } } ! # Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders() ! $retVal = '<!--LINK ' . implode( ' ', array( $nt->getNamespace(), $nt->getDBkey(), $query, $prefix . $text . $inside ) ) . "-->{$trail}"; } else { --- 1477,1483 ---- } } ! # Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders() ! $retVal = '<!--LINK ' . implode( ' ', array( $nt->getNamespace(), $nt->getDBkey(), $query, $prefix . $text . $inside ) ) . "-->{$trail}"; } else {
*** 1488,1494 **** } else { $threshold = $wgUser->getOption('stubthreshold') ; ! if ( $threshold > 0 ) { $dbr =& wfGetDB( DB_SLAVE ); ! $s = $dbr->selectRow( 'cur', array( 'LENGTH(cur_text) AS x', 'cur_namespace', 'cur_is_redirect' ), array( 'cur_id' => $aid ), $fname ) ; if ( $s !== false ) { --- 1488,1494 ---- } else { $threshold = $wgUser->getOption('stubthreshold') ; ! if ( $threshold > 0 ) { $dbr =& wfGetDB( DB_SLAVE ); ! $s = $dbr->selectRow( 'cur', array( 'LENGTH(cur_text) AS x', 'cur_namespace', 'cur_is_redirect' ), array( 'cur_id' => $aid ), $fname ) ; if ( $s !== false ) {
*** 2500,2508 **** if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) { # Media link ! $comment = preg_replace( '/[[(.*?)]]/', $this->makeMediaLink( $submatch[1], "", $text ), $comment, 1 ); } else { # Other kind of link ! $comment = preg_replace('/[[(.*?)]]/', $this->$func( $match[1], $match[1] ), $comment , 1); } --- 2500,2508 ---- if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) { # Media link ! $comment = preg_replace( '/[[(.*?)]]/', $this->makeMediaLink( $submatch[1], "", $text ), $comment, 1 ); } else { # Other kind of link ! $comment = preg_replace('/[[(.*?)]]/', $this->makeLink( $match[1], $match[1] ), $comment , 1); }
MediaWiki-CVS mailing list MediaWiki-CVS@wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-cvs
Jens Frank wrote:
could all developpers please ensure that their text editor doesn't mess up whitespaces in the files?
Well, personally, I wouldn't call it "messing them up"; all I'm doing is removing whitespace at the end of lines.
So, alternatively, I could ask all developers not to introduce whitespace at the end of the lines. :)
But I'll see what I can do.
Timwi
Timwi wrote:
Jens Frank wrote:
could all developpers please ensure that their text editor doesn't mess up whitespaces in the files?
Well, personally, I wouldn't call it "messing them up"; all I'm doing is removing whitespace at the end of lines.
So, alternatively, I could ask all developers not to introduce whitespace at the end of the lines. :)
But I'll see what I can do.
Timwi
Another solution is to commit two changes : 1st to remove white spaces 2nd to patch thing
Ashar Voultoiz wrote:
Another solution is to commit two changes : 1st to remove white spaces 2nd to patch thing
Yes; I did that before with a larger file that was laden with trailing whitespace. I wouldn't have thought that new trailing whitespace would creep in this quickly.
On Sat, Jul 24, 2004 at 03:39:55PM +0200, Jens Frank wrote:
Those CVS commit messages are totally useless if the text editor adds or removes whitespace all over the file.
Speaking of which: does wiki policy on indentation pro- vide tab=8?
Best, Peter
On Sat, 24 Jul 2004 16:32:12 +0200, Peter Danenberg danenberg@mitdasein.com wrote:
On Sat, Jul 24, 2004 at 03:39:55PM +0200, Jens Frank wrote:
Those CVS commit messages are totally useless if the text editor adds or removes whitespace all over the file.
Speaking of which: does wiki policy on indentation pro-vide tab=8?
Best, Peter
8? You must not use indentation much or you have a huge screen. I personally prefer actual tab characters, and I set my editor to display tabs as 2 spaces.
Peter Danenberg wrote:
On Sat, Jul 24, 2004 at 03:39:55PM +0200, Jens Frank wrote:
Those CVS commit messages are totally useless if the text editor adds or removes whitespace all over the file.
Speaking of which: does wiki policy on indentation pro-vide tab=8?
Sane people use 4-space tabs.
-- brion vibber (brion @ pobox.com)
On Sat, Jul 24, 2004 at 09:46:56AM -0700, Brion Vibber wrote:
Sane people use 4-space tabs.
I thought as much; GNU C dictates nevertheless two,1 and PEAR four spaces (not tabs).2
Taking Phase Three's cue, however, I'll assume the team favours tabs (not spaces); and that despite Emacs' native disposition.
Best, Peter
----------- 1 http://www.gnu.org/prep/standards_23.html 2 http://pear.php.net/manual/en/standards.php
On Sun, Jul 25, 2004 at 02:35:39PM +1000, Tim Starling wrote:
MediaWiki coding style is described in docs/design.doc
Exactly, Tim; but I was hoping it was up for discus- sion.
Space=2 corresponds to the GNU C standard;1 and, in addition to being Emacs' native mode, would format hand- somely in tab=8 browsers.
The one-byte overhead may be an insufficient deterrent.
Best, Peter
----------- 1 http://www.gnu.org/prep/standards_23.html
wikitech-l@lists.wikimedia.org