Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54902
Change subject: (bug 38783) add git HEAD date to Special:Version for core and
extensions
......................................................................
(bug 38783) add git HEAD date to Special:Version for core and extensions
selected Timestamp ISO format YYYYMMDDHHMMSSZ" to make it compact and
self-explaining. I am not in favour/favor of localising this date from git.
follow up to 7d68707772de2e2f4d99b774815d3489d00a5cb6
Change-Id: Ia31a747c0d79f460503f66c369a0d1f2b971b692
---
M includes/GitInfo.php
M includes/specials/SpecialVersion.php
2 files changed, 42 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/02/54902/4
diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 6f7f802..7e03e4d 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -121,6 +121,24 @@
}
/**
+ * Return the date of last log entry in HEAD of the repo
+ * @return string of date or false
+ */
+ public function getHeadDate() {
+
+ $LOGfile = $this->basedir . '/logs/HEAD';
+ if ( !is_readable( $LOGfile ) ) {
+ return false;
+ }
+ $filearray = file( $LOGfile );
+ $lastline = end( $filearray );
+
+ $lastlinearray = explode( ' ', $lastline );
+ $datestring = date( 'YmdHis', $lastlinearray[4] ) . "Z";
+ return $datestring;
+ }
+
+ /**
* Return the name of the current branch, or HEAD if not found
* @return string The branch name, HEAD, or false
*/
diff --git a/includes/specials/SpecialVersion.php
b/includes/specials/SpecialVersion.php
index 81d1781..ec49407 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -288,11 +288,18 @@
}
$shortSHA1 = '(' . substr( $headSHA1, 0, 7 ) . ')';
- $viewerUrl = $gitInfo->getHeadViewUrl();
- if ( $viewerUrl !== false ) {
- $shortSHA1 = "[$viewerUrl $shortSHA1]";
+
+ $gitHeadUrl = $gitInfo->getHeadViewUrl();
+ if ( $gitHeadUrl !== false ) {
+ $shortSHA1 = "[$gitHeadUrl $shortSHA1]";
}
- return self::getwgVersionLinked() . " $shortSHA1";
+
+ $gitHeadDate = $gitInfo->getHeadDate();
+ if ( $gitHeadDate !== false ) {
+ $shortSHA1 .= "<br/>$gitHeadDate";
+ }
+
+ return "$wgVersion $shortSHA1";
}
/**
@@ -475,6 +482,10 @@
$gitViewerUrl = $gitInfo->getHeadViewUrl();
if ( $gitViewerUrl !== false ) {
$vcsText = "[$gitViewerUrl $vcsText]";
+ }
+ $gitHeadDate = $gitInfo->getHeadDate();
+ if ( $gitHeadDate !== false ) {
+ $vcsText .= "<br/>$gitHeadDate";
}
} else {
$svnInfo = self::getSvnInfo( dirname(
$extension['path'] ) );
@@ -780,6 +791,15 @@
}
/**
+ * @param $dir String: directory of the git checkout
+ * @return bool|String date of commit HEAD points to
+ */
+ public static function getGitHeadDate( $dir ) {
+ $repo = new GitInfo( $dir );
+ return $repo->getHeadDate();
+ }
+
+ /**
* Get the list of entry points and their URLs
* @return string Wikitext
*/
--
To view, visit https://gerrit.wikimedia.org/r/54902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia31a747c0d79f460503f66c369a0d1f2b971b692
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: DaSch <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
