Patch 1733 move more repo paths to D.R.Paths (and 14 more)

Title move more repo paths to D.R.Paths (and 14 more)
Superseder Nosy List bf
Related Issues
Status obsoleted Assigned To

Created on 2018-09-23.21:04:04 by bf, last changed 2018-09-25.18:44:37 by bf.

File name Status Uploaded Type Edit Remove
move-more-repo-paths-to-d_r_paths.dpatch bf, 2018-09-23.21:04:02 application/x-darcs-patch
patch-preview.txt bf, 2018-09-23.21:04:02 text/x-darcs-patch
unnamed bf, 2018-09-23.21:04:02 text/plain
See mailing list archives for discussion on individual patches.
msg20327 (view) Author: bf Date: 2018-09-23.21:04:02
Here is an extended bundle (same patches as before plus new ones). It is
mostly about compatibility stuff like adding a new format property, tests,
error messages etc, and one or two unrelated dependencies.

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

patch 288d5f53f83e2fd1b72e66a0c37f4c729b531ef0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Jul  2 18:58:26 CEST 2018
  * move more repo paths to D.R.Paths

patch 5aa080f8f1bf87912d49ef4803a1f8ef07f14ef0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Sep 18 19:00:40 CEST 2018
  * store rebase patch at the repo layer instead of mixing it with normal patches
  This does not yet do away with the WrappedNamed layer and the
  RepoType/PatchType cruft, which will be done in a second and third step.
  Some tests now fail which is due to bugs which are only weakly related to
  the change made here, so will be fixed in a follow-up patch.
  Note that this changes is incompatible in that previous versions of darcs
  can't handle a repo with a new-style rebase in progress and vice versa. This
  is something we cannot avoid unless we keep all the old code around, which
  would reap us us of most of the benefits we get from this change.

patch f0e13101eb205765ade027749c5af445e79e5580
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Sep 18 04:10:46 CEST 2018
  * two fixes in clone and convert import commands
  The bug was in both cases that finalizeRepositoryChanges was not correctly
  paired with revertRepositoryChanges. This was exposed by the new way of
  storing the rebase patch, which crashes when it tries to rename the
  tentative rebase patch back to its final version.

patch cb9d99d39ac946fbbb931464c24154be80e05290
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Sep 18 19:13:23 CEST 2018
  * remove the WrappedNamed layer

patch 404143fadc2551ac409bdf850d9a10f7075cd939
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 19 11:56:55 CEST 2018
  * add PatchInfoAndG which is polymorphic in the named patch type
  The standard PatchInfoAnd is now a type synonym that fixes the named patch
  type as 'Named'. Unfortunately this required the addition of Eq2 constraints
  in lots of places.
  The goal of this generalization is to be able to convert old-style rebasing
  repos, for which we need to read PatchInfoAndG with a simplified version of
  the old WrappedNamed as the named patch type.

patch efa36333ad5e9073488930c0dd9912b47c68bb23
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Sep 20 01:10:29 CEST 2018
  * use englishNum for correct grammar in rebase status line

patch 49d7d124a3bd725dff62d22f989679fdef4dc30c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Sep 19 22:11:51 CEST 2018
  * add command 'rebase upgrade'
  This required a few additional refactorings mostly in D.R.Hashed. We lift a
  local function to the top level that (lazily) reads the patches from a
  single inventory. Since this does not return a PatchSet but only an RL of
  PatchInfoAnd, we can generalize it to return PatchInfoAndG and so can be
  used with WrappedNamed instead of Named. The WrappedNamed has been
  resurrected and largely cut down to what is needed for this single purpose.

patch 4a12994d2b9d97fd0b81b87014a4ead7c0f95223
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Sep 20 15:56:15 CEST 2018
  * reliably fail if we detect that an old-style rebase is in progress
  The trick is to check if the repo type is tagged with SIsRebase, which means
  that the repo format has rebase-in-progress, and then count the suspended
  patches in the new-style rebase patch. If it is zero we can assume that we
  have an old-style rebase in progress.
  While the check itself is simple, making sure it is called with the right
  parameters at the right time is not. One problem is that we must make an
  exception for the 'rebase upgrade' command. This is achieved by adding a new
  kind of RepoJob (OldRebaseJob) just for this command. A further complication
  arises because startRebaseJob is called with an SIsRebase-typed repo
  regardless of whether a rebase was in progress initially or not. In this
  case we cannot decide whether to run the check based on the repo type alone,
  but instead have to (re-)test the format stored in repository token.

patch 18a8aee9ee409ad91985dbdc39095c69f373f9ec
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sat Sep 22 14:28:39 CEST 2018
  * avoid needless String/ByteString conversions when reading format file

patch d51fae030fb6090bce28e9c1fb682334b04be0aa
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sat Sep 22 17:36:12 CEST 2018
  * factor yet another bunch of repo paths to D.R.Paths

patch 70e7eb2a2f540344931740f1fa70d84133f6d64a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Sep 23 15:07:10 CEST 2018
  * adapt rebase tests to new style of storing rebase patch
  It is now okay to transfer patches between repos with new-style rebase in
  progress; these operations ignore the rebase patch.

patch 1ca018fa626ee2d62d1a3a79fa7e5c686f4037c9
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sat Sep 22 23:29:54 CEST 2018
  * add new repo format new-style-rebase-in-progress

patch b59a2d9bd57ad82c29c5bcbf1108688706a23c3a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Sep 23 18:52:57 CEST 2018
  * cleanups in D.P.Named.Wrapped and D.P.Rebase.Container
  This mostly removes or fixes outdated docs.

patch 25b1da56c6c7a3fa7ad8acb0dc630b67642de88d
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Sep 23 19:19:27 CEST 2018
  * fix error messages for clone/transfer from repo with old-style rebase in progress

patch 33515bbbf9d2c7da70adf5a04441528c87c92805
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Sep 23 19:14:42 CEST 2018
  * include clone command in test for new-style rebase
msg20330 (view) Author: bf Date: 2018-09-25.18:44:37
I actually wanted to send this as an update bundle to patch1731. Will 
try again.
Date User Action Args
2018-09-23 21:04:04bfcreate
2018-09-25 18:44:37bfsetstatus: needs-screening -> obsoleted
messages: + msg20330