[darcs-devel] [patch1758] resolve issue2605: allow common patches to be non-consecutive

[Ben Franksen]

Ben Franksen <ben.franksen at online.de> added the comment:

This bundle rebases the last patch to avoid a conflict with patch1742.

6 patches for repository http://darcs.net/screened:

patch 01fc5a5889e7c0e5b874134257197e777b771ff6
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Oct 31 17:02:56 CET 2018
  * extended test for issue2605

patch c786b747981ba0628a55bfe399f0c34c0e21da46
Author: Ben Franksen <ben.franksen at online.de>
Date:   Thu Nov  1 17:16:24 CET 2018
  * accept issue2606: improve handling of dependency swaps

patch ea33e52a9e21100c435cae1968d7c40a4f8b8cea
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Oct 31 18:48:53 CET 2018
  * resolve issue2605: allow common patches to be non-consecutive
  
  The basic functionality is fully implementated. In particular, patch
  selection does not offer common patches to the user; they are silently
  marked as "undecided" i.e. are included in the selection if required by
  dependencies. Common patches still appear in some of the messages displayed
  to the user. This will be fixed in another patch. It is now painfully
  obvious that we need a more efficient way to represent sets of patch names,
  which is (still) done using lists and linear search.
  
  The test for issue1879 has been removed because it is no longer valid and
  its (invalid) fix has been reverted by this patch. I will re-open the issue.

patch e08759838bebe7cd0bf36440f7bdf6f3c09ff9a4
Author: Ben Franksen <ben.franksen at online.de>
Date:   Wed Oct 31 20:40:00 CET 2018
  * use Data.HashSet for sets of PatchInfos
  
  This adds a dependency on unordered-containers which I think is justified.
  Note that comparing PatchInfo is expensive, which makes an array mapped trie
  a much better option than a balanced tree based container like Data.Set.

patch 46d2946cdfa1f4599b83ab56f070afa609c407a4
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Nov  2 13:57:32 CET 2018
  * fix numbering of patches in patch selection with hidden patches

patch bb0b3667a9e4f33f282d2523c62dd98ed28cea9e
Author: Ben Franksen <ben.franksen at online.de>
Date:   Fri Nov  2 17:49:34 CET 2018
  * remove common patches from all messages
  
  This adds another argument of type PatchPredicate to some calls which issue
  messages based on a list of selected patches. The argument is used to filter
  out the patches that should not be shown, usually patches common between
  remote and local repo.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1758>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-preview.txt
Type: text/x-darcs-patch
Size: 47179 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20181108/5bbe51ee/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: extended-test-for-issue2605.dpatch
Type: application/x-darcs-patch
Size: 74619 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-devel/attachments/20181108/5bbe51ee/attachment-0003.bin>
-------------- next part --------------
.