mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20156 commits 13 branches 442 tags 103 MiB
Commit graph

14542 commits

Author SHA1 Message Date
http://id.clacke.se/
d2926f0526 Added a comment: VBScript + wscript to avoid DOS window 2014-06-21 02:09:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
bdde84c2c3 Added a comment 2014-06-21 01:56:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
bc99c5a203 git annex version added to bug report 2014-06-21 01:00:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
afc3789e2e link fixed 2014-06-21 00:55:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
416a3fa4e9 formatting fix 2014-06-21 00:51:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
cb2397918f fixed numeric list on my post 2014-06-21 00:45:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
a988a61b5b 2014-06-21 00:44:29 +00:00
cehteh
005bc32f02 2014-06-20 17:18:01 +00:00
azul
59ba0085ea Added a comment: c2hs required for cabal to install dependencies 2014-06-20 06:35:35 +00:00
azul
7b40f5e7bd Added a comment: conflict solved 2014-06-20 06:13:10 +00:00
http://joeyh.name/
7452ef1e25 Added a comment 2014-06-19 22:39:46 +00:00
http://joeyh.name/
6c58c796ec Added a comment 2014-06-19 22:16:21 +00:00
http://joeyh.name/
3aae6e15b0 Added a comment 2014-06-19 22:13:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
61418e1a84 Added a comment 2014-06-19 21:19:02 +00:00
Joey Hess
8fd2a0f65f Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-19 14:22:21 -04:00
Joey Hess
4a86430567 windows autobuild images now available from downloads.kitenet.net 
The autobuilder's own https cert is expired.
 2014-06-19 14:21:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl6na9aq_5k5_xwCOre03hskBZoNZ-Rcs4
deb707984e 2014-06-19 16:59:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlnoH5btjn_BLib3_IhES5uMhrzuOiwCYo
ed919f6ff4 Added a comment: sync options? 2014-06-19 13:16:51 +00:00
azul
3a82d57540 Added a comment: cabal fails to resolve dependencies 2014-06-19 08:49:06 +00:00
Joey Hess
63deeddbd5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-18 22:57:26 -04:00
Joey Hess
6555b1e686
devblog 2014-06-18 22:54:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
8756338821 Added a comment 2014-06-18 22:51:28 +00:00
http://joeyh.name/
b9c9a3d5cb Added a comment 2014-06-18 22:43:08 +00:00
Joey Hess
9bae4cda94 remove old note about unused needing lots of memory; it's used bloom filters for a while to run in constant ram 2014-06-18 18:39:19 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
6c25413e51 Added a comment 2014-06-18 22:28:27 +00:00
http://joeyh.name/
2285f8998b Added a comment 2014-06-18 20:54:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
f4638055f0 Added a comment 2014-06-18 20:15:42 +00:00
Joey Hess
5b478722da make DistributionUpdate download build-version files and use them in the info files 
Also automated downloading the builds, finally. I had done it by hand until
now.

Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.

This commit was sponsored by Peter Hogg.
 2014-06-18 15:24:18 -04:00
Joey Hess
a1cfdc1e37 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-18 14:30:21 -04:00
http://joeyh.name/
cef5c48e87 Added a comment 2014-06-18 18:12:47 +00:00
http://joeyh.name/
5aeba7f909 Added a comment 2014-06-18 17:36:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
ba37e07667 Added a comment 2014-06-18 17:31:58 +00:00
http://joeyh.name/
6ff890dddc Added a comment 2014-06-18 17:14:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
ea5c5e77b5 Added a comment: Reinstall GHC or Cabal? 2014-06-18 16:49:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
2c8d24cc5f removed 2014-06-18 16:41:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
62880aee47 Added a comment: Versions 2014-06-18 16:40:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
377614c8d1 Added a comment: Versions 2014-06-18 16:40:14 +00:00
http://joeyh.name/
450dd10b8f Added a comment 2014-06-18 16:35:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
06c49539a2 Added a comment: Version 2014-06-18 16:32:32 +00:00
Joey Hess
af90a03178 note that Fedora package does not include the webapp 2014-06-18 12:31:17 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
0b70397a56 Added a comment: Frustrating 2014-06-18 16:29:31 +00:00
http://joeyh.name/
09d1204e7b Added a comment 2014-06-18 16:22:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
c2f1c63ef6 2014-06-18 12:28:05 +00:00
https://launchpad.net/~maestro-alubia
506a402e45 Added a comment: Congratulations! 2014-06-18 09:08:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
9dc5c762f1 Added a comment 2014-06-18 07:35:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
65d3b9b25c 2014-06-18 00:14:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
64e1f6472c 2014-06-18 00:14:04 +00:00
Joey Hess
4873348200 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-17 19:52:17 -04:00
Joey Hess
9fb8038166 Windows: Assistant now logs to daemon.log. 
Yes, this means that git annex webapp on windows execs git-annex, which
execs itself to set env, and the execs itself again to redirect logs.

This is disgusting. This is Windows(TM).
 2014-06-17 19:27:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlPfB0_GcGJ827kZqRE1PF4D23rxpfOeg4
