Commit graph

10904 commits

Author SHA1 Message Date
Joey Hess
aba49995b6 Merge branch 'master' into windows 2013-05-15 19:18:04 -04:00
Joey Hess
4829eae883 fix toDirectGen bug introduced in 247b7e9e58 2013-05-15 19:15:40 -04:00
Joey Hess
991d09139d add DNS library to Android build environment 2013-05-15 19:11:09 -04:00
http://joeyh.name/
8a286be1f3 Added a comment 2013-05-15 22:56:27 +00:00
Joey Hess
8fe7be98d4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-15 18:55:23 -04:00
Joey Hess
c62b54d80d start one git-cat-file per index file
This reverts 1c83b6c439 and properly fixes
the issue discussed there.

This makes git-annex behave much nicer in direct mode.
2013-05-15 18:46:38 -04:00
Joey Hess
bc628adca0 fix build 2013-05-15 18:33:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
d202c1ed92 Added a comment 2013-05-15 22:30:05 +00:00
Joey Hess
ee942c876f a few fixes for the test suite in direct mode
Still far from working.
2013-05-15 17:44:30 -04:00
Joey Hess
9a2f8b02e9 thread env through test suite
This will allow porting it to Windows, which cannot set environment except
when forking processes.

This is nasty, but HUnit can only test the IO monad, so
I cannot use a Reader monad.
2013-05-15 17:22:45 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4
139056c904 Added a comment: Just use Unix Paths like git does? 2013-05-15 20:43:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
758537d329 Added a comment 2013-05-15 18:29:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnAvbXOnK57sqgvZvxkbG74NUKBDwKDcuk
45b00920a5 Added a comment: my bad 2013-05-15 15:39:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnAvbXOnK57sqgvZvxkbG74NUKBDwKDcuk
72180b37f6 Added a comment: bup location data not synced through annex assistant 2013-05-15 15:08:54 +00:00
Richard Hartmann
416e2c63fe Typo (which broke a link) 2013-05-15 08:48:25 +02:00
https://www.google.com/accounts/o8/id?id=AItOawlJ2utMQgMEYAOs3Dfc6eZRyUzt4acNXUU
a380ece54e Added a comment: git on windows 2013-05-15 04:26:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
520e294c50 Added a comment: Duplicate bug report 2013-05-15 02:35:35 +00:00
Joey Hess
3c98920422 Debian: Add a menu file. 2013-05-14 20:27:03 -04:00
Joey Hess
465e4511a1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-14 20:25:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo
961f00c100 Added a comment: I also see the connection timed out 2013-05-15 00:19:42 +00:00
Joey Hess
dc483deb44 fix time 2013-05-14 20:18:53 -04:00
Joey Hess
5fc20678b0 fixed names 2013-05-14 20:18:27 -04:00
Joey Hess
25cb9a48da fix the day's Windows permissions damage 2013-05-14 20:15:14 -04:00
Joey Hess
adbbb71ccb windows installer is fully working 2013-05-14 19:59:14 -05:00
Joey Hess
2b35ad5c44 update 2013-05-14 20:14:56 -04:00
Joey Hess
7aec4c7889 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-14 20:13:04 -04:00
Joey Hess
9a8fec717f update 2013-05-14 20:12:13 -04:00
Joey Hess
3ce675d7c9 blog for the day 2013-05-14 20:12:08 -04:00
Joey Hess
513ee3ad8a update 2013-05-14 17:24:11 -04:00
Joey Hess
6cbca01261 add check for git 2013-05-14 17:24:00 -04:00
Joey Hess
73052a1c90 untested nullsoft installer generator 2013-05-14 17:01:45 -05:00
Joey Hess
d3ed8a3271 better error message for Windows stub 2013-05-14 16:38:26 -05:00
Joey Hess
959536ef03 fill in a few windows stubs 2013-05-14 16:32:03 -05:00
Joey Hess
813d09678a Merge remote-tracking branch 'gnu/windows' into windows 2013-05-14 15:45:04 -05:00
Joey Hess
5b5e5dd122 Merge remote-tracking branch 'gnu/windows' into windows 2013-05-14 15:43:47 -05:00
Joey Hess
a94eb38862 Merge remote-tracking branch 'gnu/windows' into windows 2013-05-14 15:38:31 -05:00
Joey Hess
8a2ff023a3 convert from internal git path when checking symlink standin file 2013-05-14 15:08:40 -05:00
Joey Hess
306a36260f typo 2013-05-14 15:44:49 -04:00
Joey Hess
7b92ffc3a1 more leaning toothpick fixes 2013-05-14 15:43:23 -04:00
Joey Hess
dc66b1f27d Merge branch 'master' into windows
Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs
2013-05-14 15:37:24 -04:00
Joey Hess
81cded2b9d detect local urls on DOS 2013-05-14 15:27:39 -04:00
Joey Hess
15af92291f Merge remote-tracking branch 'gnu/windows' into windows 2013-05-14 14:21:49 -05:00
Joey Hess
fee6cd4635 fix imports 2013-05-14 14:21:35 -05:00
Joey Hess
49e9296d5f update 2013-05-14 15:14:11 -04:00
Joey Hess
114a60fb9a update 2013-05-14 15:04:45 -04:00
Joey Hess
e7936b1a34 always try to read symlink; only fall back to looking inside file
On Windows with Cygwin, checking out a git-annex repo will create symlinks
on disk, so we need to always try to read the symlink, even when
core.symlinks says they're not supported.
2013-05-14 14:18:47 -04:00
Joey Hess
61a17fdc84 disable core.symlinks before enabling direct mode 2013-05-14 14:18:34 -04:00
Joey Hess
03eec12cff fix 2013-05-14 13:58:17 -04:00
Joey Hess
17952a893e fix imports 2013-05-14 13:53:29 -04:00
Joey Hess
1496342c9e typo 2013-05-14 13:52:30 -04:00