Re: [Monotone-devel] Bug #21545 -- really annoying

[Richard Levitte]

In message <address@hidden> on Fri, 23 May 2008 13:39:18 +1000, William Uther 
<address@hidden> said:

willu.mailingLists> I've just added a simple warning in rev
willu.mailingLists> e70f33adec836ae22060c9d5be519d387e7852f0
willu.mailingLists> 
willu.mailingLists> Here is a transcript showing the warning:
willu.mailingLists> 
willu.mailingLists> % mkdir dir
willu.mailingLists> % touch dir/fileA
willu.mailingLists> % touch dirB
willu.mailingLists> % mtn add --unknown
willu.mailingLists> mtn: adding dir to workspace manifest
willu.mailingLists> mtn: warning: Non-recursive add: Files in the directory 
'dir' will not be added automatically.
willu.mailingLists> mtn: adding dirB to workspace manifest
willu.mailingLists> %
willu.mailingLists> 
willu.mailingLists> Note that only when you add a directory with files
willu.mailingLists> inside it do you get the warning.  The empty
willu.mailingLists> directory 'dirB' above doesn't get a warning.
willu.mailingLists> (Currently the code doesn't look to see if all the
willu.mailingLists> files in the dir are 'ignored' - that improvment
willu.mailingLists> is left as an exercise for the reader.)  There is
willu.mailingLists> no warning if you do a recursive add.

Good idea, I like it!  However, using directory_empty() can lead to
confusion (': ; ' is my prompt):

  : ; mkdir monotone-experiment
  : ; cd monotone-experiment/
  : ; mtn -d ../mtn.monotone-experiment db init
  : ; mtn -d ../mtn.monotone-experiment setup --branch mtn-ex .
  : ; mkdir foo
  : ; touch bar
  : ; touch foo/cookie~
  : ; LANG=en_US ~/monotonework/off.net/monotone/build/mtn add --unknown
  mtn: adding bar to workspace manifest
  mtn: adding foo to workspace manifest
  mtn: warning: Non-recursive add: Files in the directory 'foo' will not be 
added automatically.
  : ; ls --color=no -R .
  .:
  bar  foo  _MTN
  
  ./foo:
  cookie~
  
  ./_MTN:
  format  log  options  revision  revision~
  : ; LANG=en_US ~/monotonework/off.net/monotone/build/mtn add --unknown
  mtn: skipping ignorable file foo/cookie~

Cheers,
Richard

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis