Merge lp:~jspashett/bzr/76616_ignored_on_add_confusing into lp:~bzr/bzr/trunk-old

[Jason Spashett]

[Jason Spashett (jspashett)]

Please review and comment on changes to informational message.

[Martin Pool (mbp)]

As I said in the bug, I'd probably prefer to just remove the messages, but I could be persuaded otherwise.

Thanks very much for the patch though!

[Jason Spashett (jspashett)]

"As I said in the bug, I'd probably prefer to just remove the messages, but I could be persuaded otherwise.

Thanks very much for the patch though!"

Removed ignored files message.
Added sentence at end of bzr help add.
Added see also: ignore to draw attention to ignore functionality.

[Martin Pool (mbp)]

looks good, I'll merge

review: Approve

[Jason Spashett (jspashett)]

For Bug #76616

I think the wrong change might have been merged in from my branch
( https://code.launchpad.net/~jspashett/bzr/76616_ignored_on_add_confusing ). 4028 has been merged in instead of the change
you proposed (and I agree with) and I re-implemented in change: 4031 - 4032

[Martin Pool (mbp)]

>
> For Bug #76616
>
> I think the wrong change might have been merged in from my branch
> ( https://code.launchpad.net/~jspashett/bzr/76616_ignored_on_add_confusing ).
> 4028 has been merged in instead of the change
> you proposed (and I agree with) and I re-implemented in change: 4031 - 4032

I think this has now been correctly merged - if not, please reopen the bug.

review: Approve

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-02-16 16:43:54 +0000
+++ bzrlib/builtins.py	2009-02-25 23:33:03 +0000
@@ -545,8 +545,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'
--- bzrlib/tests/blackbox/test_add.py	2009-02-08 14:09:39 +0000
+++ bzrlib/tests/blackbox/test_add.py	2009-02-25 23:24:11 +0000
@@ -33,8 +33,8 @@
         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)',
                            'add completed',
                            'adding .bzrignore',
                            'adding dir',
@@ -44,8 +44,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)