summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* prep release5.20140613Gravatar Joey Hess2014-06-13
|
* make EvilSplicer re-box file-embed's ByteStringsGravatar Joey Hess2014-06-13
| | | | | | | | | The armel autobuilder started failing: Assistant/WebApp/Types.hs:128:14: primitive string literal must contain only characters <= '\xFF' This fixes that.
* devblogGravatar Joey Hess2014-06-12
|
* work around a bug in gitGravatar Joey Hess2014-06-12
| | | | | | | | | | | http://marc.info/?l=git&m=140262402204212&w=2 This git bug manifested on FAT and Windows as the test suite failing in 3 places. All involved merge conflict resolution. It turned out that the associated file mappings were getting messed up, and that happened because this git bug lost track of what files were supposed to be symlinks. This commit was sponsored by Eric Kidd.
* updateGravatar Joey Hess2014-06-12
|
* fix a test suite reversion on WindowsGravatar Joey Hess2014-06-12
| | | | Forgot to pass gitEnv when running commands in the git queue on windows.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-06-12
|\
* | update; highlight need to commit and mention git-annex copyGravatar Joey Hess2014-06-12
| |
| * Added a commentGravatar http://joeyh.name/2014-06-12
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-06-12
|\
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU2014-06-12
| |
* | changelog updateGravatar Joey Hess2014-06-12
| |
* | merge in windows loststamp branchGravatar Joey Hess2014-06-12
|\ \
| * | this just went from horrible to insanely weirdGravatar Joey Hess2014-06-12
| | |
| * | unset TZ on WindowsGravatar Joey Hess2014-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TZ gets set when opening a cygwin terminal. What I'm oberving is strange.. when TZ is set, even if it's set to the same thing as the system time zone, it seems to result in files showing with different mtimes than when TZ is not set. Having TZ set also prevents seeing the real system timezone, so let's kill it.
* | | unset TZ on WindowsGravatar Joey Hess2014-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TZ gets set when opening a cygwin terminal. What I'm oberving is strange.. when TZ is set, even if it's set to the same thing as the system time zone, it seems to result in files showing with different mtimes than when TZ is not set. When TZ is not set, the system time zone is used. Anyway, once getCurrentTimeZone is fixed, I'll want to have TZ not set so changes to the system time zone are available immediately.
* | | finish fixing windows timezone madnessGravatar Joey Hess2014-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than calculating the TSDelta once, and caching it, this now reads the inode sential file's InodeCache file once, and then each time a new InodeCache is generated, looks at the sentinal file to get the current delta. This way, if the time zone changes while git-annex is running, it will adapt. This adds some inneffiency, but only on Windows, and only 1 stat per new file added. The worst innefficiency is that `git annex status` and `git annex sync` will now (on Windows) stat the inode sentinal file once per file in the repo. It would be more efficient to use getCurrentTimeZone, rather than needing to stat the sentinal file. This should be easy to do, once the time package gets my bugfix patch. This commit was sponsored by Jürgen Lüters.
* | | fix for Windows file timestamp timezone madnessGravatar Joey Hess2014-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Added a comment: In reply to comment 11Gravatar martin2014-06-12
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-06-11
| |\
| * | devblogGravatar Joey Hess2014-06-11
| | |
| | * Added a commentGravatar http://joeyh.name/2014-06-11
| | |
| | * Added a commentGravatar http://joeyh.name/2014-06-11
| | |
| * | confirmedGravatar Joey Hess2014-06-11
|/ /
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
* | minimal exportsGravatar Joey Hess2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
|/
* deal with FAT on Linux timestamp issueGravatar Joey Hess2014-06-11
| | | | | | | | | Deal with FAT's low resolution timestamps, which in combination with Linux's caching of higher res timestamps while a FAT is mounted, caused direct mode repositories on FAT to seem to have modified files after they were unmounted and remounted. This commit was sponsored by Fabrice Rossi.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-06-11
|\
* | split out bug report from FAT:_Date_resolution_for_mtime_2s--__62___implicationsGravatar Joey Hess2014-06-11
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV42014-06-11
| |
| * Added a comment: FAT MetaData Sucks: an approachGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a comment: No git-annex process.Gravatar https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY2014-06-11
| |
| * Added a commentGravatar http://joeyh.name/2014-06-11
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk2014-06-11
| |
| * Added a comment: Same error after deleting .ssh/git-annex-shellGravatar https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns2014-06-11
| |
| * Added a comment: Where is it registered?Gravatar http://alan.petitepomme.net/2014-06-11
| |
| * Added a comment: specificationGravatar martin2014-06-11
|/
* Fix build with wai 0.3.0.Gravatar Joey Hess2014-06-11
| | | | | | | | | | This version of wai changed the type of Middleware, so I cannot seem to liftIO inside it. So, got rid of a lot of not really needed complexity to use System.Log.Logger's logging stuff, and just use the standard wai stdout logger when debug logging is enabled. Format may change some, and it logs http to stdout instead of stderr now. Doesn't matter for the webapp since both go to the same log anyway.
* Merge orca:tmp/f/buildGravatar Joey Hess2014-06-10
|\
| * refreshed haskell patchesGravatar Joey Hess2014-06-11
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-06-10
|\ \
* | | devblogGravatar Joey Hess2014-06-10
| | |
* | | export CreateProcess fields from Utility.ProcessGravatar Joey Hess2014-06-10
| | | | | | | | | | | | update code to avoid cwd and env redefinition warnings