Rev 4388: (mbp) tweak message from bzr add in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4388
revision-id: pqm at pqm.ubuntu.com-20090528171438-4bnwgf4n2gcdf9jt
parent: pqm at pqm.ubuntu.com-20090528153456-c5piafs9t37b0nz4
parent: mbp at sourcefrog.net-20090528162104-1jdqlgs10g56mejc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-05-28 18:14:38 +0100
message:
  (mbp) tweak message from bzr add
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
    ------------------------------------------------------------
    revno: 4381.2.1
    revision-id: mbp at sourcefrog.net-20090528162104-1jdqlgs10g56mejc
    parent: pqm at pqm.ubuntu.com-20090526084851-z5v419bk4ni21res
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Thu 2009-05-28 18:21:04 +0200
    message:
      Tweaks to bzr add messages
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
=== modified file 'NEWS'
--- a/NEWS	2009-05-28 07:46:53 +0000
+++ b/NEWS	2009-05-28 17:14:38 +0000
@@ -26,6 +26,9 @@
 Bug Fixes
 *********
 
+* Better message in ``bzr add`` output suggesting using ``bzr ignored`` to
+  see which files can also be added.  (Jason Spashett, #76616)
+
 Documentation
 *************
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-05-26 20:32:34 +0000
+++ b/bzrlib/builtins.py	2009-05-28 17:14:38 +0000
@@ -610,8 +610,9 @@
                 for glob, paths in ignored.items():
                     match_len += len(paths)
                 self.outf.write("ignored %d file(s).\n" % match_len)
-            self.outf.write("If you wish to add some of these files,"
-                            " please add them by name.\n")
+            self.outf.write("If you wish to add ignored files, "
+                            "please add them explicitly by name. "
+                            "(\"bzr ignored\" gives a list)\n")
 
 
 class cmd_mkdir(Command):

=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py	2009-04-23 21:32:09 +0000
+++ b/bzrlib/tests/blackbox/test_add.py	2009-05-28 16:21:04 +0000
@@ -55,8 +55,9 @@
         out = self.run_bzr('add')[0]
         # the ordering is not defined at the moment
         results = sorted(out.rstrip('\n').split('\n'))
-        self.assertEquals(['If you wish to add some of these files, please'\
-                           ' add them by name.',
+        self.assertEquals(['If you wish to add ignored files, '
+                           'please add them explicitly by name. '
+                           '("bzr ignored" gives a list)',
                            'adding .bzrignore',
                            'adding dir',
                            'adding dir/sub.txt',
@@ -65,8 +66,8 @@
                           results)
         out = self.run_bzr('add -v')[0]
         results = sorted(out.rstrip('\n').split('\n'))
-        self.assertEquals(['If you wish to add some of these files, please'\
-                           ' add them by name.',
+        self.assertEquals(['If you wish to add ignored files, '\
+                           'please add them explicitly by name. ("bzr ignored" gives a list)',
                            'ignored CVS matching "CVS"'],
                           results)