aboutsummaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
Diffstat (limited to 'Git')
-rw-r--r--Git/DiffTree.hs11
-rw-r--r--Git/DiffTreeItem.hs24
-rw-r--r--Git/UpdateIndex.hs2
3 files changed, 26 insertions, 11 deletions
diff --git a/Git/DiffTree.hs b/Git/DiffTree.hs
index d2148458c..5981ed1a2 100644
--- a/Git/DiffTree.hs
+++ b/Git/DiffTree.hs
@@ -16,25 +16,16 @@ module Git.DiffTree (
) where
import Numeric
-import System.Posix.Types
import Common
import Git
import Git.Sha
import Git.Command
import Git.FilePath
+import Git.DiffTreeItem
import qualified Git.Filename
import qualified Git.Ref
-data DiffTreeItem = DiffTreeItem
- { srcmode :: FileMode
- , dstmode :: FileMode
- , srcsha :: Sha -- nullSha if file was added
- , dstsha :: Sha -- nullSha if file was deleted
- , status :: String
- , file :: TopFilePath
- } deriving Show
-
{- Checks if the DiffTreeItem modifies a file with a given name
- or under a directory by that name. -}
isDiffOf :: DiffTreeItem -> TopFilePath -> Bool
diff --git a/Git/DiffTreeItem.hs b/Git/DiffTreeItem.hs
new file mode 100644
index 000000000..2389b698a
--- /dev/null
+++ b/Git/DiffTreeItem.hs
@@ -0,0 +1,24 @@
+{- git diff-tree item
+ -
+ - Copyright 2012 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Git.DiffTreeItem (
+ DiffTreeItem(..),
+) where
+
+import System.Posix.Types
+
+import Git.FilePath
+import Git.Types
+
+data DiffTreeItem = DiffTreeItem
+ { srcmode :: FileMode
+ , dstmode :: FileMode
+ , srcsha :: Sha -- nullSha if file was added
+ , dstsha :: Sha -- nullSha if file was deleted
+ , status :: String
+ , file :: TopFilePath
+ } deriving Show
diff --git a/Git/UpdateIndex.hs b/Git/UpdateIndex.hs
index a569d7740..613596d57 100644
--- a/Git/UpdateIndex.hs
+++ b/Git/UpdateIndex.hs
@@ -29,7 +29,7 @@ import Git.Types
import Git.Command
import Git.FilePath
import Git.Sha
-import qualified Git.DiffTree as Diff
+import qualified Git.DiffTreeItem as Diff
{- Streamers are passed a callback and should feed it lines in the form
- read by update-index, and generated by ls-tree. -}