| Index: trunk/extensions/ExtensionDistributor/ExtensionDistributor_body.php |
| — | — | @@ -238,7 +238,7 @@ |
| 239 | 239 | // Determine tar name. |
| 240 | 240 | $cleanName = str_replace( '/', '_', $extension ); |
| 241 | 241 | $versionName = $wgExtDistBranches[$version]['tarLabel']; |
| 242 | | - $tarName = "$cleanName-$versionName-r$rev.tar.gz"; |
| | 242 | + $tarName = "$cleanName-$versionName-r$rev.tar.gz"; // TODO: Do we still want r prefix for git? Probably not |
| 243 | 243 | $tarFile = "$wgExtDistTarDir/$tarName"; |
| 244 | 244 | |
| 245 | 245 | // Create the archive if it doesn't exist. |
| — | — | @@ -293,12 +293,11 @@ |
| 294 | 294 | protected function updateAndGetRevisionLocal( $extension, $version, $vcs ) { |
| 295 | 295 | global $wgExtDistWorkingCopy, $wgOut; |
| 296 | 296 | |
| 297 | | - // svn up |
| 298 | 297 | $dir = "$wgExtDistWorkingCopy/$version/extensions/$extension"; |
| 299 | 298 | |
| 300 | 299 | $ed = ExtensionDistributorVCS::factory( $vcs ); |
| 301 | 300 | if ( $ed === null ) { |
| 302 | | - $wgOut->addWikiMsg( 'extdist-cvs-unsupported', $vcs ); |
| | 301 | + $wgOut->addWikiMsg( 'extdist-vcs-unsupported', $vcs ); |
| 303 | 302 | return false; |
| 304 | 303 | } |
| 305 | 304 | |
| Index: trunk/extensions/ExtensionDistributor/ExtensionDistributor.i18n.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | |
| 50 | 50 | If you have any questions about this extension distribution system, please go to [[Extension talk:ExtensionDistributor]].", |
| 51 | 51 | 'extdist-want-more' => 'Get another extension', |
| 52 | | - 'extdist-cvs-unsupported' => 'Extension Distributor doesn\'t support the "$1" version control system.', |
| | 52 | + 'extdist-vcs-unsupported' => 'Extension Distributor doesn\'t support the "$1" version control system.', |
| 53 | 53 | 'extdist-git-invalid-dir' => 'Unable to enter directory for git checkout', |
| 54 | 54 | ); |
| 55 | 55 | |
| — | — | @@ -593,7 +593,7 @@ |
| 594 | 594 | |
| 595 | 595 | Sofern du Fragen und Anmerkungen zu diesem System zur Verteilung von Erweiterungen hast, nutze bitte diese [[Extension talk:ExtensionDistributor|Diskussionsseite]].", |
| 596 | 596 | 'extdist-want-more' => 'Eine weitere Erweiterung herunterladen', |
| 597 | | - 'extdist-cvs-unsupported' => 'Das Versionsverwaltungssystem „$1“ wird nicht unterstützt.', |
| | 597 | + 'extdist-vcs-unsupported' => 'Das Versionsverwaltungssystem „$1“ wird nicht unterstützt.', |
| 598 | 598 | 'extdist-git-invalid-dir' => 'Auf das Verzeichnis zum Abruf über Git konnte nicht zugegriffen werden.', |
| 599 | 599 | ); |
| 600 | 600 | |
| — | — | @@ -890,7 +890,7 @@ |
| 891 | 891 | |
| 892 | 892 | Si tienes cualquier duda sobre este sistema de distribución de extensiones, por favor ve a [[Extension talk:ExtensionDistributor]].", |
| 893 | 893 | 'extdist-want-more' => 'Obtener otra extensión', |
| 894 | | - 'extdist-cvs-unsupported' => 'El Distribuidor de extensión no admite el sistema de control de versión "$1".', |
| | 894 | + 'extdist-vcs-unsupported' => 'El Distribuidor de extensión no admite el sistema de control de versión "$1".', |
| 895 | 895 | 'extdist-git-invalid-dir' => 'No se ha podido entrar al directorio para la comprobación de Git', |
| 896 | 896 | ); |
| 897 | 897 | |
| — | — | @@ -1088,7 +1088,7 @@ |
| 1089 | 1089 | |
| 1090 | 1090 | Si vous avez des questions concernant ce système de distribution des extensions, veuillez consulter [[Extension talk:ExtensionDistributor]].", |
| 1091 | 1091 | 'extdist-want-more' => 'Obtenir une autre extension', |
| 1092 | | - 'extdist-cvs-unsupported' => 'Le distributeur d\'extension ne supporte pas le système de contrôle de version "$1".', |
| | 1092 | + 'extdist-vcs-unsupported' => 'Le distributeur d\'extension ne supporte pas le système de contrôle de version "$1".', |
| 1093 | 1093 | 'extdist-git-invalid-dir' => "Impossible d'entrer dans le répertoire pour une inspection de Git", |
| 1094 | 1094 | ); |
| 1095 | 1095 | |
| — | — | @@ -1197,7 +1197,7 @@ |
| 1198 | 1198 | |
| 1199 | 1199 | Se ten algunha dúbida ou pregunta acerca do sistema de distribución das extensións, por favor, vaia a [[Extension talk:ExtensionDistributor]].", |
| 1200 | 1200 | 'extdist-want-more' => 'Obter outra extensión', |
| 1201 | | - 'extdist-cvs-unsupported' => 'A extensión de distribución non soporta o sistema de control de versións "$1".', |
| | 1201 | + 'extdist-vcs-unsupported' => 'A extensión de distribución non soporta o sistema de control de versións "$1".', |
| 1202 | 1202 | 'extdist-git-invalid-dir' => 'Non se pode entrar no directorio para a comprobación do Git', |
| 1203 | 1203 | ); |
| 1204 | 1204 | |
| — | — | @@ -1433,7 +1433,7 @@ |
| 1434 | 1434 | |
| 1435 | 1435 | Jeli maš prašenja wo systemje rozdźělowanja rozšěrjenjow, prošu dźi k [[Extension talk:ExtensionDistributor]].", |
| 1436 | 1436 | 'extdist-want-more' => 'Dalše rozšěrjenje wobstarać', |
| 1437 | | - 'extdist-cvs-unsupported' => 'Extension Distributor wersijowy kontrolny system "$1" njepodpěruje.', |
| | 1437 | + 'extdist-vcs-unsupported' => 'Extension Distributor wersijowy kontrolny system "$1" njepodpěruje.', |
| 1438 | 1438 | 'extdist-git-invalid-dir' => 'Njeje móžno, zapis za wotwołanje přez Git zapodać', |
| 1439 | 1439 | ); |
| 1440 | 1440 | |
| — | — | @@ -1539,7 +1539,7 @@ |
| 1540 | 1540 | |
| 1541 | 1541 | Si tu ha questiones super iste systema de distribution de extensiones, per favor visita [[Extension talk:ExtensionDistributor]].", |
| 1542 | 1542 | 'extdist-want-more' => 'Obtener un altere extension', |
| 1543 | | - 'extdist-cvs-unsupported' => 'Extension Distributor non supporta le systema de controlo de versiones "$1".', |
| | 1543 | + 'extdist-vcs-unsupported' => 'Extension Distributor non supporta le systema de controlo de versiones "$1".', |
| 1544 | 1544 | 'extdist-git-invalid-dir' => 'Impossibile entrar in le directorio pro le synchronisation sortiente (checkout) ab Git', |
| 1545 | 1545 | ); |
| 1546 | 1546 | |
| — | — | @@ -1969,7 +1969,7 @@ |
| 1970 | 1970 | |
| 1971 | 1971 | Доколку имате прашања за овој дистрибутивен систем на додатоци, обратете се на страницата [[Extension talk:ExtensionDistributor]].", |
| 1972 | 1972 | 'extdist-want-more' => 'Преземи друг додаток', |
| 1973 | | - 'extdist-cvs-unsupported' => 'Распространувачот на додатоци не ја поддржува контролниот систем на верзии „$1“.', |
| | 1973 | + 'extdist-vcs-unsupported' => 'Распространувачот на додатоци не ја поддржува контролниот систем на верзии „$1“.', |
| 1974 | 1974 | 'extdist-git-invalid-dir' => 'Не можам да навлезам во директориумот за проверка на Git', |
| 1975 | 1975 | ); |
| 1976 | 1976 | |
| — | — | @@ -2236,7 +2236,7 @@ |
| 2237 | 2237 | |
| 2238 | 2238 | Als u vragen hebt over dit distributiesysteem voor uitbreidingen, ga dan naar [[Extension talk:ExtensionDistributor]].', |
| 2239 | 2239 | 'extdist-want-more' => 'Nog een uitbreiding downloaden', |
| 2240 | | - 'extdist-cvs-unsupported' => 'Het is niet mogelijk om uitbreidingen te distribueren met behulp van het versioncontrolsysteem "$1" omdat dit niet wordt ondersteund.', |
| | 2240 | + 'extdist-vcs-unsupported' => 'Het is niet mogelijk om uitbreidingen te distribueren met behulp van het versioncontrolsysteem "$1" omdat dit niet wordt ondersteund.', |
| 2241 | 2241 | 'extdist-git-invalid-dir' => 'Het was niet mogelijk om de map te gebruiken voor "git checkout"', |
| 2242 | 2242 | ); |
| 2243 | 2243 | |
| — | — | @@ -2420,7 +2420,7 @@ |
| 2421 | 2421 | |
| 2422 | 2422 | Jeśli masz jakieś pytania na temat systemu dystrybuującego rozszerzenia, zadaj je na stronie [[Extension talk:ExtensionDistributor]].", |
| 2423 | 2423 | 'extdist-want-more' => 'Pobierz inne rozszerzenie', |
| 2424 | | - 'extdist-cvs-unsupported' => 'Dystrybutor rozszerzenia nie obsługuje systemu kontroli wersji "$1".', |
| | 2424 | + 'extdist-vcs-unsupported' => 'Dystrybutor rozszerzenia nie obsługuje systemu kontroli wersji "$1".', |
| 2425 | 2425 | 'extdist-git-invalid-dir' => 'Nie można wprowadzić katalogu git do pobrania', |
| 2426 | 2426 | ); |
| 2427 | 2427 | |
| Index: trunk/extensions/ExtensionDistributor/ExtensionDistributorSVN.php |
| — | — | @@ -9,7 +9,6 @@ |
| 10 | 10 | public function updateAndGetVersion( $dir ) { |
| 11 | 11 | $cmd = "svn up --non-interactive " . wfEscapeShellArg( $dir ) . " 2>&1"; |
| 12 | 12 | $retval = -1; |
| 13 | | - |
| 14 | 13 | $result = wfShellExec( $cmd, $retval ); |
| 15 | 14 | |
| 16 | 15 | if ( $retval ) { |