[darcs-users] darcs patch: Use index-based diffing in Record. (and 74 more)

Petr Rockai me at mornfall.net
Tue Oct 6 21:08:07 UTC 2009


Hi,

this is a bundle of darcs-hs versus current darcs.net mainline (modulo the
cabal rename patch). I have just uploaded hashed-storage 0.4 to hackage, so I
think the light is green -- fire at will. (Don't forget to go through the
conflict resolutions before pushing though. Also, sanity checking the whole
bundle is recommended.)

Yours,
   Petr.

Fri Jun 12 00:36:12 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use index-based diffing in Record.

Sat Jun 20 22:19:22 CEST 2009  Petr Rockai <me at mornfall.net>
  * Flip "darcs changes" to index-based diffing.

Sun Jun 21 15:37:30 CEST 2009  Petr Rockai <me at mornfall.net>
  * Flip "darcs mark-conflicts" over to index-based diffing.

Sun Jun 21 15:37:55 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use index-based diffing in Remove.

Sun Jun 21 15:38:32 CEST 2009  Petr Rockai <me at mornfall.net>
  * Flip AmendRecord to index-based diffing, too.

Sun Jun 21 15:39:00 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use index-based diffing in unrevert.

Sun Jun 21 15:39:23 CEST 2009  Petr Rockai <me at mornfall.net>
  * Make revert use index-based diffing.

Sun Jun 21 15:39:56 CEST 2009  Petr Rockai <me at mornfall.net>
  * Also use index-based diffing in unrecord/obliterate.

Sun Jun 21 15:41:41 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use index-based diffing in "darcs wh -l".

Sun Jun 21 15:42:30 CEST 2009  Petr Rockai <me at mornfall.net>
  * Unexport get_unrecorded* from Repository, remove unused functions from Internal.

Sun Jun 21 16:19:23 CEST 2009  Petr Rockai <me at mornfall.net>
  * Move tentativelyMergePatches and friends to a new module, Repository.Merge.
  
  This allows tentativelyMergePatches to use unrecordedChanges from Gorsvet
  without forming import cycles.

Sun Jun 21 16:25:31 CEST 2009  Petr Rockai <me at mornfall.net>
  * Move add_to_pending to Repository, use unrecordedChanges.

Sun Jun 21 16:30:25 CEST 2009  Petr Rockai <me at mornfall.net>
  * Clean up unused bits from Repository.Internal.

Mon Jun 22 13:32:39 CEST 2009  Petr Rockai <me at mornfall.net>
  * Invalidate the index in add_to_pending, as it was getting rebuilt too soon.

Mon Jun 22 13:34:32 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove unused import from Gorsvet.

Sun Jun 28 22:32:01 CEST 2009  Petr Rockai <me at mornfall.net>
  * Clean up unused imports in WhatsNew.

Fri Jul 10 16:12:53 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict.

Thu Jul 16 10:23:47 CEST 2009  Petr Rockai <me at mornfall.net>
  * Provide readPending that also provides the "pending conflicts" check natively.

Thu Jul 16 10:25:25 CEST 2009  Petr Rockai <me at mornfall.net>
  * Proper implementation for mDoesFileExist/mDoesDirectoryExist in Gorsvet.

Thu Jul 16 10:32:18 CEST 2009  Petr Rockai <me at mornfall.net>
  * Optimize darcs show contents --match (avoid slurping pristine).

Mon Jul 20 09:20:18 CEST 2009  Petr Rockai <me at mornfall.net>
  * Port the replay (check/repair) functionality to hashed-storage.
  
  This removes a few unsafeDiff users. It also simplifies the replay code by not
  threading the Slurpy all over the place (instead placing applyAndFix in the
  TreeIO monad). There is a slight risk of regressions (and a moderate risk of
  space leaks).

Mon Jul 20 11:38:43 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove now-unused checkPristineAgainstSlurpy.

