From 4d400f5978d0cf572775ce5c7f30d6fd3a8644fc Mon Sep 17 00:00:00 2001 From: Bertram Felgenhauer Date: Sat, 8 Nov 2008 20:30:23 +0100 Subject: [PATCH] Follow upstream changes -- rest nothing exciting - two modules got renamed and read_repo changed its interface slightly. (Patch from Marc Weber) --- src/Git/Fast.hs | 2 +- src/git-darcs-import.hs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Git/Fast.hs b/src/Git/Fast.hs index b0aedfc..8f47319 100644 --- a/src/Git/Fast.hs +++ b/src/Git/Fast.hs @@ -39,7 +39,7 @@ import Darcs.Utils (withCurrentDirectory) import Darcs.IO (WriteableDirectory (..), ReadableDirectory (..)) import Darcs.Patch.Core (Named (..)) import Darcs.Patch.Info (make_filename) -import FileName (fp2fn, (///), FileName) +import Darcs.Patch.FileName (fp2fn, (///), FileName) import Git.Base import Git.Metadata (GitInfo (..), extractGitInfo) import qualified Data.ByteString as B diff --git a/src/git-darcs-import.hs b/src/git-darcs-import.hs index 4cfc86b..134c4ae 100644 --- a/src/git-darcs-import.hs +++ b/src/git-darcs-import.hs @@ -26,9 +26,8 @@ import Darcs.Repository (read_repo, withRepositoryDirectory, Repository) import Darcs.Patch.Core (Named (..)) import Darcs.Patch.Info (make_filename, pi_tag) import Darcs.Patch.Set (PatchSet) -import Darcs.Patch.Ordered (mapRL) +import Darcs.Ordered (mapRL) import Darcs.Patch (RepoPatch) -import Darcs.Sealed (Sealed (..)) import Darcs.Hopefully (PatchInfoAnd, info, hopefully) import Git.Base (Git, getVerbose, modifyVerbose, failure) import Git.Fast (runGit, getInventory, applyAndCommit) @@ -68,7 +67,7 @@ convert opts src dst0 = do work0 :: RepoPatch p => FilePath -> Repository p -> IO () work0 dst repo = do - Sealed ps <- read_repo repo + ps <- read_repo repo runGit (sequence opts) dst (work (toList ps)) putStrLn "\ngit-darcs-import done." -- 2.11.4.GIT