https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114845
Revision: 114845
Author: reedy
Date: 2012-04-11 15:53:54 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Switch over to using git
Not fully tested, but working for most things
Modified Paths:
--------------
trunk/tools/make-release/make-release
Modified: trunk/tools/make-release/make-release
===================================================================
--- trunk/tools/make-release/make-release 2012-04-11 15:26:31 UTC (rev
114844)
+++ trunk/tools/make-release/make-release 2012-04-11 15:53:54 UTC (rev
114845)
@@ -9,7 +9,7 @@
./make-release [--yes] [--no-previous] <next-version> [<previous-version>]
Example:
- ./make-release 1.13.0
+ ./make-release 1.19.0
If the previous version is not given, it will be derived from the next version,
and you will be prompted to confirm that the version number is correct. To
@@ -106,13 +106,13 @@
m = re.compile('(\d+)\.(\d+)\.(\d+)$').match(version)
if m != None:
ret['major'] = m.group(1) + "." + m.group(2)
- ret['branch'] = 'tags/REL' + m.group(1) + '_' + m.group(2) +
'_' + m.group(3)
+ ret['branch'] = 'tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3)
if int(m.group(3)) == 0:
ret['prevVersion'] = None
else:
newMinor = str(int(m.group(3)) - 1)
ret['prevVersion'] = ret['major'] + '.' + newMinor
- ret['prevBranch'] = 'tags/REL' + m.group(1) + '_' +
m.group(2) + '_' + newMinor
+ ret['prevBranch'] = 'tags/' + m.group(1) + '.' +
m.group(2) + '.' + newMinor
return ret
m = re.compile('(\d+)\.(\d+)\.(\d+)([A-Za-z]+)(\d+)$').match(version)
@@ -120,19 +120,19 @@
return None
ret['major'] = m.group(1) + "." + m.group(2)
- ret['branch'] = ('tags/REL' + m.group(1) + '_' + m.group(2) + '_' +
m.group(3) +
+ ret['branch'] = ('tags/' + m.group(1) + '.' + m.group(2) + '.' +
m.group(3) +
m.group(4) + m.group(5))
if int(m.group(5)) == 0:
ret['prevVersion'] = None
else:
newMinor = str(int(m.group(5)) - 1)
ret['prevVersion'] = ret['major'] + "." + m.group(3) +
m.group(4) + newMinor
- ret['prevBranch'] = ('tags/REL' + m.group(1) + '_' + m.group(2)
+ '_' + m.group(3) +
+ ret['prevBranch'] = ('tags/' + m.group(1) + '.' + m.group(2) +
'.' + m.group(3) +
m.group(4) + newMinor)
return ret
def versionToBranch(version):
- return 'tags/REL' + version.replace('.', '_')
+ return 'tags/' + version
def hashfile(fileName, algorithm):
f = open(fileName, 'r')
@@ -145,24 +145,39 @@
f.close()
return hash.hexdigest()
-def export(branch, dir):
- print "Exporting %s..." % (branch)
- proc = subprocess.Popen(['svn', 'export', '-q', '--force',
- 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/' + branch +
'/phase3', dir])
+def export(tag, dir):
+ print "Cloning core..."
+
+ proc = subprocess.Popen(['git', 'clone', '-q',
+ 'ssh://gerrit.wikimedia.org:29418/mediawiki/core.git', dir])
+
if proc.wait() != 0:
- print "svn export failed, exiting"
+ print "git clone failed, exiting"
sys.exit(1)
+
+ print "Checking out %s..." % (tag)
+ os.chdir(dir)
+ proc = subprocess.Popen(['git', 'checkout', tag])
+
+ if proc.wait() != 0:
+ print "git checkout failed, exiting"
+ sys.exit(1)
+
+ subprocess.Popen(['rm', '-rf', '.git' ])
+ os.chdir('..')
print "Done"
def exportExtension(branch, extension, dir):
print "Exporting extension %s into %s branch..." % (extension, branch)
- proc = subprocess.Popen(['svn', 'export', '-q', '--force',
- 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/' + branch +
'/extensions/' + extension,
+
+ proc = subprocess.Popen(['git', 'clone', '-q',
+ 'ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/' +
extension + '.git',
dir + "/extensions/" + extension
])
if proc.wait() != 0:
- print "svn export failed, exiting"
+ print "git clone failed, exiting"
sys.exit(1)
+ subprocess.Popen(['rm', '-rf', dir + "/extensions/" + extension +
'/.git' ])
print "Done"
def makePatch(patchFileName, dir1, dir2, type):
@@ -204,6 +219,8 @@
package = 'mediawiki-' + version
+ #print version, branch, dir, prevVersion, prevBranch
+ #sys.exit(0)
# Export the target
export(branch, package)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