Mon Jul 20 12:56:54 CEST 2009  Petr Rockai <me at mornfall.net>
  * Avoid removing in-use files on win32.

Mon Jul 20 18:47:17 CEST 2009  Petr Rockai <me at mornfall.net>
  * Re-implement make_remove_patch in remove command, replacing Slurps with Trees.

Mon Jul 20 18:57:00 CEST 2009  Petr Rockai <me at mornfall.net>
  * Obliterate all instances of sync_repo and friends, since they are useless now.

Mon Jul 20 18:58:36 CEST 2009  Petr Rockai <me at mornfall.net>
  * Obliterate timestamp manipulation in HashedIO.

Mon Jul 27 12:54:35 CEST 2009  Petr Rockai <me at mornfall.net>
  * Port to hashed-storage 0.4 Hash changes.

Sun Aug  2 14:28:12 CEST 2009  Petr Rockai <me at mornfall.net>
  * Get rid of wait_a_moment, since we do not use pristine timestamps anymore.

Mon Aug  3 10:46:56 CEST 2009  Petr Rockai <me at mornfall.net>
  * Port to generalised Tree types (mostly just signature wibbling).

Wed Aug  5 20:35:12 CEST 2009  Petr Rockai <me at mornfall.net>
  * Haddock invalidateIndex.

Wed Aug  5 20:35:26 CEST 2009  Petr Rockai <me at mornfall.net>
  * Port to new readIndex interface in hashed-storage 0.4.

Wed Aug  5 21:45:44 CEST 2009  Petr Rockai <me at mornfall.net>
  * Preliminary version of the replace command with s/unsafeDiff/treeDiff/.

Thu Aug  6 08:46:27 CEST 2009  Petr Rockai <me at mornfall.net>
  * Take a Tree instead of Slurpy in external_resolution.

Thu Aug  6 08:51:39 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove unused syncPristine from Repository.Pristine.

Thu Aug  6 08:52:09 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use treeDiff in external_merge instead of unsafeDiff.

Thu Aug  6 08:52:16 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove now-unused Darcs.Diff module.

Thu Aug  6 08:59:04 CEST 2009  Petr Rockai <me at mornfall.net>
  * Clean up unused bits and imports in Repository.Checkpoint.

Thu Aug  6 16:13:08 CEST 2009  Petr Rockai <me at mornfall.net>
  * Add a testcase of diffing various trailing/missing newline combinations.

Fri Aug  7 12:18:40 CEST 2009  Petr Rockai <me at mornfall.net>
  * Adapt to the new safety-improved readIndex API.

Fri Aug  7 17:30:17 CEST 2009  Petr Rockai <me at mornfall.net>
  * Implement index checking functionality in darcs check.

Fri Aug  7 20:55:27 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use withDirectory to implement mInCurrentDirectory.

Sat Aug  8 22:53:46 CEST 2009  Petr Rockai <me at mornfall.net>
  * Fix compilation after minor hashed-storage API rename.

Tue Aug 11 00:06:00 CEST 2009  Petr Rockai <me at mornfall.net>
  * Make darcs optimize rearrange pristine.hashed when needed.
  
  This is triggered when the pristine.hashed format uses the size-prefixed hash
  format -- like 0000000064-<hash>. The optimize writes out a size-less pristine
  tree that moreover uses stable (sorted by name) directory listing format, and
  therefore stable directory hashes. This layout gives optimal performance with
  HSI4-format index.

Tue Aug 11 12:51:19 CEST 2009  Petr Rockai <me at mornfall.net>
  * Add a --pristine option to optimize.

Tue Aug 11 15:56:55 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove extraneous invalidateIndex from revert.

Sun Aug 30 12:21:36 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict with Eric's cleanup.

Sun Aug 30 12:27:36 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict (duplicate, even) with Trent.

Mon Sep  7 20:01:44 CEST 2009  Petr Rockai <me at mornfall.net>
  * Fix up for hashed-storage API shuffling.

