Allow stack.patchorder.all to return hidden patches

A new property, patchorder.all_visible, was added to return only the
applied + unapplied patches. This is used in the "commit" command to
avoid automatically committing the hidden patches.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/commit.py b/stgit/commands/commit.py
index cc2f13a4b3a8db5521eba8e02b8a60077eacf7b0..df7fa67857330658e61b9349520458775f9d3434 100644 (file)
--- a/stgit/commands/commit.py
+++ b/stgit/commands/commit.py
@@ -45,14 +45,14 @@ options = [make_option('-n', '--number', type = 'int',
 def func(parser, options, args):
     """Commit a number of patches."""
     stack = directory.repository.current_stack
 def func(parser, options, args):
     """Commit a number of patches."""
     stack = directory.repository.current_stack

-    args = common.parse_patches(args, list(stack.patchorder.all))
+    args = common.parse_patches(args, list(stack.patchorder.all_visible))

     if len([x for x in [args, options.number != None, options.all] if x]) > 1:
         parser.error('too many options')
     if args:
     if len([x for x in [args, options.number != None, options.all] if x]) > 1:
         parser.error('too many options')
     if args:

-        patches = [pn for pn in stack.patchorder.all if pn in args]
+        patches = [pn for pn in stack.patchorder.all_visible if pn in args]

         bad = set(args) - set(patches)
         if bad:
         bad = set(args) - set(patches)
         if bad:

-            raise common.CmdException('Bad patch names: %s'
+            raise common.CmdException('Nonexistent or hidden patch names: %s'

                                       % ', '.join(sorted(bad)))
     elif options.number != None:
         if options.number <= len(stack.patchorder.applied):
                                       % ', '.join(sorted(bad)))
     elif options.number != None:
         if options.number <= len(stack.patchorder.applied):

diff --git a/stgit/lib/stack.py b/stgit/lib/stack.py
index f9e750e756014f91406459e07b433c1e616488b8..bdd21b1e24a75846ecf7c38e2d0439d8e0ed199a 100644 (file)
--- a/stgit/lib/stack.py
+++ b/stgit/lib/stack.py
@@ -102,8 +102,8 @@ class PatchOrder(object):
                          lambda self, val: self.__set_list('unapplied', val))
     hidden = property(lambda self: self.__get_list('hidden'),
                       lambda self, val: self.__set_list('hidden', val))
                          lambda self, val: self.__set_list('unapplied', val))
     hidden = property(lambda self: self.__get_list('hidden'),
                       lambda self, val: self.__set_list('hidden', val))

-    # don't return the hidden patches, these have to be returned explicitly
-    all = property(lambda self: self.applied + self.unapplied)
+    all = property(lambda self: self.applied + self.unapplied + self.hidden)
+    all_visible = property(lambda self: self.applied + self.unapplied)

 
 class Patches(object):
     """Creates L{Patch} objects. Makes sure there is only one such object
 
 class Patches(object):
     """Creates L{Patch} objects. Makes sure there is only one such object

diff --git a/stgit/lib/stackupgrade.py b/stgit/lib/stackupgrade.py
index 96ccb79a5ca1f5f27b8102893611acfe2bad658d..4b437dc0bb91ecab262212d15ef1a73325316dc7 100644 (file)
--- a/stgit/lib/stackupgrade.py
+++ b/stgit/lib/stackupgrade.py
@@ -90,6 +90,13 @@ def update_to_current_format_version(repository, branch):
         rm_ref('refs/bases/%s' % branch)
         set_format_version(2)
 
         rm_ref('refs/bases/%s' % branch)
         set_format_version(2)
 

+    # compatibility with the new infrastructure. The changes here do not
+    # affect the compatibility with the old infrastructure (format version 2)
+    if get_format_version() == 2:
+        hidden_file = os.path.join(branch_dir, 'hidden')
+        if not os.path.isfile(hidden_file):
+            utils.create_empty_file(hidden_file)
+

     # Make sure we're at the latest version.
     fv = get_format_version()
     if not fv in [None, FORMAT_VERSION]:
     # Make sure we're at the latest version.
     fv = get_format_version()
     if not fv in [None, FORMAT_VERSION]: