diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-25 15:48:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-25 15:48:15 -0400 |
| commit | 7a9f9fd6b81126a73a85ea7dab68260df36279b1 (patch) | |
| tree | 6fc3177d163afd0e94d1624f3537fbe252d1c0f0 /Annex/CatFile.hs | |
| parent | 8602e201f2ac5dd9ab851e8023af080f77a9bd55 (diff) | |
assistant direct mode file add/change bookkeeping
When a file is changed in direct mode, the old content is probably lost
(at least from the local repo), and bookeeping needs to be updated to
reflect this.
Also, synthetic add events are generated at assistant startup, so
make it detect when the file has not really changed, and avoid re-adding
it.
This does add the overhead of querying the runing git cat-file for the
key that's recorded in git for the file, each time a file is added or
modified in direct mode.
Diffstat (limited to 'Annex/CatFile.hs')
| -rw-r--r-- | Annex/CatFile.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index 161554f29..ffac4fccd 100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs @@ -44,6 +44,6 @@ catFileHandle = maybe startup return =<< Annex.getState Annex.catfilehandle Annex.changeState $ \s -> s { Annex.catfilehandle = Just h } return h -{- From the Sha of a symlink back to the key. -} -catKey :: Sha -> Annex (Maybe Key) -catKey sha = fileKey . takeFileName . encodeW8 . L.unpack <$> catObject sha +{- From the Sha or Ref of a symlink back to the key. -} +catKey :: Ref -> Annex (Maybe Key) +catKey ref = fileKey . takeFileName . encodeW8 . L.unpack <$> catObject ref |