darcs

Issue 568 wrong report of "Skipped 6 patches due to dependencies"

Title wrong report of "Skipped 6 patches due to dependencies"
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List Serware, darcs-devel, dmitry.kurochkin, kowey, quick, thorkilnaur, tommy
Assigned To
Topics

Created on 2007-12-06.00:11:50 by droundy, last changed 2009-10-23.23:30:11 by admin.

Messages
msg2280 (view) Author: droundy Date: 2007-12-06.00:11:49
When recording, the new code that announces that patches are skipped due to
dependencies sometimes gives false positives.  To reproduce this, make
several independent changes to a file, run an interactive record and hit
'f' on the first change.  This should select all the changes, and does, but
you get a confusing message claiming some changes have been skipped due to
dependencies.

This is actually observed on the darcs-conflicts branch, but I expect it's
also present in darcs-unstable.
-- 
David Roundy
Department of Physics
Oregon State University
msg2281 (view) Author: kowey Date: 2007-12-06.12:01:05
On Thu, Dec 06, 2007 at 00:11:50 -0000, David Roundy wrote:
> When recording, the new code that announces that patches are skipped due to
> dependencies sometimes gives false positives.  To reproduce this, make
> several independent changes to a file, run an interactive record and hit
> 'f' on the first change.  This should select all the changes, and does, but
> you get a confusing message claiming some changes have been skipped due to
> dependencies.

Hmm, that is indeed confusing.  Is it just the messages that are at
fault or is there a deeper rework of the code needed.  I am guessing
that what we really need are 4 different messages:

- Skipping the next N patches as requested
- Skipping the next N patches due to dependencies
- Taking the next N patches as requested
- Taking the next N patches due to dependencies
msg2282 (view) Author: droundy Date: 2007-12-06.13:39:55
On Thu, Dec 06, 2007 at 11:58:58AM +0000, Eric Y. Kow wrote:
> On Thu, Dec 06, 2007 at 00:11:50 -0000, David Roundy wrote:
> > When recording, the new code that announces that patches are skipped due to
> > dependencies sometimes gives false positives.  To reproduce this, make
> > several independent changes to a file, run an interactive record and hit
> > 'f' on the first change.  This should select all the changes, and does, but
> > you get a confusing message claiming some changes have been skipped due to
> > dependencies.
> 
> Hmm, that is indeed confusing.  Is it just the messages that are at
> fault or is there a deeper rework of the code needed.  I am guessing
> that what we really need are 4 different messages:
>
> - Skipping the next N patches as requested
> - Skipping the next N patches due to dependencies
> - Taking the next N patches as requested
> - Taking the next N patches due to dependencies

Just switching from "Skipping" to "Taking" when appropriate will go a long
way towards fixing this, and I recommend just that change for now, as some
rework of the patch selection may be needed for darcs-2, due to changing
semantics.

