Rev 3616: (robertc) The help for bzr ignored now sugests bzr ls --ignored. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3616
revision-id: pqm at pqm.ubuntu.com-20080808061719-ixk3x48n198814tg
parent: pqm at pqm.ubuntu.com-20080808024534-ff7wyd3vnhtpbat2
parent: robertc at robertcollins.net-20080808054444-s4er0rqgs07nbcpv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-08-08 07:17:19 +0100
message:
  (robertc) The help for bzr ignored now sugests bzr ls --ignored.
  	(Robert Collins)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3603.3.2
    revision-id: robertc at robertcollins.net-20080808054444-s4er0rqgs07nbcpv
    parent: robertc at robertcollins.net-20080805060140-ckkbituih3srpm06
    parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2008-08-08 15:44:44 +1000
    message:
      Merge to resolve conflicts in NEWS.
    added:
      bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
      bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
    ------------------------------------------------------------
    revno: 3603.3.1
    revision-id: robertc at robertcollins.net-20080805060140-ckkbituih3srpm06
    parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: 3834
    timestamp: Tue 2008-08-05 16:01:40 +1000
    message:
       * The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
         scripting use. (Robert Collins, #3834)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS	2008-08-08 02:10:19 +0000
+++ b/NEWS	2008-08-08 06:17:19 +0000
@@ -13,11 +13,14 @@
 
   BUG FIXES:
 
+    * ``bzr upgrade`` on remote branches accessed via bzr:// and
+      bzr+ssh:// now works.  (Andrew Bennetts)
+
     * sftp transport: added missing ``FileExists`` case to
       ``_translate_io_exception`` (Christophe Troestler, #123475)
 
-    * ``bzr upgrade`` on remote branches accessed via bzr:// and
-      bzr+ssh:// now works.  (Andrew Bennetts)
+    * The help for ``bzr ignored`` now suggests ``bzr ls --ignored`` for
+      scripting use. (Robert Collins, #3834)
 
     * The default ``annotate`` logic will now always assign the
       last-modified value of a line to one of the revisions that modified

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-08-06 21:57:33 +0000
+++ b/bzrlib/builtins.py	2008-08-08 05:44:44 +0000
@@ -1941,12 +1941,20 @@
             print "Warning: the following files are version controlled and" \
                   " match your ignore pattern:\n%s" % ("\n".join(matches),)
 
+
 class cmd_ignored(Command):
     """List ignored files and the patterns that matched them.
+
+    List all the ignored files and the ignore pattern that caused the file to
+    be ignored.
+
+    Alternatively, to list just the files::
+
+        bzr ls --ignored
     """
 
     encoding_type = 'replace'
-    _see_also = ['ignore']
+    _see_also = ['ignore', 'ls']
 
     @display_command
     def run(self):