diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2011-01-03 21:19:03 -0600 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2011-01-03 21:19:03 -0600 |
commit | 847f8dcef257d5aeb6a9f17df9eb087d63ffeead (patch) | |
tree | 996b56bad3d3956edf87bb90d2f0213ddd3745ab /tools/stable-check.py | |
parent | 1ae62017ffc2a0783567736573d72b7d16729770 (diff) | |
parent | fe0f19652d6a93057a604eabef2e3ee983bac3eb (diff) | |
download | bcfg2-847f8dcef257d5aeb6a9f17df9eb087d63ffeead.tar.gz bcfg2-847f8dcef257d5aeb6a9f17df9eb087d63ffeead.tar.bz2 bcfg2-847f8dcef257d5aeb6a9f17df9eb087d63ffeead.zip |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'tools/stable-check.py')
-rwxr-xr-x | tools/stable-check.py | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/tools/stable-check.py b/tools/stable-check.py deleted file mode 100755 index b7416456c..000000000 --- a/tools/stable-check.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python - -import os, sys - -def do_merge(revision_string): - os.system("svnmerge merge -r %s" % revision_string) - os.system("svn commit -F svnmerge-commit-message.txt") - os.system("svn up") - -if __name__ == '__main__': - os.popen('svn up').read() - availrev = os.popen('svnmerge avail').read().strip() - if not availrev: - raise SystemExit, 0 - bf = [] - other = [] - for avail in availrev.split(','): - if '-' in avail: - start, stop = [int(x) for x in avail.split('-')] - else: - start = stop = int(avail) - - for rev in range(start, stop + 1): - log = os.popen("svn log https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2 -r %s" % rev).read() - if "[bugfix]" in log: - bf.append(rev) - else: - other.append(rev) - if '-v' in sys.argv: - print log, - - mrevs = ','.join([str(x) for x in bf]) - if '-c' in sys.argv: - print "Revisions %s need merging" % (mrevs) - elif '-f' in sys.argv: - do_merge(mrevs) - else: - a = raw_input('Merge revisions %s: [yN] ' % mrevs) - if a in ['y', 'Y']: - do_merge(mrevs) |