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
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2009-02-16 16:43:54 +0000
3+++ bzrlib/builtins.py 2009-02-25 23:33:03 +0000
4@@ -545,8 +545,9 @@
5 for glob, paths in ignored.items():
6 match_len += len(paths)
7 self.outf.write("ignored %d file(s).\n" % match_len)
8- self.outf.write("If you wish to add some of these files,"
9- " please add them by name.\n")
10+ self.outf.write("If you wish to add ignored files, "
11+ "please add them explicitly by name. "
12+ "(\"bzr ignored\" gives a list)\n")
13
14
15 class cmd_mkdir(Command):
16
17=== modified file 'bzrlib/tests/blackbox/test_add.py'
18--- bzrlib/tests/blackbox/test_add.py 2009-02-08 14:09:39 +0000
19+++ bzrlib/tests/blackbox/test_add.py 2009-02-25 23:24:11 +0000
20@@ -33,8 +33,8 @@
21 out = self.run_bzr('add')[0]
22 # the ordering is not defined at the moment
23 results = sorted(out.rstrip('\n').split('\n'))
24- self.assertEquals(['If you wish to add some of these files, please'\
25- ' add them by name.',
26+ self.assertEquals(['If you wish to add ignored files, '\
27+ 'please add them explicitly by name. ("bzr ignored" gives a list)',
28 'add completed',
29 'adding .bzrignore',
30 'adding dir',
31@@ -44,8 +44,8 @@
32 results)
33 out = self.run_bzr('add -v')[0]
34 results = sorted(out.rstrip('\n').split('\n'))
35- self.assertEquals(['If you wish to add some of these files, please'\
36- ' add them by name.',
37+ self.assertEquals(['If you wish to add ignored files, '\
38+ 'please add them explicitly by name. ("bzr ignored" gives a list)',
39 'ignored CVS matching "CVS"'],
40 results)
41