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

Proposed by Jason Spashett on 2009-03-24
Status: Merged
Approved by: Martin Pool on 2009-05-28
Approved revision: 4032
Merge reported by: Martin Pool
Merged at revision: not available
Proposed branch: lp:~jspashett/bzr/76616_ignored_on_add_confusing
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~jspashett/bzr/76616_ignored_on_add_confusing
Reviewer Review Type Date Requested Status
Martin Pool 2009-03-26 Approve on 2009-08-15
Bazaar Developers 2009-03-24 Pending
Review via email: mp+4864@code.launchpad.net
To post a comment you must log in.
Jason Spashett (jspashett) wrote :

Please review and comment on changes to informational message.

Martin Pool (mbp) wrote :

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!

4030. By Jason Spashett on 2009-03-26

Revert to 4027 to begin new alternate change.

4031. By Jason Spashett on 2009-03-26

Remove confusing message regarding files ignored during add.
- Feedback reduced only to files added - without informational message about ignored files.
- Add sentance at end of "bzr help add" indicating ignored files must be explicitly added (verified this with recurive and non recursive option)
- Add "see also: ignored", to draw attention to ignore functionality.

4032. By Jason Spashett on 2009-03-26

Correct spelling of patterns.
- If only I could spell properly, I could rule the world.

Jason Spashett (jspashett) wrote :

"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) wrote :

looks good, I'll merge

review: Approve
Jason Spashett (jspashett) wrote :

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) wrote :

>
> 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
545 for glob, paths in ignored.items():545 for glob, paths in ignored.items():
546 match_len += len(paths)546 match_len += len(paths)
547 self.outf.write("ignored %d file(s).\n" % match_len)547 self.outf.write("ignored %d file(s).\n" % match_len)
548 self.outf.write("If you wish to add some of these files,"548 self.outf.write("If you wish to add ignored files, "
549 " please add them by name.\n")549 "please add them explicitly by name. "
550 "(\"bzr ignored\" gives a list)\n")
550551
551552
552class cmd_mkdir(Command):553class cmd_mkdir(Command):
553554
=== 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 @@
33 out = self.run_bzr('add')[0]33 out = self.run_bzr('add')[0]
34 # the ordering is not defined at the moment34 # the ordering is not defined at the moment
35 results = sorted(out.rstrip('\n').split('\n'))35 results = sorted(out.rstrip('\n').split('\n'))
36 self.assertEquals(['If you wish to add some of these files, please'\36 self.assertEquals(['If you wish to add ignored files, '\
37 ' add them by name.',37 'please add them explicitly by name. ("bzr ignored" gives a list)',
38 'add completed',38 'add completed',
39 'adding .bzrignore',39 'adding .bzrignore',
40 'adding dir',40 'adding dir',
@@ -44,8 +44,8 @@
44 results)44 results)
45 out = self.run_bzr('add -v')[0]45 out = self.run_bzr('add -v')[0]
46 results = sorted(out.rstrip('\n').split('\n'))46 results = sorted(out.rstrip('\n').split('\n'))
47 self.assertEquals(['If you wish to add some of these files, please'\47 self.assertEquals(['If you wish to add ignored files, '\
48 ' add them by name.',48 'please add them explicitly by name. ("bzr ignored" gives a list)',
49 'ignored CVS matching "CVS"'],49 'ignored CVS matching "CVS"'],
50 results)50 results)
5151