Mon Sep  7 20:02:09 CEST 2009  Petr Rockai <me at mornfall.net>
  * Drop unused import.

Sat Sep 12 12:16:30 CEST 2009  Petr Rockai <me at mornfall.net>
  * Detect and fix bad index in darcs repair.

Sat Sep 12 16:14:42 CEST 2009  Petr Rockai <me at mornfall.net>
  * We no longer use pristine timestamps in any way.

Sat Sep 12 16:59:00 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict with haskell_policy -> hlint.

Sat Sep 12 16:59:34 CEST 2009  Petr Rockai <me at mornfall.net>
  * Update to latest hashed-storage API: updateIndex is global now.

Sat Sep 12 17:01:47 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove code for repair-from-checkpoint.

Sat Sep 12 17:18:16 CEST 2009  Petr Rockai <me at mornfall.net>
  * Unreadable pristine ought not be fatal for repair.

Sat Sep 12 17:22:15 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve issue1488: darcs-hs does not suffer from this.

Sat Sep 12 19:29:09 CEST 2009  Petr Rockai <me at mornfall.net>
  * Reformat the export list of Darcs.Repository.

Sat Sep 12 19:42:04 CEST 2009  Petr Rockai <me at mornfall.net>
  * Move the FooDirectory instances from Gorsvet to Darcs.IO.

Sat Sep 12 21:31:30 CEST 2009  Petr Rockai <me at mornfall.net>
  * Explode Gorsvet into a number of more appropriate places.

Sat Sep 12 22:13:33 CEST 2009  Petr Rockai <me at mornfall.net>
  * Remove the remnants of Gorsvet.

Sun Sep 13 20:04:05 CEST 2009  Petr Rockai <me at mornfall.net>
  * Add Darcs.Diff and Darcs.Repository.State created in the Gorsvet refactor.

Wed Sep 23 18:53:58 CEST 2009  Petr Rockai <me at mornfall.net>
  * Don't forget to limit pending to relevant paths, in unrecordedChanges.

Wed Sep 23 18:55:32 CEST 2009  Petr Rockai <me at mornfall.net>
  * Clarify that empty path list means everything, restrictSubpaths.

Fri Sep 25 11:40:29 CEST 2009  Jason Dagit <dagit at codersbase.com>
  * allow State.hs to compile with type witnesses

Sun Sep 27 17:47:27 CEST 2009  Petr Rockai <me at mornfall.net>
  * Add a missing copyright notice to Darcs.Diff.

Thu Oct  1 10:59:31 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict in darcs.cabal (hashed-storage dependency).

Thu Oct  1 10:59:46 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflict between optimize --upgrade and optimize --pristine.

Thu Oct  1 15:46:22 CEST 2009  Petr Rockai <me at mornfall.net>
  * Add a bunch of haddocks to Repository.State.

Sun Oct  4 19:15:14 CEST 2009  Petr Rockai <me at mornfall.net>
  * Make readRecorded independent of hashed-storage's readDarcsPristine.

Sun Oct  4 19:16:27 CEST 2009  Petr Rockai <me at mornfall.net>
  * Use --ignore-times with check to skip index check.

Sun Oct  4 19:49:13 CEST 2009  Petr Rockai <me at mornfall.net>
  * Replace uses of readDarcsPristine with readRecorded.

Mon Oct  5 13:23:58 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflicts in darcs.cabal.

Mon Oct  5 13:24:10 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflicts in Commands.AmendRecord.

Mon Oct  5 13:24:43 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflicts in Commands.Apply.

Mon Oct  5 13:24:59 CEST 2009  Petr Rockai <me at mornfall.net>
  * Resolve conflicts in Commands.Remove.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 321382 bytes
Desc: A darcs patch for your repository!
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20091006/2fb47f5a/attachment-0001.bin>


More information about the darcs-users mailing list