Convert "top" to the new infrastructure

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/top.py b/stgit/commands/top.py
index e7cb275f849e372099cd59f4e25b0108484bac80..c8fbba4ab154d902d26a3ceb2869f335e9dd6a51 100644 (file)
--- a/stgit/commands/top.py
+++ b/stgit/commands/top.py
@@ -16,33 +16,30 @@ 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.out import *
-from stgit import stack, git
+from optparse import make_option

 
 

+from stgit.commands import common
+from stgit.out import out

 
 help = 'print the name of the top patch'
 usage = """%prog [options]
 
 Print the name of the current (topmost) patch."""
 
 
 help = 'print the name of the top patch'
 usage = """%prog [options]
 
 Print the name of the current (topmost) patch."""
 

-directory = DirectoryHasRepository()
+directory = common.DirectoryHasRepositoryLib()

 options = [make_option('-b', '--branch',
                        help = 'use BRANCH instead of the default one')]
 
 options = [make_option('-b', '--branch',
                        help = 'use BRANCH instead of the default one')]
 

-

 def func(parser, options, args):
     """Show the name of the topmost patch
     """
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 
 def func(parser, options, args):
     """Show the name of the topmost patch
     """
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 

-    name = crt_series.get_current()
-    if name:
-        out.stdout(name)
+    stack = directory.repository.get_stack(options.branch)
+    applied = stack.patchorder.applied
+
+    if applied:
+        out.stdout(applied[-1])

     else:
     else:

-        raise CmdException, 'No patches applied'
+        raise common.CmdException, 'No patches applied'