Merge branch 'stable'

[stgit] / stgit / commands / applied.py

diff --git a/stgit/commands/applied.py b/stgit/commands/applied.py
index d568cd60c5759cfd84d4148f3c3d5bf9f5b85d41..e57c7960cab31a71fbe5522e850367103d40e487 100644 (file)
--- a/stgit/commands/applied.py
+++ b/stgit/commands/applied.py
@@ -16,23 +16,24 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-import sys, os
-from optparse import OptionParser, make_option
-
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
+from optparse import make_option
+from stgit.out import *
+from stgit.commands import common

 
 
 help = 'print the applied patches'
 usage = """%prog [options]
 
 
 
 help = 'print the applied patches'
 usage = """%prog [options]
 

-List the patches from the series which were already pushed onto the
-stack.  They are listed in the order in which they were pushed, the
+List the patches from the series which have already been pushed onto
+the stack. They are listed in the order in which they were pushed, the

 last one being the current (topmost) patch."""
 
 last one being the current (topmost) patch."""
 

+directory = common.DirectoryHasRepositoryLib()

 options = [make_option('-b', '--branch',
 options = [make_option('-b', '--branch',

-                       help = 'use BRANCH instead of the default one')]
+                       help = 'use BRANCH instead of the default branch'),
+           make_option('-c', '--count',
+                       help = 'print the number of applied patches',
+                       action = 'store_true')]

 
 
 def func(parser, options, args):
 
 
 def func(parser, options, args):


@@ -41,5 +42,10 @@ def func(parser, options, args):
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 

-    for p in crt_series.get_applied():
-        print p
+    s = directory.repository.get_stack(options.branch)
+
+    if options.count:
+        out.stdout(len(s.patchorder.applied))
+    else:
+        for pn in s.patchorder.applied:
+            out.stdout(pn)