Rev 2405: Unbreak status --short. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

[Robert Collins]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/dirstate/

------------------------------------------------------------
revno: 2405
revision-id: robertc at robertcollins.net-20070226011304-8m29bgwjl3iey0g9
parent: robertc at robertcollins.net-20070226010636-gqr477uau3uckz9x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 12:13:04 +1100
message:
  Unbreak status --short.
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2007-02-26 01:06:36 +0000
+++ b/bzrlib/status.py	2007-02-26 01:13:04 +0000
@@ -143,7 +143,7 @@
         try:
             _raise_if_nonexistent(specific_files, old, new)
             if short:
-                changes = new._iter_changes(old, show_unchanged, specific_file,
+                changes = new._iter_changes(old, show_unchanged, specific_files,
                     require_versioned=False)
                 reporter = _mod_delta.ChangeReporter(old.inventory,
                     output_file=to_file)

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-02-26 01:06:36 +0000
+++ b/bzrlib/workingtree_4.py	2007-02-26 01:13:04 +0000
@@ -1398,9 +1398,7 @@
         # NB: show_status depends on being able to pass in non-versioned files
         # and report them as unknown
             # TODO: handle extra trees in the dirstate.
-        if (extra_trees or
-            # TODO: handle specific files
-            specific_files):
+        if extra_trees:
             for f in super(InterDirStateTree, self)._iter_changes(
                 include_unchanged, specific_files, pb, extra_trees,
                 require_versioned):