darcs

Patch 135 Accept issue1726: Files with _darcs prefix are always ...

Title Accept issue1726: Files with _darcs prefix are always ...
Superseder Nosy List danieldickison, kowey, twb
Related Issues
Status accepted Assigned To
Milestone

Created on 2010-01-11.21:04:59 by danieldickison, last changed 2011-05-10.22:36:14 by darcswatch. Tracked on DarcsWatch.

Files
File name Status Uploaded Type Edit Remove
accept-issue1726_-files-with-_darcs-prefix-are-always-boring.dpatch danieldickison, 2010-01-14.07:01:25 text/x-darcs-patch
unnamed danieldickison, 2010-01-11.21:04:58 text/plain
unnamed danieldickison, 2010-01-14.06:38:26 text/plain
See mailing list archives for discussion on individual patches.
Messages
msg9783 (view) Author: danieldickison Date: 2010-01-11.21:04:58
Mon Jan 11 16:03:34 EST 2010  Daniel Dickison <danieldickison@gmail.com>
  * Accept issue1726: Files with _darcs prefix are always boring
Attachments
msg9812 (view) Author: twb Date: 2010-01-14.02:59:48
Sorry about the review delay.

Daniel Dickison wrote:
> Mon Jan 11 16:03:34 EST 2010  Daniel Dickison <danieldickison@gmail.com>
>   * Accept issue1726: Files with _darcs prefix are always boring

> +# Passing --boring should definitely succeed.
> +touch _darcsfoo
> +darcs whatsnew -ls --boring
> +darcs add --boring _darcsfoo
> +darcs revert -a _darcsfoo
> +
> +# Without --boring, it should succeed given the default boring file.
> +touch _darcsfoo
> +darcs whatsnew -ls
> +darcs add _darcsfoo
> +darcs revert -a _darcsfoo

I'm concerned that using "_darcsfoo" both times might trip unrelated
bugs in pending.  I suggest using _darcsbar the second time, and
simply doing a normal record.

    touch _darcsfoo
    darcs whatsnew -ls --boring
    darcs record --look-for-adds --boring _darcsfoo

    touch _darcsbar
    darcs whatsnew -ls --boring
    darcs record --look-for-adds --boring _darcsbar

> +# The actual _darcs directory should always be skipped.
> +not darcs add -r _darcs
> +not darcs add -r --boring _darcs

Good.

> +# ...as well as user-created files under _darcs (?)
> +touch _darcs/foo
> +not darcs add _darcs/foo

Good.

> +cd ..
> +rm -rf R

I think convention is now not to bother cleaning up after oneself.
msg9813 (view) Author: danieldickison Date: 2010-01-14.03:30:57
On Jan 13, 2010, at 9:59 PM, Trent W. Buck wrote:

> Trent W. Buck <trentbuck@gmail.com> added the comment:
> 
> Daniel Dickison wrote:
>> Mon Jan 11 16:03:34 EST 2010  Daniel Dickison <danieldickison@gmail.com>
>>  * Accept issue1726: Files with _darcs prefix are always boring
> 
>> +# Passing --boring should definitely succeed.
>> +touch _darcsfoo
>> +darcs whatsnew -ls --boring
>> +darcs add --boring _darcsfoo
>> +darcs revert -a _darcsfoo
>> +
>> +# Without --boring, it should succeed given the default boring file.
>> +touch _darcsfoo
>> +darcs whatsnew -ls
>> +darcs add _darcsfoo
>> +darcs revert -a _darcsfoo
> 
> I'm concerned that using "_darcsfoo" both times might trip unrelated
> bugs in pending.  I suggest using _darcsbar the second time, and
> simply doing a normal record.
> 
>    touch _darcsfoo
>    darcs whatsnew -ls --boring
>    darcs record --look-for-adds --boring _darcsfoo
> 
>    touch _darcsbar
>    darcs whatsnew -ls --boring
>    darcs record --look-for-adds --boring _darcsbar

My thought was to use `--boring' for the first pass to test the hardcoded stuff, then without that flag the second time to test the default boring file.  It would make sense to use different filenames for the two, though, like you said (though I think that would still require a `revert' between the two in order to test `whatsnew').

As far as I can tell, `record' doesn't take the --boring flag (though maybe it should?).  Also, if we do use `record' instead of `add', I presume we also need to pass `--all' so it doesn't get stuck at the prompt?
msg9815 (view) Author: twb Date: 2010-01-14.04:39:19
Daniel Dickison wrote:
> On Jan 13, 2010, at 9:59 PM, Trent W. Buck wrote:
>> I'm concerned that using "_darcsfoo" both times might trip unrelated
>> bugs in pending.  I suggest using _darcsbar the second time, and
>> simply doing a normal record.
>>
>>    touch _darcsfoo
>>    darcs whatsnew -ls --boring
>>    darcs record --look-for-adds --boring _darcsfoo
>>
>>    touch _darcsbar
>>    darcs whatsnew -ls --boring
>>    darcs record --look-for-adds --boring _darcsbar
>
> As far as I can tell, `record' doesn't take the --boring flag
> (though maybe it should?).

Oops.  By all means, use "add", then.