84469d8ba2 Added a comment 2014-06-17 19:18:09 +00:00
Joey Hess
8eb45f674f
update 2014-06-17 14:34:51 -04:00
Joey Hess
3b914da9bc
update 2014-06-17 14:33:47 -04:00
Joey Hess
611cd84bb2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-17 14:31:09 -04:00
Joey Hess
ee7be354a1 devblog 2014-06-17 14:29:00 -04:00
Joey Hess
5977e161f3 close 2014-06-17 14:07:16 -04:00
http://joeyh.name/
32c7fdc0f2 Added a comment 2014-06-17 17:18:34 +00:00
http://joeyh.name/
e027801e6e Added a comment 2014-06-17 17:10:28 +00:00
http://joeyh.name/
914ed75599 Added a comment 2014-06-17 16:56:32 +00:00
http://joeyh.name/
5f3f9601c9 Added a comment 2014-06-17 16:52:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
ba952aca3c 2014-06-17 13:47:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
ec14987706 Added a comment 2014-06-17 00:01:35 +00:00
Joey Hess
5b6f0e317e Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 19:56:19 -04:00
Joey Hess
9e1270d723
devblog 2014-06-16 19:55:45 -04:00
http://joeyh.name/
4a4238a373 Added a comment 2014-06-16 23:48:03 +00:00
http://joeyh.name/
672f359260 Added a comment 2014-06-16 23:47:36 +00:00
Joey Hess
257223c748 branch 2014-06-16 19:12:38 -04:00
Joey Hess
0af4dd673c permissions ugh 2014-06-16 19:12:01 -04:00
Joey Hess
784e916ded Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 18:35:59 -04:00
Joey Hess
d27891a70d split out windows service todo 2014-06-16 18:34:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
bd2626c8cd Added a comment 2014-06-16 18:19:20 +00:00
http://joeyh.name/
b031978e7a Added a comment 2014-06-16 18:04:48 +00:00
http://joeyh.name/
d96639cb51 Added a comment 2014-06-16 17:59:20 +00:00
http://joeyh.name/
a33baab2ab Added a comment 2014-06-16 17:58:22 +00:00
http://joeyh.name/
c46c963909 Added a comment 2014-06-16 17:55:13 +00:00
http://joeyh.name/
c30564d824 Added a comment 2014-06-16 17:52:34 +00:00
Joey Hess
e8b4eb0cdb Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 11:33:00 -04:00
Joey Hess
501cc8623a assistant: Fix one-way assistant->assistant sync in direct mode. 
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.

This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.

Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
 2014-06-16 11:32:13 -04:00
http://joeyh.name/
a78636e78a Added a comment 2014-06-16 15:10:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
52334386b9 Added a comment: debug output 2014-06-16 14:17:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8wY171R5c4u_jPmB6LU6n6Px2xePM4sE
f19b868173 2014-06-16 13:23:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
90d80a3a61 2014-06-16 13:08:18 +00:00
Frank2
9ddd8c306f 2014-06-14 22:25:25 +00:00
http://olivier.mehani.name/
7ba53fe00c Added a comment 2014-06-14 14:15:55 +00:00
http://olivier.mehani.name/
ed2f71e422 Added a comment: Manual solution 2014-06-14 13:59:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwfqF4wL6l_O26RyzoBowUMvQ_955Vpao
0a478056dd Added a comment 2014-06-14 06:29:55 +00:00
http://joeyh.name/
1dadac2390 Added a comment 2014-06-13 18:35:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
36ef4663af Added a comment 2014-06-13 18:30:25 +00:00
http://joeyh.name/
e9d411d0a6 2014-06-13 14:53:23 +00:00
Joey Hess
6f57e57cf0 add news item for git-annex 5.20140613 2014-06-13 10:34:36 -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
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
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
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
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
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
201bb931a3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-10 19:23:00 -04:00
Joey Hess
4d692a9097
devblog 2014-06-10 19:22:11 -04:00
Joey Hess
8f6a8b69a2 update 2014-06-10 16:16:57 -04:00
http://joeyh.name/
3614706fd6 Added a comment 2014-06-10 19:31:38 +00:00
http://joeyh.name/
f7baa697e7 Added a comment 2014-06-10 19:27:55 +00:00
http://joeyh.name/
32037f0cc0 Added a comment 2014-06-10 19:11:57 +00:00
feulif
6d0e58cb1e Added a comment 2014-06-10 18:43:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
f4eecd8b4a Added a comment 2014-06-10 18:24:22 +00:00
http://joeyh.name/
26121a4f94 Added a comment: nssm notes 2014-06-10 18:16:00 +00:00
http://joeyh.name/
57e03b8fce Added a comment: magic 2014-06-10 16:13:35 +00:00
martin
9ece87c421 Added a comment: git-annex add (called by sync) should do the job and bring the files back home (IMHO) 2014-06-10 15:58:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
5ec8bcfaa7 Added a comment 2014-06-10 02:18:43 +00:00
Joey Hess
03f186609f devblog 2014-06-09 20:16:01 -04:00
Joey Hess
2dfbbc6b43 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 19:47:31 -04:00
Joey Hess
d6711800ad avoid bad commits after interrupted direct mode sync (or merge) 
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.

Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.

This commit was sponsored by Tony Cantor.
 2014-06-09 19:40:28 -04:00
https://id.koumbit.net/anarcat
2c6929dd27 try to build an hybrid news feed 2014-06-09 23:24:20 +00:00
Joey Hess
193e702d73 harder 2014-06-09 17:43:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
b36bad94a1 Added a comment 2014-06-09 21:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
fe4eb0517d Added a comment 2014-06-09 20:34:55 +00:00
http://joeyh.name/
5f7d5c7d67 Added a comment 2014-06-09 19:44:49 +00:00
Joey Hess
920794ab6b bug 2014-06-09 15:43:52 -04:00
Joey Hess
70a00802a6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 15:32:24 -04:00
http://joeyh.name/
49cc5e1594 Added a comment 2014-06-09 19:29:09 +00:00
Joey Hess
7671d228af Avoid leaving behind .tmp files when failing in some cases, including importing files to a disk that is full. 2014-06-09 15:24:05 -04:00
Joey Hess
24915adab7 tagging 2014-06-09 15:09:03 -04:00