Hi David,
These are two patches out of a recent bundle from Petr RoÄkai for fixing
issue971. I think they may have gotten lost in the confusion.
I'm not including the actual fix because there are conflicts with more recent
work. I think it would be great if Petr would resubmit the remaining 4 patches
* without the conflicts
* consolidating his two Darcs.Command.Repair patches
thereby making your job easier ;-)
Thanks!
P.S. to apply Petr's patches to my repository, I had to unpull your
scan bundle patch; will need to file a bug report later.
Tue Aug 12 01:38:10 BST 2008 [EMAIL PROTECTED]
* Add forceHashSlurped that hashes the slurpy even if it already contains
hashes.
Tue Aug 12 02:25:24 BST 2008 [EMAIL PROTECTED]
* Add Repository.replacePristineFromSlurpy.
New patches:
[Add forceHashSlurped that hashes the slurpy even if it already contains hashes.
[EMAIL PROTECTED] hunk ./src/Darcs/Repository/HashedIO.lhs 22
#include "gadts.h"
module Darcs.Repository.HashedIO ( HashedIO, applyHashed,
copyHashed, syncHashed, copyPartialsHashed, listHashedContents,
- slurpHashed, hashSlurped,
+ slurpHashed, hashSlurped, forceHashSlurped,
clean_hashdir ) where
import Darcs.Global ( darcsdir )
hunk ./src/Darcs/Repository/HashedIO.lhs 293
rootdir :: FileName
rootdir = fp2fn "."
-hashSlurped :: Cache -> [DarcsFlag] -> Slurpy -> String -> IO String
-hashSlurped c opts sl dir_ =
+hashSlurped' :: Bool -> Cache -> [DarcsFlag] -> Slurpy -> String -> IO String
+hashSlurped' force c opts sl dir_ =
do beginTedious k
hunk ./src/Darcs/Repository/HashedIO.lhs 296
- h <- fst `fmap` runStateT (hsl sl)
+ h <- fst `fmap` runStateT (hsl . scrub $ sl)
(HashDir { permissions = RW, cache = c,
hashDir = dir_,
options = opts, rootHash = sha1PS nilPS })
hunk ./src/Darcs/Repository/HashedIO.lhs 304
return h
where hsl (SlurpDir _ (Just h) _) = return h
hsl (SlurpDir _ Nothing ss) = do lift $ tediousSize k (length ss)
- mapM hs ss >>= writedir
+ mapM (hs . scrub) ss >>= writedir
hsl (SlurpFile _ (Just h,_,_) _) = return h
hsl (SlurpFile _ _ x) = writeHashFile x
hs (SlurpDir d (Just h) _) = progress k $ return (D, d, h)
hunk ./src/Darcs/Repository/HashedIO.lhs 308
- hs s@(SlurpDir d Nothing _) = do h <- hsl s
+ hs s@(SlurpDir d Nothing _) = do h <- (hsl . scrub) s
lift $ finishedOneIO k h
return (D, d, h)
hs (SlurpFile f (Just h,_,_) _) = progress k $ return (F, f, h)
hunk ./src/Darcs/Repository/HashedIO.lhs 312
- hs s@(SlurpFile f _ _) = do h <- hsl s
+ hs s@(SlurpFile f _ _) = do h <- (hsl . scrub) s
lift $ finishedOneIO k h
return (F, f, h)
hunk ./src/Darcs/Repository/HashedIO.lhs 315
+ scrub (SlurpDir n h s) = SlurpDir n (if force then Nothing else h) s
+ scrub (SlurpFile n (h,m,l) content) =
+ SlurpFile n ((if force then Nothing else h),m,l) content
k = "Writing pristine"
hunk ./src/Darcs/Repository/HashedIO.lhs 320
+hashSlurped :: Cache -> [DarcsFlag] -> Slurpy -> String -> IO String
+hashSlurped = hashSlurped' False
+forceHashSlurped :: Cache -> [DarcsFlag] -> Slurpy -> String -> IO String
+forceHashSlurped = hashSlurped' True
+
grab :: FileName -> Slurpy -> Maybe Slurpy
grab _ (SlurpFile _ _ _) = Nothing
grab fn (SlurpDir _ _ ss) = g ss where g [] = Nothing
[Add Repository.replacePristineFromSlurpy.
[EMAIL PROTECTED] hunk ./src/Darcs/Repository.lhs 28
withRepository, withRepositoryDirectory, withGutsOf,
makePatchLazy, writePatchSet,
findRepository, amInRepository, amNotInRepository,
- slurp_pending, replacePristine,
+ slurp_pending, replacePristine, replacePristineFromSlurpy,
slurp_recorded, slurp_recorded_and_unrecorded,
withRecorded,
get_unrecorded, get_unrecorded_unsorted, get_unrecorded_no_look_for_adds,
hunk ./src/Darcs/Repository.lhs 55
maybeIdentifyRepository, identifyRepositoryFor,
findRepository, amInRepository, amNotInRepository,
makePatchLazy,
- slurp_pending, replacePristine,
+ slurp_pending, replacePristine, replacePristineFromSlurpy,
slurp_recorded, slurp_recorded_and_unrecorded,
withRecorded,
get_unrecorded, get_unrecorded_unsorted, get_unrecorded_no_look_for_adds,
hunk ./src/Darcs/Repository/HashedRepo.lhs 30
slurp_pristine, sync_repo, clean_pristine,
copy_pristine, copy_partials_pristine, pristine_from_working,
apply_to_tentative_pristine, replacePristine,
+ replacePristineFromSlurpy,
add_to_tentative_inventory, remove_from_tentative_inventory,
read_repo, read_tentative_repo, write_and_read_patch,
write_tentative_inventory, copy_repo, slurp_all_but_darcs
hunk ./src/Darcs/Repository/HashedRepo.lhs 49
import Darcs.Repository.Cache ( Cache, fetchFileUsingCache, speculateFileUsingCache,
writeFileUsingCache,
unionCaches, repo2cache, okayHash, takeHash )
-import Darcs.Repository.HashedIO ( applyHashed, slurpHashed, hashSlurped,
+import Darcs.Repository.HashedIO ( applyHashed, slurpHashed, forceHashSlurped,
copyHashed, syncHashed, copyPartialsHashed,
clean_hashdir )
import Darcs.Repository.InternalTypes ( Repository(..), extractCache )
hunk ./src/Darcs/Repository/HashedRepo.lhs 337
replacePristine :: Cache -> [DarcsFlag] -> FilePath -> IO ()
replacePristine c opts d = do s <- slurp_all_but_darcs d
- h <- hashSlurped c opts s "pristine.hashed"
- let t = darcsdir++"/hashed_inventory"
- i <- gzReadFilePS t
- writeDocBinFile t $ pris2inv h i
+ replacePristineFromSlurpy c opts s
+
+replacePristineFromSlurpy :: Cache -> [DarcsFlag] -> Slurpy -> IO ()
+replacePristineFromSlurpy c opts s = do
+ h <- forceHashSlurped c opts s "pristine.hashed"
+ let t = darcsdir++"/hashed_inventory"
+ i <- gzReadFilePS t
+ writeDocBinFile t $ pris2inv h i
copy_pristine :: Cache -> [DarcsFlag] -> String -> String -> IO ()
copy_pristine c opts d iname = do
hunk ./src/Darcs/Repository/Internal.lhs 41
unrevertUrl,
applyToWorking, patchSetToPatches,
createPristineDirectoryTree, createPartialsPristineDirectoryTree,
- replacePristine,
+ replacePristine, replacePristineFromSlurpy,
optimizeInventory, cleanRepository,
getMarkedupFile,
PatchSet, SealedPatchSet,
hunk ./src/Darcs/Repository/Internal.lhs 61
easyCreatePristineDirectoryTree, slurpPristine, syncPristine,
easyCreatePartialsPristineDirectoryTree,
createPristineFromWorking )
-import qualified Darcs.Repository.Pristine as Pristine ( replacePristine )
+import qualified Darcs.Repository.Pristine as Pristine ( replacePristine,
+ replacePristineFromSlurpy )
import Data.List ( (\\) )
import Darcs.SignalHandler ( withSignalsBlocked )
import Darcs.Repository.Format ( RepoFormat, RepoProperty( Darcs2, HashedInventory ),
hunk ./src/Darcs/Repository/Internal.lhs 89
write_tentative_inventory, write_and_read_patch,
add_to_tentative_inventory,
read_repo, read_tentative_repo, clean_pristine,
- replacePristine, slurp_all_but_darcs )
+ replacePristine, replacePristineFromSlurpy,
+ slurp_all_but_darcs )
import qualified Darcs.Repository.DarcsRepo as DarcsRepo
import Darcs.Flags ( DarcsFlag(AnyOrder, Boring, LookForAdds, Verbose, Quiet,
MarkConflicts, AllowConflicts, NoUpdateWorking,
hunk ./src/Darcs/Repository/Internal.lhs 842
| format_has HashedInventory rf = withCurrentDirectory r $ HashedRepo.replacePristine c opts d
| otherwise = withCurrentDirectory r $ Pristine.replacePristine d pris
+replacePristineFromSlurpy :: Repository p -> Slurpy -> IO ()
+replacePristineFromSlurpy (Repo r opts rf (DarcsRepository pris c)) s
+ | format_has HashedInventory rf = withCurrentDirectory r $ HashedRepo.replacePristineFromSlurpy c opts s
+ | otherwise = withCurrentDirectory r $ Pristine.replacePristineFromSlurpy s pris
+
createPristineDirectoryTree :: RepoPatch p => Repository p C(r u t) -> FilePath -> IO ()
createPristineDirectoryTree repo@(Repo r opts rf (DarcsRepository pris c)) reldir
| format_has HashedInventory rf =
hunk ./src/Darcs/Repository/Pristine.lhs 27
createPristine, removePristine, identifyPristine,
checkPristine, slurpPristine,
applyPristine, createPristineFromWorking,
- syncPristine, replacePristine, getPristinePop,
+ syncPristine, replacePristine, replacePristineFromSlurpy,
+ getPristinePop,
pristineDirectory, pristineToFlagString,
easyCreatePristineDirectoryTree,
easyCreatePartialsPristineDirectoryTree
hunk ./src/Darcs/Repository/Pristine.lhs 41
import Darcs.Lock ( rm_recursive, writeBinFile )
import Darcs.Diff ( cmp, sync )
import Workaround ( getCurrentDirectory )
-import Darcs.SlurpDirectory ( Slurpy, mmap_slurp, co_slurp )
+import Darcs.SlurpDirectory ( Slurpy, mmap_slurp, co_slurp, writeSlurpy )
import Darcs.Utils ( catchall )
import Darcs.PopulationData ( Population, getPopFrom )
hunk ./src/Darcs/Repository/Pristine.lhs 171
replacePristine _ HashedPristine =
bug "HashedPristine is not implemented yet."
+replacePristineFromSlurpy :: Slurpy -> Pristine -> IO ()
+replacePristineFromSlurpy _ (NoPristine _) = return ()
+replacePristineFromSlurpy s (PlainPristine n) =
+ do rm_recursive nold
+ `catchall` return ()
+ writeSlurpy s ntmp
+ renameDirectory n nold
+ renameDirectory ntmp n
+ return ()
+ where nold = darcsdir ++ "/" ++ pristineName ++ "-old"
+ ntmp = darcsdir ++ "/" ++ pristineName ++ "-tmp"
+replacePristineFromSlurpy _ HashedPristine =
+ bug "HashedPristine is not implemented yet."
+
getPristinePop :: PatchInfo -> Pristine -> IO (Maybe Population)
getPristinePop pinfo (PlainPristine n) =
Just `liftM` getPopFrom n pinfo
Context:
[Add a link to a repository browser for darcs's code.
Eric Kow <[EMAIL PROTECTED]>**20080829144357]
[fix type of withRepository and friends.
David Roundy <[EMAIL PROTECTED]>**20080828181834]
[fix recent bug in --list-options.
David Roundy <[EMAIL PROTECTED]>**20080828162707]
[Check for package random on windows, used in Ssh module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080828091554]
[Debug messages in curl module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080827222845]
[Use InclusiveOrExclusive instead of Bool in apply_inv_to_matcher.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080827201820]
[add more modules to make witnesses.
David Roundy <[EMAIL PROTECTED]>**20080827201217]
[updates to Darcs.Patch.Unit for type witnesses
Jason Dagit <[EMAIL PROTECTED]>**20080827165445]
[Refactor get_matcher and apply_inv_to_matcher functions from Darcs.Match module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080827105843]
[Resolve issue966: fix apply_inv_to_matcher_inclusive.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080827091833]
[Simplify withCurrentDirectory.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080823004712]
[updates to Sealed.lhs to support type witness refactor in commands
Jason Dagit <[EMAIL PROTECTED]>**20080827165357]
[updates to Ordered.lhs to support type witness refactor in commands
Jason Dagit <[EMAIL PROTECTED]>**20080827165053]
[make Annotate.lhs compile with type witnesses
Jason Dagit <[EMAIL PROTECTED]>**20080827164003]
[fix type witnesses in Internal.
David Roundy <[EMAIL PROTECTED]>**20080827190200]
[updates to Repository.Internal to fix conflicts and support type witness refactor in commands
Jason Dagit <[EMAIL PROTECTED]>**20080827165327]
[fix error in Properties due to new commuteFL
Jason Dagit <[EMAIL PROTECTED]>**20080827044025]
[fix minor type witness compile error with new commuteFL
Jason Dagit <[EMAIL PROTECTED]>**20080827041344]
[fix conflicts with get_extra changes
Jason Dagit <[EMAIL PROTECTED]>**20080827041321]
[improve reporting for bug in get_extra
Jason Dagit <[EMAIL PROTECTED]>**20080825011810]
[Finish refactor of Unrevert as well as making it pass double-unrevert.sh
Jason Dagit <[EMAIL PROTECTED]>**20080825185907]
[add double-unrevert.sh test
Jason Dagit <[EMAIL PROTECTED]>**20080825183235]
[partial type witnesses in Unrevert
Jason Dagit <[EMAIL PROTECTED]>**20080813053837]
[More ChangeLog entries since 2.0.2
Eric Kow <[EMAIL PROTECTED]>**20080826082638]
[fix bug in defaultrepo.
David Roundy <[EMAIL PROTECTED]>**20080827152710]
[fix accidental reversal in tentativelyAddToPending
Jason Dagit <[EMAIL PROTECTED]>**20080826003605]
[minor refator to get_extra improve comments
Jason Dagit <[EMAIL PROTECTED]>**20080825170111]
[Same ChangeLog entries since 2.0.2
Eric Kow <[EMAIL PROTECTED]>**20080825164844]
[Some more globally ignored changes.
Eric Kow <[EMAIL PROTECTED]>**20080825164814]
[Simplify filepath handling, cutting lots of hardly-used code.
David Roundy <[EMAIL PROTECTED]>**20080824173919]
[don't bother computing path when checking prereqs (since we now can handle looking at beginning/ending working directories).
David Roundy <[EMAIL PROTECTED]>**20080823193448]
[resolve issue950: fix fix_filepath to work with --repodir (and add test demonstrating this).
David Roundy <[EMAIL PROTECTED]>**20080823185940]
[eliminate fix_flag.
David Roundy <[EMAIL PROTECTED]>**20080823180947]
[add new framework for ensuring that certain arguments are converted to absolute paths.
David Roundy <[EMAIL PROTECTED]>**20080823164410
Currently this is only used for --output, but there are a few other
commands we can fix. Ideally, we'll fix enough flags that fix_flag
will become identity, and can be removed.
]
[make Darcs.Lock functions accept FilePathLike arguments.
David Roundy <[EMAIL PROTECTED]>**20080823162940]
[refactor maybeMkSubPath very slightly.
David Roundy <[EMAIL PROTECTED]>**20080823143505]
[refactor repoPath very slightly.
David Roundy <[EMAIL PROTECTED]>**20080823143153]
[make makeAbsolute behavior match comment.
David Roundy <[EMAIL PROTECTED]>**20080823121149]
[Fix makeAbsolute to work with '../foo' paths.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080822184823
This fixes option arguments with '../', like 'darcs send -o ../foo.dpatch'.
Part of issue950.
]
[move withCurrentDirectory, withTempDir and withPermDir
David Roundy <[EMAIL PROTECTED]>**20080822155100
out of RepoPath. This is a pretty invasive change, part of a pathetic
attempt to allow AbsolutePath to permeate the code when we know that
paths are absolute. Eventually this will allow us to statically
ensure that paths *are* absolute. For now, it mostly just makes a few
things more ugly. Eventually we'd like to only use (for instance)
Darcs.RepoPath.getCurrentDirectory, which itself witnesses that the
resulting path must be absolute.
]
[rewrite mkAbsolutePath to be safe.
David Roundy <[EMAIL PROTECTED]>**20080822150037]
[Changelog (ignore 'Add a test entries')
Eric Kow <[EMAIL PROTECTED]>**20080822152614]
[resolve conflicts.
David Roundy <[EMAIL PROTECTED]>**20080822133823]
[Resolve issue936: fix type witnesses configure check.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819193228]
[Use forkIO in URL module as suggested by Simon Marlow.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819182648]
[Remove HTTP.copyUrl, integrate it to URL module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819170350]
[More URL module refactoring.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819145234]
[Canonize Nathaniel Filardo and Simon Marlow.
Eric Kow <[EMAIL PROTECTED]>**20080822021232]
[Add test case for issue966 (from Dan Pascu's bug report)
Eric Kow <[EMAIL PROTECTED]>**20080822020616]
[remove trailing whitespace.
David Roundy <[EMAIL PROTECTED]>**20080821224353]
[Documentation for match touch primitive.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080821193706]
[Resolve issue115: match patches touching given files.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080821183355]
[Remove unused FileSystem module.
Eric Kow <[EMAIL PROTECTED]>**20080822151214]
[fix type witnesses in with_selected_patch_from_repo.
David Roundy <[EMAIL PROTECTED]>**20080820130112]
[clean up bugs functions (eliminate darcsBug.h).
David Roundy <[EMAIL PROTECTED]>**20080820124425]
[Fix a bug with incorrectly specified with_selecte_patch_from_repository.
Jason Dagit <[EMAIL PROTECTED]>**20080819233348]
[Remove HTTP.exists, use Autoconf.have_HTTP instead.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819131617]
[fix improper use of bug in HTTP.
David Roundy <[EMAIL PROTECTED]>**20080819211201
In these cases failure is not a bug, it may just as well mean that the
user has typed in a bad URL.
]
[Do not import HTTP module in Darcs.Bug, use bug and debugFail for error reporting in HTTP module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080819124207]
[fix incompatibility with ghc 6.6.
David Roundy <[EMAIL PROTECTED]>**20080819161540]
[resolve conflicts with Darcs.Ordered change.
David Roundy <[EMAIL PROTECTED]>**20080819153558]
[replace separate_middle_last_from_first and separate_last_from_first_middle with get_choices
Jason Dagit <[EMAIL PROTECTED]>**20080815222635]
[correct a bug in with_selected_patches_from_repository
Jason Dagit <[EMAIL PROTECTED]>**20080815201125
Fixing this bug allows w_s_p_f_r to have the expected type signature
and also corrects a problem where the non-selected patches were returned
in the wrong context.
]
[refine type witnesses in SelectChanges
Jason Dagit <[EMAIL PROTECTED]>**20080813050425]
[make WhatsNew work with type witnesses
Jason Dagit <[EMAIL PROTECTED]>**20080813044354]
[major refactor of SelectChanges to work with type witnesses
Jason Dagit <[EMAIL PROTECTED]>**20080813031625]
[Eliminate HopefullyPrivate (fixed patch edition)
[EMAIL PROTECTED]
[Move Darcs.Patch.Ordered to Darcs.Ordered since it isn't patchy
[EMAIL PROTECTED]
[Fix use of threadWaitRead on Windows
Simon Marlow <[EMAIL PROTECTED]>**20080819141151
threadWaitRead doesn't work on Windows in all GHC versions < 6.10.1
(which isn't released yet).
This means that since darcs is compiled with -threaded, when compiled
with GHC < 6.10 on Windows, darcs will not respond to ^C when waiting
for user input.
]
[Fix Windows build
Simon Marlow <[EMAIL PROTECTED]>**20080819134252
On Windows, System.Posix.Types.FileOffset is not the same as the type
of the st_size field of the stat structure: the latter is Int64,
whereas COff == Int32.
This is almost ceratinly not the right fix, but it gets the build
going.
In general I don't recommend using System.Posix.* on Windows. The
right way is to either use the official platform-independent libraries
like System.IO, System.Directory or System.Process, or to use
System.Win32 directly.
]
[URL module refactoring.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817124816]
[Do not compile curl support if libwww is enabled.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817121834]
[URL.hs: always import debugFail, again.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080817121101]
[URL.hs: call debugFail when download fails.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080816070213]
[URL.hs: debug messages.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080816070147]
[Spacing in Darcs/Commands/Changes.lhs
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815221245]
[Rename catchInt to catchInterrupt, better message when get is interrupted.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815154421]
[Resolve issue995: changes --context : {--human-readable,--xml-output} have no effect.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815114105]
[Add test for issue1017 (as suggested by Bjorn Bringert)
Eric Kow <[EMAIL PROTECTED]>**20080818194115]
[don't print "Wrote patch to -" when writing patch to stdout.
David Roundy <[EMAIL PROTECTED]>**20080819142537]
[always send with context.
David Roundy <[EMAIL PROTECTED]>**20080819140729]
[Tidy up known failing shell tests.
Eric Kow <[EMAIL PROTECTED]>**20080818102100
* Keeping track of these bugs could be simpler if they were all
associated with a ticket and a short description
* The shell harness allows us to avoid a lot of bureaucracy in
in the scripts. In fact, people should be able to submit a
bug just by sticking a shell script in bugs, no hoops to jump.
]
[Tidy up failing test for issue1013.
Eric Kow <[EMAIL PROTECTED]>**20080818101351
We don't need to use a $DARCS variable anymore, thanks to the shell
harness. Also, I noticed that what used to trigger a bug now hangs.
]
[Add failing test for issue1012 (Simon Marlow).
Eric Kow <[EMAIL PROTECTED]>**20080818094104]
[Resolve issue823: do not exit on keyboard interrupt when getting patches.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080815070943
And give a chance for go_to_chosen_version to run.
]
[fix buggy comments in bugs/identical-patches.sh.
David Roundy <[EMAIL PROTECTED]>**20080814135322]
[Add Ian's identical-patch test case.
Eric Kow <[EMAIL PROTECTED]>**20080813171032]
[URL.hs: store only URL in waitToStart queue.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813122246]
[Add (failing) test for issue944.
Eric Kow <[EMAIL PROTECTED]>**20080814055903
This appears to be a reggression from darcs 1.0.9, and was submitted by
Wolfgang Lux on the bug tracker. Interestingly, only the old format
repositories are affected, not the hashed ones.
]
[add type witnesses to TouchesFiles
Jason Dagit <[EMAIL PROTECTED]>**20080810063403]
[add type witnesses to Patch/Choices.lhs
Jason Dagit <[EMAIL PROTECTED]>**20080809000237]
[Split Cache mostly out of Darsc/Repository/Prefs into its own file (take 2)
[EMAIL PROTECTED]
[Make Darcs.Repository.Prefs export the cache hash function
[EMAIL PROTECTED]
[remove a few unsightly functions
Jason Dagit <[EMAIL PROTECTED]>**20080813061256]
[Fix URL module bug with pipelining enabled.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813081218]
[Minor change to URL module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813074218]
[Enable pipelining by default, add --disable-pipelining option (issue838).
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080813011342]
[Generalize HashRepo.clean_pristine to HashIO.clean_hashdir.
[EMAIL PROTECTED]
[Add writeSlurpy to roll out a copy of slurpy into a filesystem.
[EMAIL PROTECTED]
[fix breakage in URL.
David Roundy <[EMAIL PROTECTED]>**20080812141220]
[Parametrize "pristine.hashed" in a bunch of functions.
[EMAIL PROTECTED]
[Rework URL module for multi threading.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080811221209]
[Add thread synchronization to URL module and resume select() if interrupted by signal in curl module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080810092810]
[Handle error case with empty URL in URL.waitNextUrl function.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809221755]
[Add --debug-http flag to enable curl and libwww debug at run-time instead of compile-time.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809154834]
[Print a warning when the remote end does not have darcs 2.
Eric Kow <[EMAIL PROTECTED]>**20080811100933
Two reasons:
(1) right now people get a scary warning from ssh when it can't fetch
some non-essential files (it used to be that we would send stderr from ssh
to /dev/null, but that has other problems...)
(2) darcs transfer-mode more widely deployed could help a lot of people
wrt darcs performance
]
[Added a beware note to the unrecord command
[EMAIL PROTECTED]
[Fixed typo
[EMAIL PROTECTED]
[Better debug messages in URL module.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080809215247]
[make Convert.lhs compile.
David Roundy <[EMAIL PROTECTED]>**20080810201725]
[improve type safety of Darcs.Repository.Internal.
Jason Dagit <[EMAIL PROTECTED]>**20080810051109]
[Refactor `darcs convert' warning at kowey's request.
Trent W. Buck <[EMAIL PROTECTED]>**20080810110014]
[Expand formats text based in part on suggestions from darcs-users
Max Battcher <[EMAIL PROTECTED]>**20080809184043]
[Fixes to global cache text based on darcs-users suggestions
Max Battcher <[EMAIL PROTECTED]>**20080809181424]
[Add user-focused documentation of repository format options
Max Battcher <[EMAIL PROTECTED]>**20080807195429]
[Highlight the global cache as a best practice
Max Battcher <[EMAIL PROTECTED]>**20080807193918]
[Describe best practice in `darcs convert --help'.
Trent W. Buck <[EMAIL PROTECTED]>**20080810110615]
[add type witnesses to Population
Jason Dagit <[EMAIL PROTECTED]>**20080808053252]
[add type witnesses to CommandsAux
Jason Dagit <[EMAIL PROTECTED]>**20080808052738]
[Add type witnesses to more modules, rounding out Darcs/Repository/*
Jason Dagit <[EMAIL PROTECTED]>**20080808050947]
[fixed a bug in identity_commutes property
Jason Dagit <[EMAIL PROTECTED]>**20080808023025
In the right identity check the patch order should have gone from
(identity :> p) to (p2 :> i2). I added a rigid type context too
so that ghc 6.8 and newer would type the definition.
]
[Make Darcs.Repository.Internal compile with type witnesses.
Jason Dagit <[EMAIL PROTECTED]>**20080808015343]
[UF8.lhs: remove unusued functions/imports/docs
[EMAIL PROTECTED]
[Resolve issue974 : do not pass both -optc-g and -opta-g to GHC
Eric Kow <[EMAIL PROTECTED]>**20080807073620]
[make this test more cross-platform
Simon Michael <[EMAIL PROTECTED]>**20080807103433]
[document how to run unit tests
Simon Michael <[EMAIL PROTECTED]>**20080807030416]
[move (most) failing tests to bugs for clean test output
Simon Michael <[EMAIL PROTECTED]>**20080806191336]
[fix an old spelling error
Simon Michael <[EMAIL PROTECTED]>**20080806170432]
[make searching for "test:" in makefile work
Simon Michael <[EMAIL PROTECTED]>**20080805222241]
[run only normal (expected to pass) tests by default
Simon Michael <[EMAIL PROTECTED]>**20080805222108]
[cleanup and slight rewrite of the test docs
Simon Michael <[EMAIL PROTECTED]>**20080806165949]
[make order of running tests consistent
Simon Michael <[EMAIL PROTECTED]>**20080806172123]
[Downplay quantum mechanics link.
Eric Kow <[EMAIL PROTECTED]>**20080806124109
Besides, darcs has far more than 3 users by now.
]
[Make patch theory intro more inviting to math people.
Eric Kow <[EMAIL PROTECTED]>**20080806123411]
[small makefile refactoring: allow just the normal tests to be run, without bugs/*
Simon Michael <[EMAIL PROTECTED]>**20080805203242]
[Rectify dist help
[EMAIL PROTECTED]
Removed the "make dist" suggestion, the manual is a better place for that.
Instead, make clear that it operates on a clean copy of the tree, and
mention the "predist" functionality.
]
[website: explain that darcs 2 is required to get the darcs source.
Simon Michael <[EMAIL PROTECTED]>**20080803181216]
[fix type witness compile errors specific to ghc 6.8
Jason Dagit <[EMAIL PROTECTED]>**20080722182729]
[Canonize Gaetan Lehmann and Daniel Buenzli.
Eric Kow <[EMAIL PROTECTED]>**20080730104357
(for Daniel B, avoid an accent in his name)
]
[configure: check for packages needed with split base.
Eric Kow <[EMAIL PROTECTED]>**20080730103840
Now that all packages must be used explicitly.
]
[avoid import of unused function fromMaybe.
David Roundy <[EMAIL PROTECTED]>**20080729172825]
[Use haskeline to have a readline-like behavior when asking something to the user
[EMAIL PROTECTED]
Unlike the implementations using readline or editline packages, this code
code doesn't break the Ctrl-C behavior.
]
[add configure check for Network.URI.
David Roundy <[EMAIL PROTECTED]>**20080711011914]
[add -hide-all-packages to default GHCFLAGS.
David Roundy <[EMAIL PROTECTED]>**20080711010952]
[add support for outputting patch numbers in darcs changes.
David Roundy <[EMAIL PROTECTED]>**20080710011211]
[add support for matching single patches by index.
David Roundy <[EMAIL PROTECTED]>**20080710004512]
[add support for matching ranges of patches (counting back from present).
David Roundy <[EMAIL PROTECTED]>**20080710003225]
[configure: suggest regex-compat before text
Eric Kow <[EMAIL PROTECTED]>**20080725095336]
[configure: mention Haskell in 'try installing' suggestion
Eric Kow <[EMAIL PROTECTED]>**20080725095015]
[Typo (Text.Regex)
Eric Kow <[EMAIL PROTECTED]>**20080715121708]
[Better avoid silly manpage error.
Trent W. Buck <[EMAIL PROTECTED]>**20080704024920
It turned out only initialize's help string used 'quotes', so just
remove them. This makes init's docstring consistent with the others.
]
[Missing period at end of sentence.
Trent W. Buck <[EMAIL PROTECTED]>**20080704024232]
[darcs --overview no longer works, so don't document it.
Trent W. Buck <[EMAIL PROTECTED]>**20080704030804]
[Avoid silly manpage error.
Trent W. Buck <[EMAIL PROTECTED]>**20080703010733
man (nroff) treats an apostrophe in the first column specially,
resulting in a syntax error without this patch.
Ideally, all cases of 'foo' in the manpage (i.e. docstrings) should
become `foo', since man -Tps turns ` and ' into left and right single
quotes respectively.
]
[obliterate whitespace in Darcs.Commands.Get
[EMAIL PROTECTED]
'twas causing lhs/haddock difficulties where a \end{code} wasn't getting recognized.
]
[rm haddock CPP business
[EMAIL PROTECTED]
Try as I might, I can't see any reason to special-case some Haddock CPP logic to deal with some *commented-out guards*, unless CPP magically restores and uncomments the code if Haddock isn't being run.
]
[make pull less verbose when --verbose flag is given.
David Roundy <[EMAIL PROTECTED]>**20080624170035]
[fix makefile to remember to regenerate version information after running configure.
David Roundy <[EMAIL PROTECTED]>**20080624170001]
[TAG 2.0.2
David Roundy <[EMAIL PROTECTED]>**20080624012041]
[bump version number again (brown bag!)
David Roundy <[EMAIL PROTECTED]>**20080624011914]
[add script to check that "make dist" actually works.
David Roundy <[EMAIL PROTECTED]>**20080624011817]
[fix buggy and inconsistent release-determining scripts.
David Roundy <[EMAIL PROTECTED]>**20080624011759]
[ignore boring changelog entry patches when constructing ChangeLog.
David Roundy <[EMAIL PROTECTED]>**20080623224504]
[add changelog entry for fix of version-numbering bug.
David Roundy <[EMAIL PROTECTED]>**20080623223901]
[fix bug in determine_release_state.pl.
David Roundy <[EMAIL PROTECTED]>**20080623223739]
[TAG 2.0.1
David Roundy <[EMAIL PROTECTED]>**20080623214707]
[bump version to 2.0.1.
David Roundy <[EMAIL PROTECTED]>**20080623214646]
[determine_release_state.pl: use regexp to determine patch count if "darcs changes" does not support --count argument.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080621122305]
[Delete haddock documentation on constructor arguments; see Issue935
Michael De La Rue <[EMAIL PROTECTED]>**20080622182644]
[Add configure options for libcurl and libwww debugging.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080620221237]
[aclocal.m4: add library to $LIBS instead of $GHCFLAGS in GHC_CHECK_LIBRARY.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080620214538]
[resolve issue930: remove broken link from webpage.
David Roundy <[EMAIL PROTECTED]>**20080620172635]
[add threadWaitRead trick as suggested by Simon (issue916).
David Roundy <[EMAIL PROTECTED]>**20080620172119
Apparently this should solve the ctrl-C issues on posix systems, but
windows remains only partially-solved (it requires multiple ctrl-C's
to exit).
]
[resolve issue916: use separate thread for reading from stdin.
David Roundy <[EMAIL PROTECTED]>**20080618210110]
[Set up configure to build an rpm spec file for building rpm packages with.
Michael De La Rue <[EMAIL PROTECTED]>**20080616231617]
[hscurl.c: fix harmless warning with curl >= 7.18.1.
Dmitry Kurochkin <[EMAIL PROTECTED]>**20080613125607]
[Even more changelog entries for 2.0.1.
Eric Kow <[EMAIL PROTECTED]>**20080614091045]
[Use changes -s style for unlogged patches (make_changelog).
Eric Kow <[EMAIL PROTECTED]>**20080614072632
This make it easier to tell what a patch is at a glance.
]
[Still more changelog entries for 2.0.1.
Eric Kow <[EMAIL PROTECTED]>**20080613181548]
[Canonize Benjamin Fraksen.
Eric Kow <[EMAIL PROTECTED]>**20080613171147]
[fix potential redundancy in version name.
David Roundy <[EMAIL PROTECTED]>**20080613162019]
[fix issue #918: use simplePrinters for xml output in "darcs changes" command
[EMAIL PROTECTED]
[make darcs send always provide context.
David Roundy <[EMAIL PROTECTED]>**20080613155550
I've just gotten sick of telling folks to add send --unified to their
defaults file. It's hard to see who wouldn't want context included.
]
[More changelog entries for 2.0.1.
Eric Kow <[EMAIL PROTECTED]>**20080613165729]
[Clarify intent of ignored changelog entries.
Eric Kow <[EMAIL PROTECTED]>**20080613162537]
[Ignore tags in make_changelog warning about unlogged patches.
Eric Kow <[EMAIL PROTECTED]>**20080613162213]
[Support comments on ignored changelog entries.
Eric Kow <[EMAIL PROTECTED]>**20080613161742
Parsec wibble: the problem was that it would start parsing the
emptyLine as a 'match' and not backtrack.
]
[ChangeLog entries by Eric.
Eric Kow <[EMAIL PROTECTED]>**20080613151200
Some ChangeLog entries for 2.0.1
]
[Add 'ignored' changelog entries (no warnings).
Eric Kow <[EMAIL PROTECTED]>**20080613150620]
[Resolve issue705: warn about patches which are not changelogged.
Eric Kow <[EMAIL PROTECTED]>**20080613145443
Mostly by Tommy Pettersson.
]
[Add ability to ignore patches for ChangeLog.
Eric Kow <[EMAIL PROTECTED]>**20080613142540
This would be useful if make_changelog could point out which patches
are not being changelogged.
]
[Exceptions to GPL granted as of 2008-06-13 morning.
Eric Kow <[EMAIL PROTECTED]>**20080613072749]
[Add test for case-insensitive backup bug.
Eric Kow <[EMAIL PROTECTED]>**20080613070918]
[Fix a backup bug on case-insensitive file systems.
Eric Kow <[EMAIL PROTECTED]>**20080613070213
Avoids this scenario. The task: move foo to FOO and modify FOO
1. FOO (foo) already exists, so I'll back it up
(moves FOO [foo] to FOO.darcs-backup0)
2. Now I can move foo to FOO
foo no longer exists, but that's ok
(nothing happens)
3. Now I can FOO
hey, where did FOO go?
(crash!)
]
[Check for bash before running shell tests.
Eric Kow <[EMAIL PROTECTED]>**20080612145509
MSYS, for instance, does not provide bash by default.
[note: or rather, only under the guise of sh.exe]
]
[TAG 2.0.1rc2
David Roundy <[EMAIL PROTECTED]>**20080613011745]
[bump version number up to 2.0.1rc2.
David Roundy <[EMAIL PROTECTED]>**20080613011731]
[Resolve issue913: Use Data.Bytestring for IO, not Data.Bytestring.Char8
Eric Kow <[EMAIL PROTECTED]>**20080612125719
This solution comes from Ian Lynagh, who points out that the
difference between the two is:
Data.Bytestring.Char8
---------------------
writeFile :: FilePath -> ByteString -> IO ()
writeFile f txt = bracket (openFile f WriteMode) hClose
(\h -> hPut h txt)
Data.Bytestring
---------------
writeFile :: FilePath -> ByteString -> IO ()
writeFile f txt = bracket (openBinaryFile f WriteMode) hClose
(\h -> hPut h txt)
We want this change because, as the System.IO docs say:
On Windows, reading a file in text mode (which is the default) will
translate CRLF to LF, and writing will translate LF to CRLF. This is
usually what you want with text files. With binary files this is
undesirable; also, as usual under Microsoft operating systems, text
mode treats control-Z as EOF. Binary mode turns off all special
treatment of end-of-line and end-of-file characters.
]
[fix OPTLLIBS filtering
Karel Gardas <[EMAIL PROTECTED]>**20080607210701]
[Darcs.Repository.Prefs: +boring filters for MS Visual Studio (see -users discussion)
[EMAIL PROTECTED]
[Demonstrate 'hidden conflicts' bug (old format).
Eric Kow <[EMAIL PROTECTED]>**20080606151534]
[fix regression introduced by using Data.List.isInfixOf.
David Roundy <[EMAIL PROTECTED]>**20080606102519]
[fix bug in test when there's a space in test directory.
David Roundy <[EMAIL PROTECTED]>**20080605151104]
[translate pull.pl into shell.
David Roundy <[EMAIL PROTECTED]>**20080605124106]
[make test suite smarter about cleaning up test directories.
David Roundy <[EMAIL PROTECTED]>**20080605124025]
[darcs put now support --{no-,}set-default.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080604214551]
[fix regression in index.html.in.
David Roundy <[EMAIL PROTECTED]>**20080605114356]
[resolve issue783: propose 'edit' as a default Windows editor
Eric Kow <[EMAIL PROTECTED]>**20080605165812
I think every Windows box has this. Advantages over notepad are that
- it's a console app
- it appears to support Unix newlines
]
[Makefile: prefix -optl only on $(LIBS) that start with '-'
Eric Kow <[EMAIL PROTECTED]>**20080605105539
Otherwise, on Windows, if you try to build --with-static-libs, the
linker will be passed /usr/local/lib/libcurl.a as an argument, which
makes gcc complain.
]
[resolve issue770: catch 'does not exist' when running external programs
Eric Kow <[EMAIL PROTECTED]>**20080604143100
Convert these errors into ExitCode 127 (for Windows)
]
[Improve generic rules for English plurals.
Eric Kow <[EMAIL PROTECTED]>**20080604123728]
[TAG 2.0.1rc1
David Roundy <[EMAIL PROTECTED]>**20080603124331]
Patch bundle hash:
b6041aac13aaa86acb901f41b06276530553e596
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
