jenkins-bot has submitted this change and it was merged.
Change subject: Split getversion_svn into two utility functions
......................................................................
Split getversion_svn into two utility functions
Change-Id: Ifde44b119a5429b81a9eb7643c1c94dbfdbeaa09
---
M pywikibot/version.py
1 file changed, 44 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 8826a4d..1c77acb 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -87,10 +87,21 @@
return cache
-def getversion_svn(path=None):
- import httplib
- import xml.dom.minidom
- _program_dir = path or _get_program_dir()
+def svn_rev_info(path):
+ """Fetch information about the current revision of an Subversion checkout.
+
+ Returns three strings:
+ * 'tag': name for the repository
+ * 'rev': current Subversion revision identifier
+ * 'date': date of current revision
+
+ @param path: directory of the Subversion checkout
+ @return: tag (name for the repository),
+ rev (current Subversion revision identifier),
+ date (date of current revision)
+ @return: C{tuple} of 3 C{str}
+ """
+ _program_dir = path
entries = open(os.path.join(_program_dir, '.svn/entries'))
version = entries.readline().strip()
# use sqlite table for new entries format
@@ -120,6 +131,19 @@
date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S')
rev = entries.readline()[:-1]
entries.close()
+ return tag, rev, date
+
+
+def github_svn_rev2hash(tag, rev):
+ """Convert a Subversion revision to a Git hash using Github.
+
+ @param tag: name of the Subversion repo on Github
+ @param rev: Subversion revision identifier
+ @return: the git hash
+ @rtype: str
+ """
+ import httplib
+ import xml.dom.minidom
conn = httplib.HTTPSConnection('github.com')
conn.request('PROPFIND', '/wikimedia/%s/!svn/vcc/default' % tag,
"<?xml version='1.0' encoding='utf-8'?>"
@@ -128,6 +152,22 @@
resp = conn.getresponse()
dom = xml.dom.minidom.parse(resp)
hsh = dom.getElementsByTagName("C:git-commit")[0].firstChild.nodeValue
+ return hsh
+
+
+def getversion_svn(path=None):
+ """Get version info for a Subversion checkout.
+
+ @param path: directory of the Subversion checkout
+ @return: tag (name for the repository),
+ rev (current Subversion revision identifier),
+ date (date of current revision),
+ hash (git hash for the Subversion revision)
+ @return: C{tuple} of 4 C{str}
+ """
+ _program_dir = path or _get_program_dir()
+ tag, rev, date = svn_rev_info(_program_dir)
+ hsh = github_svn_rev2hash(tag, rev)
rev = 's%s' % rev
if (not date or not tag or not rev) and not path:
raise ParseError
--
To view, visit https://gerrit.wikimedia.org/r/152184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifde44b119a5429b81a9eb7643c1c94dbfdbeaa09
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
