Author: Armin Rigo <[email protected]>
Branch:
Changeset: r68110:e5911b74577f
Date: 2013-11-14 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/e5911b74577f/
Log: Small updates
diff --git a/pypy/tool/clean_old_branches.py b/pypy/tool/clean_old_branches.py
--- a/pypy/tool/clean_old_branches.py
+++ b/pypy/tool/clean_old_branches.py
@@ -20,8 +20,8 @@
for line in result:
if len(line) != 3:
raise ValueError("'result' contains: %r" % line)
- result = [(head, branch) for (head, branch, extra) in result
- if branch not in ['', 'closed-branches'] and 'close' in extra]
+ result = [(head, branch or 'default') for (head, branch, extra) in result
+ if branch != 'closed-branches' and 'close=1' in extra]
return result
@@ -38,7 +38,8 @@
for head, branch in closed_heads:
print '\t', head, '\t', branch
print
-print 'The branches listed above will be merged to "closed-branches".'
+print 'The %d branches listed above will be merged to "closed-branches".' % (
+ len(closed_heads),)
print 'You need to run this script in a clean working copy where you'
print 'don''t mind all files being removed.'
print
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
