darcs

Patch 2162 patches proposed for 2.16.4; draft

Title patches proposed for 2.16.4; draft
Superseder Nosy List bfrk
Related Issues
Status accepted Assigned To
Milestone

Created on 2021-03-10.14:48:47 by bfrk, last changed 2021-06-03.14:18:27 by bfrk.

Files
File name Status Uploaded Type Edit Remove
cabal_version_-2_2-__-2_4.dpatch bfrk, 2021-05-20.18:49:05 application/x-darcs-patch
patch-preview.txt bfrk, 2021-05-12.12:32:48 text/x-darcs-patch
patch-preview.txt bfrk, 2021-05-20.18:49:04 text/x-darcs-patch
test-that-we-cannot-record-patches-that-depend-on-broken-moves.dpatch bfrk, 2021-05-12.12:32:48 application/x-darcs-patch
unnamed bfrk, 2021-05-12.12:32:48 text/plain
unnamed bfrk, 2021-05-20.18:49:05 text/plain
See mailing list archives for discussion on individual patches.
Messages
msg22655 (view) Author: bfrk Date: 2021-03-10.14:48:44
This bundle is for branch-2.16. I have pulled all bug fixes from screened,
plus a few dependencies I decided to pull along instead of rebasing or
resolving conflicts.

Ganesh, it would be nice if you could review these patches with priority. As
I wrote in the changelog, issue2674 is a pretty serious bug that could lead
to repo corruption, which is why I want to release 2.16.4 ASAP.

21 patches for repository http://darcs.net/releases/branch-2.16:

patch 1295fec64bd3d19978bc7be36ed664606c61d3f8
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 09:45:58 CET 2021
  * add changelog for 2.16.4

patch 24f5930d6c2958a01462ecbda10bbdadf0e7c90c
Author: Gian Piero Carrubba <gpiero@rm-rf.it>
Date:   Tue Dec 22 12:45:05 CET 2020
  * bash_completion: use '--list-options' before any other option
  
  This is so to avoid that, e.g.:
  
  $ darcs record -m <Tab><Tab>
  
  results in a patch named '--list-options' being recorded.

patch e71832422d19674725e1034a29eca4c8fbc644b1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec 18 10:03:31 CET 2020
  * resolve issue2670: convert "." to absolute path when creating a repo
  
  Note that this is what we also do in Darcs.Repository.Identify.

patch c36d5a2bdf3aa4cca96f5d778252ca50c87e4868
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Dec 23 17:15:22 CET 2020
  * zsh completion: use '--list-options' before any other option
  
  See the corresponding change in the bash completion for details.

patch 7048704e6f8772f7e021bd876ed35baa6ef04de0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Dec 23 17:23:59 CET 2020
  * zsh completion: improve the get/clone case
  
  Moving the special case for get/clone down into the catch-all case for the
  current word allows it to complete options and local paths.

patch 43c823f6c858101ffbb237f44f3a3ad92ad79349
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec 25 11:07:36 CET 2020
  * fix errors in zsh completions, add comments
  
  This fixes a stupid cut-and-paste error where I used x instead of words.
  Also, replacing the first option arg works only if the is an option arg in
  the first place, we need to properly insert --list-options.

patch 954ba7d6aa1937d26ce534a83fd282d33e521461
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Nov  5 13:50:44 CET 2020
  * bugfix: --leave-test-dir should be off by default

patch 3ae83321a2b5fcf0c08cdcf6f1ac1cf19266e127
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct 28 00:20:18 CET 2020
  * avoid useless CPP in D.U.Index and D.R.State
  
  We can use the same action (renameFile instead of removeFile) for both
  Windows and Posix. The point here is that the index may still be open via an
  mmapped ForeignPtr, so removing it is not portable, but renaming it should
  work on all systems.

patch 697902978ac4e171aad080a1baa57e34f3531bbf
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Oct 26 18:33:10 CET 2020
  * Darcs.Util.Index: rename updateIndex to treeFromIndex
  
  This function does not update the index, it merely creates a Tree out of an
  Index. This also avoids the name collision with the function from
  Darcs.Repository.State which does update the index. Also add haddocks and
  rename a local variable that denotes a tree, not an index.

patch e51d37deed0bcf9e9d7216225b425118591b1eb5
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct 28 00:35:36 CET 2020
  * rename D.Util.Index.readIndex to openIndex
  
  This is a more fitting name since this function merely creates a cursor for
  the index without actually reading anything interesting (besides the magic
  word). It also resolves the last name conflict in D.R.State which means we
  can now import D.Util.Index unqualified.

patch 0c003b272def1c5c65cdc6827905acc2c84d5429
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct 29 15:01:41 CET 2020
  * simplify the logic that handles existence and validity of the index

patch df9b1e6a2384680dda7d6e67ba32241e5bc0c7f1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Oct 30 09:01:02 CET 2020
  * add a few debug messages to D.R.State

patch 23bcf38240654ed5bda0f984950c8c490620bf52
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 20:05:02 CET 2021
  * bugfix in readPendingAndMovesAndUnrecorded
  
  This bug was revealed by patch f28ec42284caa0477537bb5741762abf0ab31b02
  "fail in Darcs.Util.Tree.Monad.rename if source does not exist". We must not
  apply the detected moves to the working tree, since detecting these moves
  means that the working tree already has those moves "applied". Also, in case
  we don't use the index, we want to restrict the plain working tree with the
  modified pending tree (i.e. with the detected moves applied), not the
  unmodified one.

patch 460204b44fc8ff465276a719c1ec81630cff8c5b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec  4 07:47:51 CET 2020
  * resolve issue2668: part2
  
  We have to catch IO errors when calling createOrUpdatePatchIndexDisk as this
  is not an essential failure and we are already past finalizing any other
  changes we made.

patch 3ff28f48ddbc202889e47bc0111a9c27984597f0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 08:22:58 CET 2021
  * bump version to 2.16.4

patch 7ffb158bdd5282b0552f1c4bcd15a6a3f440cbb1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec  4 07:12:40 CET 2020
  * resolve issue2668/part1
  
  This fixes the problem that causes storing the patch-index to fail if the
  parent of the repodir is read-only.

patch 9e066dc3b9110a570bbf4d5b4ad137d1f7a9cab1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Nov 20 17:46:10 CET 2020
  * resolve issue2667: catch IO errors in seekRepo
  
  When we (recursively) cd ".." to determine if we are in a darcs repo, we may
  well hit an IO error, such as permission denied. We now catch such errors,
  emit a warning, and return Nothing (not in a repo).

patch 733e1eb0c2cc1080f059d0ea2ee3eac9095bbe42
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Jul 17 19:37:33 CEST 2020
  * cleanup D.U.Tree.Monad: remove classes TreeRO and TreeRW
  
  This merely turns the former methods into plain overloaded functions.

patch f28ec42284caa0477537bb5741762abf0ab31b02
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 17:40:02 CET 2021
  * fail in Darcs.Util.Tree.Monad.rename if source does not exist

patch 46bb7acd45b236920abf807efeef7544de76d7d0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 17:39:18 CET 2021
  * resolve issue2674: moving unadded files

patch a214ce5bc100c074dd04afcd8cc736aaa4051a86
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 13:06:33 CET 2021
  tagged 2.16.4
Attachments
msg22774 (view) Author: bfrk Date: 2021-05-12.12:32:48
Here is an updated bundle that includes all of patch2161 and a suitably
updated and re-worded CHANGELOG.

39 patches for repository http://darcs.net/releases/branch-2.16:

patch 96537ad0338fa352f27e008e2c6c2f2484ed882c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Mar 14 15:06:22 CET 2021
  * test that we cannot record patches that depend on broken moves

patch 733e1eb0c2cc1080f059d0ea2ee3eac9095bbe42
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Jul 17 19:37:33 CEST 2020
  * cleanup D.U.Tree.Monad: remove classes TreeRO and TreeRW
  
  This merely turns the former methods into plain overloaded functions.

patch 46bb7acd45b236920abf807efeef7544de76d7d0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 17:39:18 CET 2021
  * resolve issue2674: moving unadded files

patch f28ec42284caa0477537bb5741762abf0ab31b02
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 17:40:02 CET 2021
  * fail in Darcs.Util.Tree.Monad.rename if source does not exist

patch 9e066dc3b9110a570bbf4d5b4ad137d1f7a9cab1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Nov 20 17:46:10 CET 2020
  * resolve issue2667: catch IO errors in seekRepo
  
  When we (recursively) cd ".." to determine if we are in a darcs repo, we may
  well hit an IO error, such as permission denied. We now catch such errors,
  emit a warning, and return Nothing (not in a repo).

patch 7ffb158bdd5282b0552f1c4bcd15a6a3f440cbb1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec  4 07:12:40 CET 2020
  * resolve issue2668/part1
  
  This fixes the problem that causes storing the patch-index to fail if the
  parent of the repodir is read-only.

patch 460204b44fc8ff465276a719c1ec81630cff8c5b
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec  4 07:47:51 CET 2020
  * resolve issue2668: part2
  
  We have to catch IO errors when calling createOrUpdatePatchIndexDisk as this
  is not an essential failure and we are already past finalizing any other
  changes we made.

patch 697902978ac4e171aad080a1baa57e34f3531bbf
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Oct 26 18:33:10 CET 2020
  * Darcs.Util.Index: rename updateIndex to treeFromIndex
  
  This function does not update the index, it merely creates a Tree out of an
  Index. This also avoids the name collision with the function from
  Darcs.Repository.State which does update the index. Also add haddocks and
  rename a local variable that denotes a tree, not an index.

patch e51d37deed0bcf9e9d7216225b425118591b1eb5
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct 28 00:35:36 CET 2020
  * rename D.Util.Index.readIndex to openIndex
  
  This is a more fitting name since this function merely creates a cursor for
  the index without actually reading anything interesting (besides the magic
  word). It also resolves the last name conflict in D.R.State which means we
  can now import D.Util.Index unqualified.

patch 3ae83321a2b5fcf0c08cdcf6f1ac1cf19266e127
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Oct 28 00:20:18 CET 2020
  * avoid useless CPP in D.U.Index and D.R.State
  
  We can use the same action (renameFile instead of removeFile) for both
  Windows and Posix. The point here is that the index may still be open via an
  mmapped ForeignPtr, so removing it is not portable, but renaming it should
  work on all systems.

patch 0c003b272def1c5c65cdc6827905acc2c84d5429
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Oct 29 15:01:41 CET 2020
  * simplify the logic that handles existence and validity of the index

patch df9b1e6a2384680dda7d6e67ba32241e5bc0c7f1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Oct 30 09:01:02 CET 2020
  * add a few debug messages to D.R.State

patch 23bcf38240654ed5bda0f984950c8c490620bf52
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 20:05:02 CET 2021
  * bugfix in readPendingAndMovesAndUnrecorded
  
  This bug was revealed by patch f28ec42284caa0477537bb5741762abf0ab31b02
  "fail in Darcs.Util.Tree.Monad.rename if source does not exist". We must not
  apply the detected moves to the working tree, since detecting these moves
  means that the working tree already has those moves "applied". Also, in case
  we don't use the index, we want to restrict the plain working tree with the
  modified pending tree (i.e. with the detected moves applied), not the
  unmodified one.

patch 954ba7d6aa1937d26ce534a83fd282d33e521461
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu Nov  5 13:50:44 CET 2020
  * bugfix: --leave-test-dir should be off by default

patch c36d5a2bdf3aa4cca96f5d778252ca50c87e4868
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Dec 23 17:15:22 CET 2020
  * zsh completion: use '--list-options' before any other option
  
  See the corresponding change in the bash completion for details.

patch 7048704e6f8772f7e021bd876ed35baa6ef04de0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Dec 23 17:23:59 CET 2020
  * zsh completion: improve the get/clone case
  
  Moving the special case for get/clone down into the catch-all case for the
  current word allows it to complete options and local paths.

patch 43c823f6c858101ffbb237f44f3a3ad92ad79349
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec 25 11:07:36 CET 2020
  * fix errors in zsh completions, add comments
  
  This fixes a stupid cut-and-paste error where I used x instead of words.
  Also, replacing the first option arg works only if the is an option arg in
  the first place, we need to properly insert --list-options.

patch e71832422d19674725e1034a29eca4c8fbc644b1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Dec 18 10:03:31 CET 2020
  * resolve issue2670: convert "." to absolute path when creating a repo
  
  Note that this is what we also do in Darcs.Repository.Identify.

patch 24f5930d6c2958a01462ecbda10bbdadf0e7c90c
Author: Gian Piero Carrubba <gpiero@rm-rf.it>
Date:   Tue Dec 22 12:45:05 CET 2020
  * bash_completion: use '--list-options' before any other option
  
  This is so to avoid that, e.g.:
  
  $ darcs record -m <Tab><Tab>
  
  results in a patch named '--list-options' being recorded.

patch ef6ebddbfa74f22df12bfa5109cd5401f3868276
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Mar 14 10:54:26 CET 2021
  * add a check/repair rule for bad move patches
  
  This drops a move patch with either non-existing source or existing target.

patch 36d18cea5159459c77d7e10081cb05f8bca0f5d7
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 17 08:45:45 CET 2021
  * tests/broken_move.sh: if we fail to apply, darcs check should see the bad move

patch cd867c052cde7d227bbc70e0300e12e46424f2ac
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sat Dec 19 09:26:46 CET 2020
  * adapt regex to ignore build directory in our boringfile

patch 9df4a2c6e688ab1b551e4488795d3fba8c9c7da3
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Apr 25 10:21:52 CEST 2021
  * remove catching of exceptions for bad moves in DefaultIO
  
  Note that DefaultIO is used only in two places: in the 'darcs test' command
  and to unapply patches when 'darcs clone' is called with a matching option.

patch a8c86b40478039ad18ede34306612c67ad3ce5d1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Apr 25 12:09:21 CEST 2021
  * add another check to tests/broken_move.sh
  
  This tests that when we unapply a bad move during a clone --to-patch, the
  command either fails with an appropriate error message or else we can 'darcs
  repair' the repo.

patch a866cb186c403748ef4d223ff60db26536f4e579
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Apr 25 12:25:55 CEST 2021
  * tests/broken_move.sh: actually test that repair works, not only check

patch 5e642a9553bd07eb22172bd884ce4c592d95cd96
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Mar 14 11:46:12 CET 2021
  * remove PInvalid constructor from data PatchMod

patch 963127e19ba988d962ca560b86f808f00bcb22f5
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Apr 19 22:01:01 CEST 2021
  * tests/broken_move.sh: add a hack to avoid test failure on Windows

patch 68031f4cf0989a48960a9c9fcb37d8ba45a71a15
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun Oct 25 07:32:11 CET 2020
  * D.R.ApplyPatches: print warnings to stderr

patch a80ed9a6f564c45183c0c407f04de01d45e742e7
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Nov 24 09:20:29 CET 2020
  * remove Darcs.Patch.ApplyPatches

patch e9447ae22c0c8ac14886c1cdc46173508db88f8d
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Nov 24 09:26:21 CET 2020
  * cleanup import lists in Darcs.Repository.ApplyPatches

patch b1f8e3d15719cc4c982eceb69fb08e0484ae13dd
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue May  4 22:02:25 CEST 2021
  * use renamePath instead of renameDirectory `mplus` renameFile

patch bb307ae44bb929f9f90eb3808a8b9445fa914b54
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue May  4 22:03:43 CEST 2021
  * improve error message when runDefault fails due to an IO error

patch c511efd78e6b46e3249736443a669df4e9f11514
Author: Ben Franksen <ben.franksen@online.de>
Date:   Fri Jul 17 19:48:40 CEST 2020
  * general cleanup of D.U.Tree.Monad
  
  This makes a small API change: initialState is no longer exported, instead
  runTreeMonad gets passed the ingredients directly. The main internal change
  is that the updateHash and update procedures have been moved from the
  TreeState to the reader part of the monad, for which there is now a new data
  type TreeEnv. Otherwise this cleans up and documents the export list and
  many of the haddocks, and moves things around a bit.

patch 2b28f5712d5e0bc3c4a5b6a6f85e2c471e8bae15
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Dec 21 13:49:19 CET 2020
  * simplify TreeMonad by removing its "current working directory" emulation
  
  Darcs suffers enough from cwd issues in the IO monad. Adding to that by
  emulating a "current working directory" as ambient state in the TreeMonad
  was a bad idea from the start. Fortunately the only place where this
  misfeature was used is in the implementation of treeHasAnycase. The new
  implementation of that procedure is both safer and easier to understand.

patch 7668ca9348d86ef0c7e5772fbc5c91116bffadbf
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 18:29:10 CET 2021
  * TreeMonad: improve display of paths in error messages

patch 5a9ad2a061d26df2db8541590ea4257677a4d1d8
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Mar  9 19:54:37 CET 2021
  * clean up comments and variable names in readPendingAndMovesAndUnrecorded

patch 47874a8179ea3abadb1383faf5adf3dfd15c2720
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed May 12 11:48:46 CEST 2021
  * tests/broken_move.sh: explain remaining purpose of test repo creation script

patch 3ff28f48ddbc202889e47bc0111a9c27984597f0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 08:22:58 CET 2021
  * bump version to 2.16.4

patch d76e3201f4406be0c333ea7117735a2823514e74
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 09:45:58 CET 2021
  * add changelog for 2.16.4
Attachments
msg22780 (view) Author: ganesh Date: 2021-05-15.17:19:35
The substantive patches have all been reviewed elsewhere.

The version bump and changelog also look fine, except that the changelog
is still dated from March.
msg22796 (view) Author: bfrk Date: 2021-05-20.18:49:05
Update bundle. I fixed the date in the change log and added a few more minor
patches. Will release today, then pull the patches into screened that aren't
already in there (release notes, version bump, tag).

5 patches for repository http://darcs.net/releases/branch-2.16:

patch 872a8c26404e56b0a31944c340e8c6a0254bd66a
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun May 16 14:19:52 CEST 2021
  * Cabal-Version: 2.2 -> 2.4
  
  This removes `cabal check` warnings caused by extra-source-files wildcards.

patch dd7682b96d9e8d99c670908051c611f5eab09658
Author: Ben Franksen <ben.franksen@online.de>
Date:   Sun May 16 15:56:33 CEST 2021
  * tests/trackdown-bisect.sh: fix occasional failures when building the helper

patch c68fd50aef46b32132a0f610ebb966e42c852ad6
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed May 19 15:00:55 CEST 2021
  * add description to the rts flag

patch 09b1ee09473b581241eb9d49d4393b43d9ab994c
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Mar 10 09:45:58 CET 2021
  * add changelog for 2.16.4

patch 30be5115e37627fdebc4c146134e348ce9c4ec8e
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu May 20 14:01:06 CEST 2021
  tagged 2.16.4
Attachments
msg22836 (view) Author: bfrk Date: 2021-06-03.14:18:27
Accepted into branch-2.16, 2.16.4 was released a while ago.
History
Date User Action Args
2021-03-10 14:48:47bfrkcreate
2021-05-12 12:32:53bfrksetfiles: + patch-preview.txt, test-that-we-cannot-record-patches-that-depend-on-broken-moves.dpatch, unnamed
messages: + msg22774
2021-05-12 12:46:06bfrksetfiles: - add-changelog-for-2_16_4.dpatch
2021-05-12 12:46:13bfrksetfiles: - patch-preview.txt
2021-05-12 12:46:20bfrksetfiles: - unnamed
2021-05-15 17:19:37ganeshsetmessages: + msg22780
2021-05-20 18:49:06bfrksetfiles: + patch-preview.txt, cabal_version_-2_2-__-2_4.dpatch, unnamed
messages: + msg22796
2021-06-03 14:18:27bfrksetstatus: needs-screening -> accepted
messages: + msg22836