diff hq/main.py @ 16:b878f4ce93fc

screwed this one up
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 17 May 2013 03:19:28 -0700
parents 6c4f258fae85
children 44ec940c86a6
line wrap: on
line diff
--- a/hq/main.py	Fri May 17 03:15:03 2013 -0700
+++ b/hq/main.py	Fri May 17 03:19:28 2013 -0700
@@ -77,6 +77,7 @@
         if mq is true, update the patch queue, if versioned
         """
         # check for outstanding changes
+        import pdb; pdb.set_trace()
         output = self._call(['st']).strip()
         lines = [line for line in output.splitlines()
                  if not line.startswith('?')]
@@ -118,6 +119,7 @@
         display status
         """
         return '\n'.join([self._call(i).strip() for i in ('root', 'status', 'qseries')])
+    st = status
 
     def directory(self):
         """patch queue directory"""
@@ -139,12 +141,12 @@
     def _call(self, *args, **kwargs):
         command = [self.binary] + list(args)
         kwargs.setdefault('cwd', self.root)
-        return call(command, cwd=self.root)
+        return call(command, **kwargs)
 
     def _patch_command(self, *command, **kwargs):
         """perform a command in the patch repository"""
         kwargs.setdefault(cwd=self.directory())
-        return call(command, **kwargs)
+        return call(command)
 
     def _versioned(self):
         """is the patch queue versioned?"""