diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-11 17:51:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-12 13:42:21 -0400 |
| commit | 34c9eab951a73f06de70170cc2c2d40ce490ea70 (patch) | |
| tree | b74bc50d26a7667b6ef9c4826fb575252d655103 /Assistant | |
| parent | 8550dd4bb75f03700fbebd7cf1b38cb2ef8b29f5 (diff) | |
fix for Windows file timestamp timezone madness
On Windows, changing the time zone causes the apparent mtime of files to
change. This confuses git-annex, which natually thinks this means the files
have actually been modified (since THAT'S WHAT A MTIME IS FOR, BILL <sheesh>).
Work around this stupidity, by using the inode sentinal file to detect if
the timezone has changed, and calculate a TSDelta, which will be applied
when generating InodeCaches.
This should add no overhead at all on unix. Indeed, I sped up a few
things slightly in the refactoring.
Seems to basically work! But it has a big known problem:
If the timezone changes while the assistant (or a long-running command)
runs, it won't notice, since it only checks the inode cache once, and
so will use the old delta for all new inode caches it generates for new
files it's added. Which will result in them seeming changed the next time
it runs.
This commit was sponsored by Vincent Demeester.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index cb98b017f..275586343 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -313,10 +313,11 @@ handleAdds havelsof delayadd cs = returnWhen (null incomplete) $ do adddirect toadd = do ct <- liftAnnex compareInodeCachesWith m <- liftAnnex $ removedKeysMap ct cs + delta <- liftAnnex getTSDelta if M.null m then forM toadd add else forM toadd $ \c -> do - mcache <- liftIO $ genInodeCache $ changeFile c + mcache <- liftIO $ genInodeCache (changeFile c) delta case mcache of Nothing -> add c Just cache -> |