~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Align branch descriptions in output of "stg branch -l"
[stgit]
/
stgit
/
commands
/
branch.py
diff --git
a/stgit/commands/branch.py
b/stgit/commands/branch.py
index
9bf6cdb
..
63b3797
100644
(file)
--- a/
stgit/commands/branch.py
+++ b/
stgit/commands/branch.py
@@
-63,7
+63,7
@@
options = [make_option('-c', '--create',
def __is_current_branch(branch_name):
return crt_series.get_branch() == branch_name
def __is_current_branch(branch_name):
return crt_series.get_branch() == branch_name
-def __print_branch(branch_name):
+def __print_branch(branch_name
, length
):
initialized = ' '
current = ' '
protected = ' '
initialized = ' '
current = ' '
protected = ' '
@@
-76,8
+76,8
@@
def __print_branch(branch_name):
current = '>'
if branch.get_protected():
protected = 'p'
current = '>'
if branch.get_protected():
protected = 'p'
- print
'%s %s%s\t%s\t%s' % (current, initialized, protected, branch_name,
\
-
branch.get_description()
)
+ print
current + ' ' + initialized + protected + '\t' +
\
+
branch_name.ljust(length) + ' | ' + branch.get_description(
)
def __delete_branch(doomed_name, force = False):
doomed = stack.Series(doomed_name)
def __delete_branch(doomed_name, force = False):
doomed = stack.Series(doomed_name)
@@
-138,10
+138,11
@@
def func(parser, options, args):
branches = os.listdir(os.path.join(git.base_dir, 'refs', 'heads'))
branches.sort()
branches = os.listdir(os.path.join(git.base_dir, 'refs', 'heads'))
branches.sort()
+ max_len = max([len(i) for i in branches])
print 'Available branches:'
for i in branches:
print 'Available branches:'
for i in branches:
- __print_branch(i)
+ __print_branch(i
, max_len
)
return
elif options.protect:
return
elif options.protect: