[darcs-devel] [patch1730] add RepoPatchV3 aka camp conflictors (and 3 more)
Ben Franksen
bugs at darcs.net
Thu Feb 14 08:24:56 UTC 2019
Ben Franksen <ben.franksen at online.de> added the comment:
This bundle superseded the earlier one. It contains full integration of the
new patch format. All tests pass, but one or two minor features are not yet
implemented, see below for details.
I made no change whatsoever to the core algorithms (commute, merge, etc)
relative to the patch bundle I sent previously, only a minor refactor with
regard to the way PrimPatchIds are embedded in the representation.
Particularly, the NamedPrim wrapper is now fully hidden inside the
RepoPatchV3 implementation i.e. PrimOf (RepoPatchV3 prim) ~ prim ~ whatever
the underlying (unnamed) prim patch format is (i.e. usually V1).
The last big hurdle was to implement resolveConflicts. For this to work with
V3 I had to change the type of that method and this required a certain
amount of changes downstream. In particular, we have to pass the whole
history whenever we merge patches because the conflict resolution for V3
requires that. Instead of adding yet another parameter to functions that
already take more parameters than looks healthy, I chose to wrap all passed
patches as a (Fork common us them), where common is a PatchSet starting at
the Origin. This works out nicely due to the laziness of PatchSets, which
are only evaluated (and read from disk) as far as needed. The algorithm for
conflict resolution is documented in detail in the code.
A rather dirty hack makes this algorithm for resolveConflicts work when
unsuspending patches. The function forceCommutePrim (applied to the fixups
of a patch and the suspended patch itself) violated the assumption that a
patch we conflict with must be found somewhere in the context. To fix that
the patches contained in the resulting WDDNamed are now prefixed with @fixup
:>: invert fixup at .
One thing I am planning to do but haven't begun yet is to re-implement the
function that produces the actual conflict markup (mangleUnravelled) for
NamedPrims, taking advantage of the PrimPatchIds to improve the markup so it
includes the hashes of the originating named patches.
Not yet implemented is conversion from earlier formats to darcs-3.
Also not yet implemented is check/repair: I am using the default methods
that are just stubs that don't do anything interesting. The problem here is
that we cannot lift an operation on a list of prims to a list of NamedPrims
if this involves adding or removing prims, which is what the implementation
for Prim.V1 does. This needs to be refactored to handle one prim at a time
which I haven't done yet.
Similarly, showing hunks with surrounding context for v3 patches is
disabled for now. The code that shows a series of hunks with context is a
mess; it bypasses showContextPatch and re-implements showing for V1 prims.
This needs to be cleaned up first.
25 patches for repository http://darcs.net/screened:
patch 201588ce705f87b17bcb800c113b91d75d3a450e
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 16:50:41 CET 2019
* add some functions we need for V3 to Darcs.Patch.Ident
patch 2ab2d6ea7d3b4299dee37bc81e36fa35bc9c035d
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:45:13 CET 2019
* add RepoPatchV3 aka camp conflictors
patch 41d9f81cb0bb0c89d3589440cd2959d0b5df7361
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:45:38 CET 2019
* add V3 stuff to the test suite (quickcheck tests only)
patch 39e45329fa32f4a682ba1e557ee756a7a1d74327
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* renamed fromPrim to fromAnonymousPrim
patch 9e6f89e0479a740cf4b7ff28150f5f9d284cb400
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* add prim patch identifier when constructing Named patches
This re-adds method fromPrim to class FromPrim, this time with additional
parameters to construct the identifier. This is then used in function
infopatch instead of fromAnonymousPrim.
patch d0bbd4aa6e41c41459f09e64239d74f2e64d5850
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* move Darcs.Patch.V3.Prim to Darcs.Patch.Prim.Named
This is actually a fully generic wrapper for any PrimPatch type and
technically not tied to V3.
patch 3a797b9fc225df6dbb031b29307f4e30c891fa6c
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* add new Darcs3 format option
patch f6b41d01a4487e2d5004f5175113d9dfd90ecc98
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* trivial refactor in D.R.Create
patch 0107cb750c63795b3cd1fb17f94478102ab7dc5d
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* allow runnign the test scripts with darcs-3 format
patch 47609c8e55be5be81dfed655514762c51140f343
Author: Ben Franksen <ben.franksen at online.de>
Date: Fri Feb 8 17:46:49 CET 2019
* adapt test skip based on repo format
Now that we have three formats, we can no longer assume that skip-formats
darcs-1 implies test is run only for darcs-2.
patch 4e79a8698e04ff031c1f3697114777357ce26ac8
Author: Ben Franksen <ben.franksen at online.de>
Date: Sat Feb 9 14:43:32 CET 2019
* fix in the QC generator for prim patch IDs
patch 2c68e35e4a324ece160ff5e50bdfdaa21c3491ec
Author: Ben Franksen <ben.franksen at online.de>
Date: Sat Feb 9 14:51:59 CET 2019
* fix instance MightBeEmptyHunk for NamedPrim
Property effectPreserving fails for Prim.V1 empty hunks, and so it does for
its NamedPrim wrapper.
patch 1b723556f68d6ea9fcc71b9348c74a2c2163a4d5
Author: Ben Franksen <ben.franksen at online.de>
Date: Sat Feb 9 13:27:16 CET 2019
* separate class Summary out from class Conflict
This prepares a change in the type and meaning of resolveConflicts but makes
sense independently. The method conflictedEffect is used only to generate a
summary for potentially conflicted patches and thus has been moved to the
new class Summary. The class Conflict gets a new method isConflicted which
just returns whether a patch is conflicted or not.
Incidentally this gets rid of a number of unneeded instances for Conflict
with nonsense/dummy implementations for resolveConflicts (such as for Named,
PatchInfoAnd, RebaseChange, and RebaseSelect).
patch 160164bb4f50312093ab83c721488caea21ffe8e
Author: Ben Franksen <ben.franksen at online.de>
Date: Sat Feb 9 17:10:00 CET 2019
* add Darcs.Util.Graph
This contains an efficient algorithm to determine maximal independent sets
of an undirected graph.
patch d61e91e261ee659ff98225948038258dc7df0a34
Author: Ben Franksen <ben.franksen at online.de>
Date: Sun Feb 10 13:43:32 CET 2019
* fix a typo in a comment
patch fffd7cd29873f3c9f5529c79bb859ac86e51887a
Author: Ben Franksen <ben.franksen at online.de>
Date: Sun Feb 10 19:28:06 CET 2019
* fix cloning of darcs-3 format repos
patch 7cd237bf9a779540fe19c332e759e359a1b4cb0d
Author: Ben Franksen <ben.franksen at online.de>
Date: Sun Feb 10 21:48:03 CET 2019
* bugfix in instance ShowContextPatch for NamedPrim
patch dc879f6671f4dbff633ebeeb635a83e8d05337ac
Author: Ben Franksen <ben.franksen at online.de>
Date: Sun Feb 10 23:09:51 CET 2019
* hack: disable showContextSeries for darcs-3 format
The code (in Darcs.Patch.Viewing) that implements showContextSeries messily
re-implements showing for FLs of primitive patches (hunks in particular),
circumventing the ShowPatchBasic instance. This means that it cannot take
prim patch IDs into account since these are added to prim patches as a
wrapper. This would not be a big problem for display but it is one when we
use showContextPatch to create a patch bundle because it means that hunks
are stored without the prim patch ID and thus cannot be read.
The temporary "fix" here is to disable showContextSeries by adding a new
ListFormatV3, until the context showing code is cleaned up to pass the
correct prim show function down into showContextSeries.
patch dcceaa03b5ae8ce0c7670e056a1f6ef9eec8aa16
Author: Ben Franksen <ben.franksen at online.de>
Date: Tue Feb 12 18:17:39 CET 2019
* show the PrimPatchId only ForStorage, not ForDisplay
The PrimPatchId is not useful to the user and clutters up the output when
--verbose is in effect. It also allows more test scripts to pass without
having to adapt them.
patch f6fa434b182eb283aec29cc5ea8a077cb2c70923
Author: Ben Franksen <ben.franksen at online.de>
Date: Tue Feb 12 18:21:32 CET 2019
* fix expected output in look_for_moves test for darcs-3
The place where we have to adapt the test is when we test teh output of
'darcs log --machine-readable' which uses the ForStorage format option, so
we have to expect the hash line before the content.
patch 1850f72913a5057fb12bbfeeff5b5e93ce278c37
Author: Ben Franksen <ben.franksen at online.de>
Date: Tue Feb 12 18:36:09 CET 2019
* tests/pull.sh: expect the correct behavior for darcs-3, too
patch d22ee446187b4954744092a410530b23d2866aad
Author: Ben Franksen <ben.franksen at online.de>
Date: Wed Feb 13 09:23:01 CET 2019
* disable repair tests when format is darcs-3
Repairing currently means that we add or drop prims from a sequence, and we
cannot lift that to NamedPrims. Doing this right requires considerable
refactors to the Repair interface(s), so this is postponed for now.
patch e46cc62d1d40c0f98d33b7d850efcc172d3b6be6
Author: Ben Franksen <ben.franksen at online.de>
Date: Wed Feb 13 18:20:58 CET 2019
* fix rebase unsuspend for v3 with a dirty hack
See comment in the code for the why and how.
patch dcb2738aa6f37a04a803b5b92e7c000f22ecd32e
Author: Ben Franksen <ben.franksen at online.de>
Date: Wed Feb 13 18:24:09 CET 2019
* change the type of resolveConflicts
It now gets two RLs of patches as input and produces a simple (not nested)
list of resolutions. The change in the input type(s) has been done because
otherwise a RepoPatchV3 cannot correctly implement resolveConflicts, which
requires that we know the transitive set of conflicting patches for each
conflict. But a V3 conflictor contains only the patches that directly
conflict. The separation into two input RLs is so that we can still resolve
only the conflicts inside a (trailing) segment of all patches in a repo,
which is how we call it when merging patches.
There are no longer instances of class Conflict for RLs and FLs. Instead, we
offer the stand-alone function combineConflicts and use that in the
implementation of resolveConflicts for RepoPatchV1/2.
The change in the result type is just a cleanup: instead of adding the
mangled resolutions as a first element and then taking the head (in
standardResolution) we now replace the inner list with the mangled version.
Passing the full context to resolveConflicts requires a number changes
downstream. This is not strictly needed for V1/V2 which ignore the context,
so we could pass undefined, but we need to make this change for V3 anyway.
Instead of adding yet another parameter to all functions involved, we now
pass a (Fork common us them) which cleans up type signatures (and
incidentally some of the code, too).
patch 1a5c552ad9c8192fc3254f3e3dfcdd7c1ee525dd
Author: Ben Franksen <ben.franksen at online.de>
Date: Wed Feb 13 20:14:19 CET 2019
* implement resolveConflicts for RepoPatchV3
__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1730>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 158812 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190214/93dd4771/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add-some-functions-we-need-for-v3-to-darcs_patch_ident.dpatch
Type: application/x-darcs-patch
Size: 198471 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20190214/93dd4771/attachment-0003.bin>
-------------- next part --------------
.
More information about the darcs-devel
mailing list