darcs

Issue 92 Using both --patch and --last with "darcs diff" produces confusing result

Title Using both --patch and --last with "darcs diff" produces confusing result
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, hanwen, janneke, jaredj, kowey, markstos, thorkilnaur, tommy, tux_rocker
Assigned To tux_rocker
Topics Darcs2, ProbablyEasy

Created on 2006-01-10.23:19:00 by hanwen, last changed 2009-08-27.14:04:03 by admin.

Messages
msg352 (view) Author: hanwen Date: 2006-01-10.23:19:00
Hi,

there seems to be an incompatibility between changes and diff. 
Apparently, when combining --patch and --last diff just takes looks at 
the last one, iso. logically ANDing them.

eg.

muurbloem:~/vc/gub$ darcs changes --patch 'resolve' --last=50  |head
Tue Jan 10 12:48:27 CET 2006  hanwen@xs4all.nl
   * resolve.
muurbloem:~/vc/gub$ darcs diff --patch 'resolve' --last=50  |head
Tue Jan 10 12:48:27 CET 2006  hanwen@xs4all.nl
   * resolve.
Tue Jan 10 12:46:33 CET 2006  hanwen@xs4all.nl
   * use Freetype__mingw, but excise reconfigure hack.
Tue Jan 10 11:46:03 CET 2006  hanwen@xs4all.nl
   * d'oh. pre_install_libtool_fuckup() depends on build_platform, not
   target platform.
Tue Jan 10 09:43:17 CET 2006  janneke@gnu.org
   tagged success-make_linux_from_linux-20060110015946
Tue Jan 10 06:26:44 CET 2006  hanwen@xs4all.nl
muurbloem:~/vc/gub$
msg2365 (view) Author: markstos Date: 2008-01-08.01:27:37
There is not an inconsistency here, just confusion. 

Some darcs commands support --patch (singular), and others have --patches
(plural) depending on what makes sense in each case. 

Which darcs diff, you can either review the diff for a single patch, or the diff
betweeen two points in history. It's not nearly as a common to want to express
"show me all the diffs of the patches that match the pattern blue". 

On the other hand, it's more likely to want to express "show me all the
changelog entries related to to the pattern "RT#1234". 

In your example, you have done something unusual: In darcs diff you have
combined an option used to select a single patch for diffing, and another select
an end-point for differing against the current state of the tree. 

I think perhaps darcs should throw an error in this case and say something like
"using --patch and --last at the same time with the 'diff' command doesn't make
sense. Use --from-patch to create a diff from this patch to the present, or use
 just '--patch' to view this specific patch.
msg2366 (view) Author: droundy Date: 2008-01-08.20:20:46
On Tue, Jan 08, 2008 at 01:27:57AM -0000, Mark Stosberg wrote:
> I think perhaps darcs should throw an error in this case and say something like
> "using --patch and --last at the same time with the 'diff' command doesn't make
> sense. Use --from-patch to create a diff from this patch to the present, or use
>  just '--patch' to view this specific patch.

This analysis sounds right to me.

David
History
Date User Action Args
2006-01-10 23:19:00hanwencreate
2006-08-06 09:06:33koweysettopic: + ProbablyEasy
2007-07-12 20:43:08koweysettopic: - ProbablyEasy
nosy: + kowey, beschmi
2008-01-08 01:27:59markstossetstatus: unread -> unknown
nosy: + markstos
messages: + msg2365
title: inconsistency between changes and diff command -> Using both --patch and --last with "darcs diff" produces confusing result
2008-01-08 20:20:51droundysetmessages: + msg2366
2008-02-03 13:58:13markstossettopic: + ProbablyEasy, Darcs2
nosy: + jaredj
2008-02-16 21:58:42markstossetstatus: unknown -> deferred
nosy: droundy, tommy, beschmi, kowey, markstos, hanwen, janneke, jaredj
2008-02-24 15:15:48tux_rockersetstatus: deferred -> has-patch
nosy: + tux_rocker
assignedto: tux_rocker
2008-02-26 21:19:35tux_rockersetstatus: has-patch -> resolved-in-unstable
nosy: droundy, tommy, beschmi, kowey, markstos, hanwen, janneke, jaredj, tux_rocker
2008-09-04 21:28:04adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:34:18adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, hanwen, janneke, jaredj, tux_rocker
2009-08-06 20:31:39adminsetnosy: - beschmi
2009-08-10 22:21:26adminsetnosy: + tux_rocker, hanwen, janneke, jaredj, - darcs-devel, zooko, jast, Serware, mornfall
2009-08-11 00:17:30adminsetnosy: - dagit
2009-08-25 17:48:55adminsetnosy: + darcs-devel, - simon
2009-08-27 14:04:03adminsetnosy: tommy, kowey, markstos, darcs-devel, hanwen, janneke, thorkilnaur, jaredj, tux_rocker, dmitry.kurochkin