1 files changed, 60 insertions, 47 deletions
diff --git a/subcmds/prune.py b/subcmds/prune.py
index 251accaa..5a68c14a 100644
--- a/subcmds/prune.py
+++ b/subcmds/prune.py
@@ -19,63 +19,76 @@ from command import DEFAULT_LOCAL_JOBS, PagedCommand
 class Prune(PagedCommand):
-  COMMON = True
+    COMMON = True
-  helpSummary = "Prune (delete) already merged topics"
+    helpSummary = "Prune (delete) already merged topics"
-  helpUsage = """
+    helpUsage = """
 %prog [<project>...]
 """
-  PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
+    PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
-  def _ExecuteOne(self, project):
+    def _ExecuteOne(self, project):
-    """Process one project."""
+        """Process one project."""
-    return project.PruneHeads()
+        return project.PruneHeads()
-  def Execute(self, opt, args):
+    def Execute(self, opt, args):
-    projects = self.GetProjects(args, all_manifests=not opt.this_manifest_only)
+        projects = self.GetProjects(
+            args, all_manifests=not opt.this_manifest_only
+        )
-    # NB: Should be able to refactor this module to display summary as results
+        # NB: Should be able to refactor this module to display summary as
-    # come back from children.
+        # results come back from children.
-    def _ProcessResults(_pool, _output, results):
+        def _ProcessResults(_pool, _output, results):
-      return list(itertools.chain.from_iterable(results))
+            return list(itertools.chain.from_iterable(results))
-    all_branches = self.ExecuteInParallel(
+        all_branches = self.ExecuteInParallel(
-        opt.jobs,
+            opt.jobs,
-        self._ExecuteOne,
+            self._ExecuteOne,
-        projects,
+            projects,
-        callback=_ProcessResults,
+            callback=_ProcessResults,
-        ordered=True)
+            ordered=True,
+        )
-    if not all_branches:
+        if not all_branches:
-      return
+            return
-    class Report(Coloring):
+        class Report(Coloring):
-      def __init__(self, config):
+            def __init__(self, config):
-        Coloring.__init__(self, config, 'status')
+                Coloring.__init__(self, config, "status")
-        self.project = self.printer('header', attr='bold')
+                self.project = self.printer("header", attr="bold")
-    out = Report(all_branches[0].project.config)
+        out = Report(all_branches[0].project.config)
-    out.project('Pending Branches')
+        out.project("Pending Branches")
-    out.nl()
+        out.nl()
-    project = None
+        project = None
-    for branch in all_branches:
+        for branch in all_branches:
-      if project != branch.project:
+            if project != branch.project:
-        project = branch.project
+                project = branch.project
-        out.nl()
+                out.nl()
-        out.project('project %s/' % project.RelPath(local=opt.this_manifest_only))
+                out.project(
-        out.nl()
+                    "project %s/"
+                    % project.RelPath(local=opt.this_manifest_only)
+                )
+                out.nl()
-      print('%s %-33s ' % (
+            print(
-            branch.name == project.CurrentBranch and '*' or ' ',
+                "%s %-33s "
-            branch.name), end='')
+                % (
+                    branch.name == project.CurrentBranch and "*" or " ",
+                    branch.name,
+                ),
+                end="",
+            )
-      if not branch.base_exists:
+            if not branch.base_exists:
-        print('(ignoring: tracking branch is gone: %s)' % (branch.base,))
+                print(
-      else:
+                    "(ignoring: tracking branch is gone: %s)" % (branch.base,)
-        commits = branch.commits
+                )
-        date = branch.date
+            else:
-        print('(%2d commit%s, %s)' % (
+                commits = branch.commits
-            len(commits),
+                date = branch.date
-            len(commits) != 1 and 's' or ' ',
+                print(
-            date))
+                    "(%2d commit%s, %s)"
+                    % (len(commits), len(commits) != 1 and "s" or " ", date)
+                )

diff --git a/subcmds/prune.py b/subcmds/prune.py index 251accaa..5a68c14a 100644 --- a/subcmds/prune.py +++ b/subcmds/prune.py
@@ -19,63 +19,76 @@ from command import DEFAULT_LOCAL_JOBS, PagedCommand
19		19
20		20
21	class Prune(PagedCommand):	21	class Prune(PagedCommand):
22	COMMON = True	22	COMMON = True
23	helpSummary = "Prune (delete) already merged topics"	23	helpSummary = "Prune (delete) already merged topics"
24	helpUsage = """	24	helpUsage = """
25	%prog [<project>...]	25	%prog [<project>...]
26	"""	26	"""
27	PARALLEL_JOBS = DEFAULT_LOCAL_JOBS	27	PARALLEL_JOBS = DEFAULT_LOCAL_JOBS
28		28
29	def _ExecuteOne(self, project):	29	def _ExecuteOne(self, project):
30	"""Process one project."""	30	"""Process one project."""
31	return project.PruneHeads()	31	return project.PruneHeads()
32		32
33	def Execute(self, opt, args):	33	def Execute(self, opt, args):
34	projects = self.GetProjects(args, all_manifests=not opt.this_manifest_only)	34	projects = self.GetProjects(
		35	args, all_manifests=not opt.this_manifest_only
		36	)
35		37
36	# NB: Should be able to refactor this module to display summary as results	38	# NB: Should be able to refactor this module to display summary as
37	# come back from children.	39	# results come back from children.
38	def _ProcessResults(_pool, _output, results):	40	def _ProcessResults(_pool, _output, results):
39	return list(itertools.chain.from_iterable(results))	41	return list(itertools.chain.from_iterable(results))
40		42
41	all_branches = self.ExecuteInParallel(	43	all_branches = self.ExecuteInParallel(
42	opt.jobs,	44	opt.jobs,
43	self._ExecuteOne,	45	self._ExecuteOne,
44	projects,	46	projects,
45	callback=_ProcessResults,	47	callback=_ProcessResults,
46	ordered=True)	48	ordered=True,
		49	)
47		50
48	if not all_branches:	51	if not all_branches:
49	return	52	return
50		53
51	class Report(Coloring):	54	class Report(Coloring):
52	def __init__(self, config):	55	def __init__(self, config):
53	Coloring.__init__(self, config, 'status')	56	Coloring.__init__(self, config, "status")
54	self.project = self.printer('header', attr='bold')	57	self.project = self.printer("header", attr="bold")
55		58
56	out = Report(all_branches[0].project.config)	59	out = Report(all_branches[0].project.config)
57	out.project('Pending Branches')	60	out.project("Pending Branches")
58	out.nl()	61	out.nl()
59		62
60	project = None	63	project = None
61		64
62	for branch in all_branches:	65	for branch in all_branches:
63	if project != branch.project:	66	if project != branch.project:
64	project = branch.project	67	project = branch.project
65	out.nl()	68	out.nl()
66	out.project('project %s/' % project.RelPath(local=opt.this_manifest_only))	69	out.project(
67	out.nl()	70	"project %s/"
		71	% project.RelPath(local=opt.this_manifest_only)
		72	)
		73	out.nl()
68		74
69	print('%s %-33s ' % (	75	print(
70	branch.name == project.CurrentBranch and '*' or ' ',	76	"%s %-33s "
71	branch.name), end='')	77	% (
		78	branch.name == project.CurrentBranch and "*" or " ",
		79	branch.name,
		80	),
		81	end="",
		82	)
72		83
73	if not branch.base_exists:	84	if not branch.base_exists:
74	print('(ignoring: tracking branch is gone: %s)' % (branch.base,))	85	print(
75	else:	86	"(ignoring: tracking branch is gone: %s)" % (branch.base,)
76	commits = branch.commits	87	)
77	date = branch.date	88	else:
78	print('(%2d commit%s, %s)' % (	89	commits = branch.commits
79	len(commits),	90	date = branch.date
80	len(commits) != 1 and 's' or ' ',	91	print(
81	date))	92	"(%2d commit%s, %s)"
		93	% (len(commits), len(commits) != 1 and "s" or " ", date)
		94	)