But yes, if we change PatchChoices to hold a five possible states per patch
we could do this ("yes", "no", "maybe", "yes, due to dependencies" and "no,
due to dependencies").  We might be able to concatenate this into four
states, since "maybe" always defaults one direction.
-- 
David Roundy
Department of Physics
Oregon State University
msg2830 (view) Author: droundy Date: 2008-01-28.14:14:19
This is resolved by Kevin Quick's recent patch.  Thanks Kevin!
msg2889 (view) Author: kowey Date: 2008-01-30.11:59:25
Hi Kevin,

Could you have a second look at this?  I don't think this is quite the correct
interaction... (below, icons is a directory with a lot of files).

adddir ./icons
Shall I record this change? (1/?)  [ynWsfvpxdaqjkc], or ? for help: s
hunk ./Makefile 6
+pack : reg2008-pack.tex
+       latex2html -no_subdir -init_file pack2html.pl -split 4 $<
+       cp my-$(basename $(<F)).css $(basename $(<F)).css
+
Shall I record this change? (2/199)  [ynWsfvpxdaqjk], or ? for help: f
Included record of 191 changes due to dependencies.
msg2899 (view) Author: quick Date: 2008-01-30.14:59:11
Can you run the record with the -v flag to verify that the 191 skips  
are not just Makefile changes?

I'll see if I can reproduce this here.  Basically after each response  
it re-filters the possible and not-possible set of patches before  
issuing the next prompt, so the 's'kip on the adddir should have  
removed anything dependent on adddir at that point and not later than  
that.   I assume that sincd the icons directory was new that all the  
files in it were adds as well; this may indicate some indistinct  
patch dependency relationship between an added directory and its  
contents.

-KQ

On 30 Jan 2008, at 4:59 AM, Eric Kow wrote:

>
>
> Hi Kevin,
>
> Could you have a second look at this?  I don't think this is quite  
> the correct
> interaction... (below, icons is a directory with a lot of files).
>
> adddir ./icons
> Shall I record this change? (1/?)  [ynWsfvpxdaqjkc], or ? for help: s
> hunk ./Makefile 6
> +pack : reg2008-pack.tex
> +       latex2html -no_subdir -init_file pack2html.pl -split 4 $<
> +       cp my-$(basename $(<F)).css $(basename $(<F)).css
> +
> Shall I record this change? (2/199)  [ynWsfvpxdaqjk], or ? for help: f
> Included record of 191 changes due to dependencies.
>
> ----------
> status: resolved-in-unstable -> chatting
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/issue568>
> __________________________________
> _______________________________________________
> darcs-devel mailing list
> darcs-devel@darcs.net
> http://lists.osuosl.org/mailman/listinfo/darcs-devel
msg2902 (view) Author: kowey Date: 2008-01-30.15:06:03
> Can you run the record with the -v flag to verify that the 191 skips
> are not just Makefile changes?

Well, I'm positive about that.  They come from a bunch of addfiles and
the Makefile changes contains only the 6 lines (also, I had elided a
small bit where I hit 'c' which is why you see patch counts).

Hope this helps, and thanks!
msg3938 (view) Author: droundy Date: 2008-03-20.17:50:38
Resolved by

Thu Mar 20 12:06:56 EDT 2008  David Roundy <droundy@darcs.net>
  * resolve issue568: don't explain why patches are skipped.
  This isn't an optimal fix, but it removes the incorrect claim that patches
  were skipped due to dependencies, and that's enough for now.

although apparently the automatic trigger misfired.
History
Date User Action Args
2007-12-06 00:11:51droundycreate
2007-12-06 12:01:06koweysetstatus: unread -> unknown
nosy: + darcs-devel
messages: + msg2281
2007-12-06 13:39:57droundysetnosy: kowey, beschmi, droundy, darcs-devel, tommy
messages: + msg2282
2008-01-05 15:19:22droundysetnosy: kowey, beschmi, droundy, tommy, darcs-devel
2008-01-28 14:14:22droundysetstatus: unknown -> resolved-in-unstable
nosy: droundy, tommy, beschmi, kowey, darcs-devel
messages: + msg2830
2008-01-30 11:59:26koweysetstatus: resolved-in-unstable -> unknown
nosy: droundy, tommy, beschmi, kowey, darcs-devel
messages: + msg2889
2008-01-30 14:59:12quicksetnosy: + quick
messages: + msg2899
2008-01-30 15:06:04koweysetnosy: droundy, tommy, beschmi, kowey, darcs-devel, quick
messages: + msg2902
2008-02-16 16:33:33markstossetstatus: unknown -> has-patch
nosy: droundy, tommy, beschmi, kowey, darcs-devel, quick
topic: + Darcs2
2008-02-16 16:34:46markstoslinkissue659 superseder
2008-02-21 03:39:41markstossettopic: + Target-2.0
nosy: droundy, tommy, beschmi, kowey, darcs-devel, quick
2008-02-21 03:42:42markstosunlinkissue659 superseder
2008-03-20 17:50:39droundysetstatus: has-patch -> resolved
nosy: droundy, tommy, beschmi, kowey, darcs-devel, quick
messages: + msg3938
2008-08-22 16:12:06koweysettopic: - Target-2.0
nosy: + Serware, dagit
2009-08-06 17:46:16adminsetnosy: + markstos, jast, dmitry.kurochkin, zooko, mornfall, simon, thorkilnaur, - droundy, quick
2009-08-06 20:42:01adminsetnosy: - beschmi
2009-08-10 22:09:54adminsetnosy: + quick, - markstos, zooko, jast, mornfall
2009-08-11 00:04:01adminsetnosy: - dagit
2009-08-25 17:58:03adminsetnosy: - simon
2009-08-27 14:03:13adminsetnosy: tommy, kowey, darcs-devel, quick, thorkilnaur, dmitry.kurochkin, Serware
2009-09-04 09:38:13koweysettopic: - Darcs2
nosy: tommy, kowey, darcs-devel, quick, thorkilnaur, dmitry.kurochkin, Serware
2009-10-23 22:44:22adminsetnosy: + serware, - Serware
2009-10-23 23:30:11adminsetnosy: + Serware, - serware