diff options
-rw-r--r-- | subcmds/branches.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/subcmds/branches.py b/subcmds/branches.py index 57d8c88a..87c4f9b6 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py | |||
@@ -63,11 +63,6 @@ class Branches(Command): | |||
63 | Summarizes the currently available topic branches. | 63 | Summarizes the currently available topic branches. |
64 | """ | 64 | """ |
65 | 65 | ||
66 | def _Options(self, p): | ||
67 | p.add_option('-a', '--all', | ||
68 | dest='all', action='store_true', | ||
69 | help='show all branches, not just the majority') | ||
70 | |||
71 | def Execute(self, opt, args): | 66 | def Execute(self, opt, args): |
72 | projects = self.GetProjects(args) | 67 | projects = self.GetProjects(args) |
73 | out = BranchColoring(self.manifest.manifestProject.config) | 68 | out = BranchColoring(self.manifest.manifestProject.config) |
@@ -84,18 +79,6 @@ Summarizes the currently available topic branches. | |||
84 | names = all.keys() | 79 | names = all.keys() |
85 | names.sort() | 80 | names.sort() |
86 | 81 | ||
87 | if not opt.all and not args: | ||
88 | # No -a and no specific projects listed; try to filter the | ||
89 | # results down to only the majority of projects. | ||
90 | # | ||
91 | n = [] | ||
92 | for name in names: | ||
93 | i = all[name] | ||
94 | if i.IsCurrent \ | ||
95 | or 80 <= (100 * len(i.projects)) / project_cnt: | ||
96 | n.append(name) | ||
97 | names = n | ||
98 | |||
99 | if not names: | 82 | if not names: |
100 | print >>sys.stderr, ' (no branches)' | 83 | print >>sys.stderr, ' (no branches)' |
101 | return | 84 | return |
@@ -126,7 +109,7 @@ Summarizes the currently available topic branches. | |||
126 | hdr('%c%c %-*s' % (current, published, width, name)) | 109 | hdr('%c%c %-*s' % (current, published, width, name)) |
127 | out.write(' |') | 110 | out.write(' |') |
128 | 111 | ||
129 | if in_cnt < project_cnt and (in_cnt == 1 or opt.all): | 112 | if in_cnt < project_cnt and (in_cnt == 1): |
130 | fmt = out.write | 113 | fmt = out.write |
131 | paths = [] | 114 | paths = [] |
132 | if in_cnt < project_cnt - in_cnt: | 115 | if in_cnt < project_cnt - in_cnt: |