Commit graph

20088 commits

Author SHA1 Message Date
Joey Hess
6f57e57cf0 add news item for git-annex 5.20140613 2014-06-13 10:34:36 -04:00
Joey Hess
1600ed1ab9 prep release 2014-06-13 09:58:51 -04:00
Joey Hess
c71fa9f217 Revert "remove newlines from static js and css"
This reverts commit 5a0779fd70.

No longer needed now that EvilSplicer handles this.
2014-06-13 02:20:39 -04:00
Joey Hess
4dd6938850 make EvilSplicer re-box file-embed's ByteStrings
The armel autobuilder started failing:

Assistant/WebApp/Types.hs:128:14:
    primitive string literal must contain only characters <= '\xFF'

This fixes that.
2014-06-13 02:18:31 -04:00
Joey Hess
96d22a4bac devblog 2014-06-12 22:07:17 -04:00
Joey Hess
b30de0dfd2 work around a bug in git
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.
2014-06-12 22:00:02 -04:00
Joey Hess
a7c15d0e51 update 2014-06-12 18:46:07 -04:00
Joey Hess
fbd5a67cba fix a test suite reversion on Windows
Forgot to pass gitEnv when running commands in the git queue on windows.
2014-06-12 18:37:12 -04:00
Joey Hess
1bebb0d66f Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-12 16:51:24 -04:00
Joey Hess
7d8dd0ae8a update; highlight need to commit and mention git-annex copy 2014-06-12 16:48:04 -04:00
http://joeyh.name/
c1ceafeef3 Added a comment 2014-06-12 20:07:30 +00:00
Joey Hess
9a001211a5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-12 15:52:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
e4c4966231 2014-06-12 19:31:51 +00:00
Joey Hess
6ead75a116 changelog update 2014-06-12 15:31:50 -04:00
Joey Hess
b291951180 merge in windows loststamp branch 2014-06-12 15:21:10 -04:00
Joey Hess
9dd380cf3b this just went from horrible to insanely weird 2014-06-12 15:17:32 -04:00
Joey Hess
5c5c5cda85 unset TZ on Windows
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.
2014-06-12 14:54:43 -04:00
Joey Hess
8ef84933fd unset TZ on Windows
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.
2014-06-12 14:21:53 -04:00
Joey Hess
4fe2e53f5b finish fixing windows timezone madness
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.
2014-06-12 13:54:08 -04:00
Joey Hess
e4d7e2ebde 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.
2014-06-12 13:42:21 -04:00
martin
aaf8045e56 Added a comment: In reply to comment 11 2014-06-12 09:22:54 +00:00
Joey Hess
3ee75d8738 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-11 19:07:26 -04:00
Joey Hess
d6098906f2
devblog 2014-06-11 19:06:20 -04:00
http://joeyh.name/
4b525889f1 Added a comment 2014-06-11 23:02:28 +00:00
http://joeyh.name/
2cc8a53815 Added a comment 2014-06-11 22:54:48 +00:00
Joey Hess
0c40bf5a94 confirmed 2014-06-11 18:20:58 -04:00
http://joeyh.name/
e48a363c30 Added a comment 2014-06-11 22:11:39 +00:00
Joey Hess
db8982c45b minimal exports 2014-06-11 16:17:01 -04:00
http://joeyh.name/
fee38c834b Added a comment 2014-06-11 20:09:14 +00:00
http://joeyh.name/
2c34730850 Added a comment 2014-06-11 19:56:49 +00:00
http://joeyh.name/
c09a2e9f0f Added a comment 2014-06-11 19:51:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
aaf6b64255 Added a comment 2014-06-11 19:47:35 +00:00
http://joeyh.name/
398640f35e Added a comment 2014-06-11 19:09:17 +00:00
http://joeyh.name/
764340e7a2 Added a comment 2014-06-11 18:59:49 +00:00
Joey Hess
1c18056e15 deal with FAT on Linux timestamp issue
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.
2014-06-11 14:46:03 -04:00
Joey Hess
d7ef984999 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-11 14:40:36 -04:00
Joey Hess
73aa19a0dc split out bug report from FAT:_Date_resolution_for_mtime_2s--__62___implications 2014-06-11 14:32:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
f137ab8144 Added a comment 2014-06-11 18:29:38 +00:00
http://joeyh.name/
e2186a46ce Added a comment: FAT MetaData Sucks: an approach 2014-06-11 18:15:59 +00:00
http://joeyh.name/
18ac339ef6 Added a comment 2014-06-11 18:05:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
420fedc193 Added a comment: No git-annex process. 2014-06-11 17:55:56 +00:00
http://joeyh.name/
b35d3afed5 Added a comment 2014-06-11 17:22:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
4631074747 Added a comment 2014-06-11 16:31:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
64b7b8886a Added a comment: Same error after deleting .ssh/git-annex-shell 2014-06-11 15:53:17 +00:00
http://alan.petitepomme.net/
1173e9860a Added a comment: Where is it registered? 2014-06-11 11:27:02 +00:00
martin
b0b2e52bbf Added a comment: specification 2014-06-11 05:43:02 +00:00
Joey Hess
8ff9938d97 Fix build with wai 0.3.0.
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.
2014-06-11 01:29:00 -04:00
Joey Hess
2d142b4368 Merge orca:tmp/f/build 2014-06-10 22:36:12 -04:00
Joey Hess
2b8dbfe7ab refreshed haskell patches 2014-06-11 03:35:19 +01:00
Joey Hess
201bb931a3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-10 19:23:00 -04:00