112 lines
3.2 KiB
Python
112 lines
3.2 KiB
Python
#!/usr/bin/python
|
|
#
|
|
# commit-wrangler.py - basic script to commit patches, primarily for
|
|
# Metacity, might be useful for others. In early stages of
|
|
# development.
|
|
#
|
|
# Copyright (C) 2008 Thomas Thurman
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License as
|
|
# published by the Free Software Foundation; either version 2 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import time
|
|
import commands
|
|
import sys
|
|
import os
|
|
import posixpath
|
|
import ConfigParser
|
|
import re
|
|
|
|
# FIXME: Needs tidying into separate functions.
|
|
|
|
# FIXME: Some of this is duplicated from release-wrangler.
|
|
# This should go in a common library when the dust has settled.
|
|
|
|
# FIXME: Some way of updating Bugzilla when we mention a bug,
|
|
# and including the revision number, would be really useful.
|
|
|
|
# FIXME: This should co-operate with patch-wrangler in that
|
|
# p-w should find out the name of a patch's submitter from bugzilla
|
|
# and store it in a dotfile, and then we can use it here.
|
|
# Also, it should find out and store the bug number, so we can
|
|
# write it as "(Bug #nnn)", which will make the previous paragraph's
|
|
# idea even more useful.
|
|
|
|
def get_up_to_date():
|
|
"First step is always to get up to date."
|
|
os.system("svn up")
|
|
|
|
def report_error(message):
|
|
print message
|
|
sys.exit(255)
|
|
|
|
def favourite_editor():
|
|
e = os.environ
|
|
if e.has_key('VISUAL'): return e['VISUAL']
|
|
if e.has_key('EDITOR'): return e['EDITOR']
|
|
if os.access('/usr/bin/nano', os.F_OK):
|
|
return '/usr/bin/nano'
|
|
report_error("I can't find an editor for you!")
|
|
|
|
def wordwrap(str, prefix=''):
|
|
"Really simple wordwrap"
|
|
|
|
# Ugly hack:
|
|
# We know that all open brackets are preceded by spaces.
|
|
# We don't want to split on these spaces. Therefore:
|
|
str = str.replace(' (','(')
|
|
|
|
result = ['']
|
|
for word in str.split():
|
|
|
|
if result[-1]=='':
|
|
candidate = prefix + word
|
|
else:
|
|
candidate = '%s %s' % (result[-1], word)
|
|
|
|
if len(candidate)>80:
|
|
result.append(prefix+word)
|
|
else:
|
|
result[-1] = candidate
|
|
|
|
return '\n'.join(result).replace('(',' (')
|
|
|
|
#####################
|
|
|
|
change_filename = 'ChangeLog'
|
|
|
|
get_up_to_date()
|
|
|
|
cp = ConfigParser.ConfigParser()
|
|
cp.read(os.environ['HOME']+'/.config/metacity/tools.ini')
|
|
|
|
os.environ['CHANGE_LOG_NAME'] = cp.get('commit-wrangler', 'name')
|
|
os.environ['CHANGE_LOG_EMAIL_ADDRESS'] = cp.get('commit-wrangler', 'address')
|
|
|
|
print commands.getoutput('moap cl prep')
|
|
|
|
time_before = os.stat(change_filename)[8]
|
|
os.system(favourite_editor()+' +6 %s ' % (change_filename))
|
|
|
|
if os.stat(change_filename)[8] == time_before:
|
|
print 'No change; aborting:'
|
|
print commands.getoutput('svn revert '+change_filename)
|
|
sys.exit(0)
|
|
|
|
# Update the changelog
|
|
|
|
checkin = commands.getoutput("moap cl ci")
|
|
|
|
print re.sub(".*Committed revision (\\d+).*", 'http://svn.gnome.org/viewvc/metacity?rev=\\1&view=rev', checkin)
|
|
|