darcs

Issue 1865 darcs get --context is broken

Title darcs get --context is broken
Priority bug Status resolved
Milestone 2.5.0 Resolved in 2.5.0
Superseder Nosy List dmitry.kurochkin, kowey, mornfall
Assigned To mornfall
Topics Regression

Created on 2010-06-06.15:02:02 by mornfall, last changed 2010-07-10.19:49:07 by tux_rocker.

Messages
msg11266 (view) Author: mornfall Date: 2010-06-06.15:02:01
For all I can tell, darcs get --context got horribly broken with NewSet. 
There's a regression test for it though, that does not notice any 
problem, so that probably needs extending. In issue1860, Eric created a 
"seven-ctx" -- if I use it on darcs get of the darcs darcs repo, I get a 
result that has about 9 patches in it. Specifically, it is missing the 
2.2 tag and everything that it depends on.

The --context code works by producing a PatchSet from the context file 
and then using findCommonWithThem to get a list of uncommon patches, 
which are then unpulled. In this case, *most* of the current repository 
ends up in the "only_ours" part and is therefore unpulled. Probably due 
to a failure to move the tag into the common part.
msg11280 (view) Author: kowey Date: 2010-06-06.18:31:44
Just making a note that we need to extend the get context test as Petr
suggests.
msg11558 (view) Author: kowey Date: 2010-06-23.15:32:35
Hi Petr, thanks for the test!  

Could you break your 'Extend the get test to cover --context interaction
with tags.' into a separate failing-issue1865-get-context.sh?  (unless
you have a better idea on how to deal with this, because such work would
involve some duplication in the test case code :-/)

My staging repo nicely reminded me that the get.sh test fails...
msg11565 (view) Author: mornfall Date: 2010-06-23.21:05:35
Eric Kow <bugs@darcs.net> writes:

> Could you break your 'Extend the get test to cover --context interaction
> with tags.' into a separate failing-issue1865-get-context.sh?  (unless
> you have a better idea on how to deal with this, because such work would
> involve some duplication in the test case code :-/)
>
> My staging repo nicely reminded me that the get.sh test fails...

I have pushed an amended version of the patch (that both extends get.sh
slightly and adds a failing-issue1865... test).

Yours,
   Petr.
msg11567 (view) Author: kowey Date: 2010-06-24.08:32:15
Thanks.  It looks like Petr has already diagnosed the problem in
msg11266, and now that we have a formal test for it, we only need
implementation.
msg11706 (view) Author: mornfall Date: 2010-07-09.21:46:31
The following patch updated issue issue1865 with status=resolved;resolvedin=2.6.0 HEAD

* Resolve issue1865: make scanBundle produce a well-formed PatchSet. 
Ignore-this: d25580a6ed72fa218b63b947838a8a1a

When a context files ends in a tag, this has to be a clean tag, so we break it
out into a separate (empty) Tagged, which makes with_partial_intersection work
correctly on the result.
History
Date User Action Args
2010-06-06 15:02:02mornfallcreate
2010-06-06 18:31:45koweysetpriority: bug
status: unknown -> needs-reproduction
topic: + Regression, Target-2.5
messages: + msg11280
nosy: + kowey
2010-06-15 20:52:19adminsetmilestone: 2.5.0
2010-06-15 21:00:13adminsettopic: - Target-2.5
2010-06-23 15:32:36koweysetmessages: + msg11558
2010-06-23 15:37:46koweylinkpatch273 issues
2010-06-23 21:05:36mornfallsetmessages: + msg11565
2010-06-24 08:32:16koweysetstatus: needs-reproduction -> needs-implementation
assignedto: mornfall -> (no value)
messages: + msg11567
2010-07-06 13:59:53mornfallsetassignedto: mornfall
2010-07-09 19:40:14ganeshlinkpatch298 issues
2010-07-09 21:46:32mornfallsetstatus: needs-implementation -> resolved
messages: + msg11706
resolvedin: 2.8.0
2010-07-10 19:49:07tux_rockersetresolvedin: 2.8.0 -> 2.5.0