Rev 6330: (mbp) Pass specific_files to status hooks (Francis Devereux) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6330 [merge]
revision-id: pqm at pqm.ubuntu.com-20111130013552-9193u1w0j4ts1ibg
parent: pqm at pqm.ubuntu.com-20111129200254-ptnbnkq94ye7l463
parent: francis at devrx.org-20111121192755-p1s5rb42q4gcgyfh
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-11-30 01:35:52 +0000
message:
  (mbp) Pass specific_files to status hooks (Francis Devereux)
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2011-06-01 12:53:56 +0000
+++ b/bzrlib/status.py	2011-11-21 19:27:55 +0000
@@ -157,7 +157,7 @@
         try:
             for hook in hooks['pre_status']:
                 hook(StatusHookParams(old, new, to_file, versioned,
-                    show_ids, short, verbose))
+                    show_ids, short, verbose, specific_files=specific_files))
 
             specific_files, nonexistents \
                 = _filter_nonexistent(specific_files, old, new)
@@ -222,7 +222,7 @@
                 raise errors.PathsDoNotExist(nonexistents)
             for hook in hooks['post_status']:
                 hook(StatusHookParams(old, new, to_file, versioned,
-                    show_ids, short, verbose))
+                    show_ids, short, verbose, specific_files=specific_files))
         finally:
             old.unlock()
             new.unlock()
@@ -416,7 +416,7 @@
     """
 
     def __init__(self, old_tree, new_tree, to_file, versioned, show_ids,
-            short, verbose):
+            short, verbose, specific_files=None):
         """Create a group of post_status hook parameters.
 
         :param old_tree: Start tree (basis tree) for comparison.
@@ -426,6 +426,9 @@
         :param show_ids: Show internal object ids.
         :param short: Use short status indicators.
         :param verbose: Verbose flag.
+        :param specific_files: If set, a list of filenames whose status should be
+            shown.  It is an error to give a filename that is not in the working
+            tree, or in the working inventory or in the basis inventory.
         """
         self.old_tree = old_tree
         self.new_tree = new_tree
@@ -434,14 +437,15 @@
         self.show_ids = show_ids
         self.short = short
         self.verbose = verbose
+        self.specific_files = specific_files
 
     def __eq__(self, other):
         return self.__dict__ == other.__dict__
 
     def __repr__(self):
-        return "<%s(%s, %s, %s, %s, %s, %s, %s)>" % (self.__class__.__name__,
+        return "<%s(%s, %s, %s, %s, %s, %s, %s, %s)>" % (self.__class__.__name__,
             self.old_tree, self.new_tree, self.to_file, self.versioned,
-            self.show_ids, self.short, self.verbose)
+            self.show_ids, self.short, self.verbose, self.specific_files)
 
 
 def _show_shelve_summary(params):

=== modified file 'bzrlib/tests/test_status.py'
--- a/bzrlib/tests/test_status.py	2011-03-30 11:45:54 +0000
+++ b/bzrlib/tests/test_status.py	2011-11-21 19:27:55 +0000
@@ -169,7 +169,7 @@
         params = calls[0]
         self.assertIsInstance(params, _mod_status.StatusHookParams)
         attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
-            'show_ids', 'short', 'verbose']
+            'show_ids', 'short', 'verbose', 'specific_files']
         for a in attrs:
             self.assertTrue(hasattr(params, a),
                 'Attribute "%s" not found in StatusHookParam' % a)
@@ -192,7 +192,7 @@
         params = calls[0]
         self.assertIsInstance(params, _mod_status.StatusHookParams)
         attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
-            'show_ids', 'short', 'verbose']
+            'show_ids', 'short', 'verbose', 'specific_files']
         for a in attrs:
             self.assertTrue(hasattr(params, a),
                 'Attribute "%s" not found in StatusHookParam' % a)