> Also, if we do use `record' instead of `add', I presume we also need
> to pass `--all' so it doesn't get stuck at the prompt?

Yep.  I habitually use rec -lam instead of add + record.

> (though I think that would still require a `revert' between the two
> in order to test `whatsnew').

Recorded changes won't show up in w -l.
msg9816 (view) Author: danieldickison Date: 2010-01-14.06:38:26
Thu Jan 14 01:34:06 EST 2010  Daniel Dickison <danieldickison@gmail.com>
  * Accept issue1726: Files with _darcs prefix are always boring
Attachments
msg9817 (view) Author: danieldickison Date: 2010-01-14.07:01:25
Sorry, I sent the previous amended patch before seeing Trent's message in the 
patch136 thread.  This one contains tests for all of suggested the variations of 
_darcs that is expected to fail.
Attachments
msg10346 (view) Author: kowey Date: 2010-03-21.07:19:15
Hi Trent, may I ping you on this?  It seems to be blocking patch136
Thanks!
msg10539 (view) Author: twb Date: 2010-03-27.10:15:08
Eric Kow wrote:
> Hi Trent, may I ping you on this?  It seems to be blocking patch136

Sorry about the huge delay.  I went to apply this to HEAD, and I got
this:

    darcs: bug in get_extra commuting patches:
    First patch is:
    Wed Aug 12 08:06:16 EST 2009  Marco TĂșlio Gontijo e Silva <marcot@riseup.net>
      * Regression test for issue1317.
    Second patch is:
    Mon Aug 24 21:04:37 EST 2009  Eric Kow <kowey@darcs.net>
      * Mark issue1317 test as failing (and note issue number).
msg10541 (view) Author: kowey Date: 2010-03-27.22:08:08
On Sat, Mar 27, 2010 at 10:15:08 +0000, Trent W. Buck wrote:
> Sorry about the huge delay.  I went to apply this to HEAD, and I got
> this:
> 
>     darcs: bug in get_extra commuting patches:
>     First patch is:
>     Wed Aug 12 08:06:16 EST 2009  Marco TĂșlio Gontijo e Silva <marcot@riseup.net>
>       * Regression test for issue1317.
>     Second patch is:
>     Mon Aug 24 21:04:37 EST 2009  Eric Kow <kowey@darcs.net>
>       * Mark issue1317 test as failing (and note issue number).

I always get this if I apply patches from the tracker straight from
mutt.  I have to hit C-e in the attachment viewer and change the MIME
type (some part from us-ascii to utf-8).  Either that or just d/l the
patch from the web interface.

I don't suppose that's the issue for you?

I think I need to investigate this...

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
msg11303 (view) Author: kowey Date: 2010-06-07.18:05:36
Sorry for the delay Daniel.  As Trent points out, we need to work on our
chasing up a bit more.  This looks good.
msg11310 (view) Author: darcswatch Date: 2010-06-07.18:42:53
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-3a2c61f95e57d7a31fc90ef8f12aa298b2318653
msg14200 (view) Author: darcswatch Date: 2011-05-10.19:36:58
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-3a2c61f95e57d7a31fc90ef8f12aa298b2318653
History
Date User Action Args
2010-01-11 21:04:59danieldickisoncreate
2010-01-11 21:05:44darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-d18b3989c79310606af14c3bca9454992b177d57
2010-01-11 21:29:06koweylinkpatch133 superseder
2010-01-12 15:30:54koweysetnosy: + twb
assignedto: twb
2010-01-14 02:59:49twbsetmessages: + msg9812
2010-01-14 03:31:01danieldickisonsetmessages: + msg9813
2010-01-14 04:39:20twbsetmessages: + msg9815
2010-01-14 06:38:26danieldickisonsetfiles: + accept-issue1726_-files-with-_darcs-prefix-are-always-boring.dpatch, unnamed
messages: + msg9816
2010-01-14 06:39:34darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-d18b3989c79310606af14c3bca9454992b177d57 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-1f14ea04ca86f36052013fee051cf3aad9e0d978
2010-01-14 07:01:26danieldickisonsetfiles: + accept-issue1726_-files-with-_darcs-prefix-are-always-boring.dpatch
messages: + msg9817
2010-01-14 07:02:00darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-1f14ea04ca86f36052013fee051cf3aad9e0d978 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-3a2c61f95e57d7a31fc90ef8f12aa298b2318653
2010-03-18 12:42:53danieldickisonsetfiles: - accept-issue1726_-files-with-_darcs-prefix-are-always-boring.dpatch
2010-03-18 12:43:20danieldickisonsetfiles: - accept-issue1726_-files-with-_darcs-prefix-are-always-boring.dpatch
2010-03-21 07:19:15koweysetnosy: + kowey
messages: + msg10346
2010-03-27 10:15:08twbsetmessages: + msg10539
2010-03-27 22:08:08koweysetmessages: + msg10541
2010-06-07 08:31:05koweysetnosy: - darcs-users
assignedto: twb ->
2010-06-07 18:05:36koweysetmessages: + msg11303
2010-06-07 18:42:54darcswatchsetstatus: needs-review -> accepted
messages: + msg11310
2011-05-10 19:36:58darcswatchsetmessages: + msg14200
2011-05-10 21:36:32darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-3a2c61f95e57d7a31fc90ef8f12aa298b2318653 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-d18b3989c79310606af14c3bca9454992b177d57
2011-05-10 22:36:14darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-d18b3989c79310606af14c3bca9454992b177d57 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-1f14ea04ca86f36052013fee051cf3aad9e0d978