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

715 commits

Author SHA1 Message Date
Richard Hartmann
952f60ed65 Add doc/todo/wishlist:_git_annex_info_UUID/comment_2._comment 2014-01-02 09:33:03 +01:00
http://joeyh.name/
6ab23cd8e7 Added a comment 2014-01-02 02:16:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e3344c1c71 Added a comment 2014-01-02 01:32:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c65b7eda85 Added a comment 2014-01-02 01:31:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c37ac517ac Added a comment 2014-01-02 01:15:40 +00:00
Richard Hartmann
00c1be812e Add doc/todo/wishlist:_git_annex_info_UUID.mdwn 2014-01-02 02:11:23 +01:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
344110d443 Added a comment 2014-01-02 00:26:20 +00:00
http://joeyh.name/
bf17c8e5b3 Added a comment 2014-01-01 22:30:07 +00:00
Richard Hartmann
38239750e9 Add doc/todo/commit_in_direct_mode.mdwn 2014-01-01 22:55:27 +01:00
Richard Hartmann
5e0dad0972 Update comment 2014-01-01 22:48:32 +01:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
5977ec78d3 Added a comment 2014-01-01 21:32:56 +00:00
http://joeyh.name/
1bad712325 Added a comment 2013-12-29 20:16:45 +00:00
Joey Hess
41d09158db Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-29 16:13:35 -04:00
Joey Hess
81f498559a importfeed: Support youtube playlists. 2013-12-29 15:52:20 -04:00
http://joeyh.name/
951d3aa315 Added a comment 2013-12-29 18:21:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTIL7ubr5opWM69Q5VtCxuxC2H0SSnzic
70013ce1d1 Added a comment: Regarding the approach to connect all nodes in one network and stream from them 2013-12-29 07:32:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
2aa69e567c 2013-12-27 20:31:36 +00:00
Joey Hess
56ef896a25 Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-26 18:32:26 -04:00
Joey Hess
0de9135bc0 external special remote documentation and example script 2013-12-26 18:15:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkgy5Qf4bivpTfYPw_yh92OcDlesrVTREg
fbf7865ac9 2013-12-25 22:29:46 +00:00
http://joeyh.name/
55c14293db Added a comment 2013-12-21 16:27:16 +00:00
Richard Hartmann
b11d88dd17 doc/: s/amoung/among/gi 
Qouth ye olde [Wiktionary](http://en.wiktionary.org/wiki/amoung)

Archaic spelling of among.
 2013-12-18 22:09:18 +01:00
Joey Hess
8462e3787c Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-17 19:40:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
5e42aac261 2013-12-17 21:07:59 +00:00
Joey Hess
0419f241a4 I think I've convinced myself that the assistant is safe on windows despite the lack of lsof 2013-12-17 14:07:37 -04:00
Joey Hess
d4275b23eb close; fixed! 2013-12-16 22:51:01 -04:00
http://joeyh.name/
b05d43d924 Added a comment 2013-12-16 20:41:52 +00:00
Joey Hess
d20fc2235f fix link 2013-12-16 01:59:12 -04:00
http://joeyh.name/
66d9d81459 Added a comment 2013-12-16 05:55:29 +00:00
Joey Hess
6be19b0070 Programs from Linux and OSX standalone builds can now be symlinked into a directory in PATH as an alternative installation method, and will use readlink to find where the build was unpacked. 2013-12-15 15:57:41 -04:00
http://mildred.fr/
d9f5862e35 2013-12-13 13:38:01 +00:00
http://mildred.fr/
66514f6794 2013-12-13 11:22:14 +00:00
Joey Hess
551abf439f update on XMPP (going to be a real PITA) 2013-12-11 11:24:02 -04:00
Joey Hess
2fd63f3cfa port transferkeys to windows; make stopping in progress transfers work too (probably) 
transferkeys had used special FDs for communication, but that would be
quite annoying to do in Windows.

Instead, use stdin and stdout. But, to avoid commands like rsync stomping
on them and messing up the communications channel, they're duplicated to a
different handle; stdin is replaced with a null handle, and stdout is
replaced with a copy of stderr. This should all work in windows too.

Stopping in progress transfers may work on windows.. if the types unify
anyway. ;) May need some more porting.
 2013-12-10 23:19:18 -04:00
Joey Hess
714e031d19 todo 2013-12-10 14:34:35 -04:00
Joey Hess
2c7c07286c update 2013-12-10 01:45:21 -04:00
Joey Hess
8699a36438 update 2013-12-10 01:00:10 -04:00
Joey Hess
4a5ab9b1e7 Tweak magic number to fix bad behavior in Firefox, which was caused by an earlier fix to bad behavior in Chromium. 
Browsers are crap.
 2013-12-09 17:44:45 -04:00
Joey Hess
2e48dcf6a7 update 2013-12-09 16:00:48 -04:00
Joey Hess
012f770066 webapp 100% working in windows + chrome; slightly buggy in windows + firefox 2013-12-09 15:01:43 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE
be777bcc2d Added a comment: pseudocode 2013-12-08 15:23:36 +00:00
Joey Hess
2ef99ae3ef update 2013-12-07 11:47:17 -04:00
gan
1cfbc91375 Added a comment: Hook implementation? 2013-12-07 01:15:47 +00:00
http://grossmeier.net/
d2fd1bcb39 Added a comment 2013-12-05 21:20:54 +00:00
Joey Hess
71a25eb20e Merge branch 'master' of ssh://git-annex.branchable.com 2013-12-05 16:23:01 -04:00
http://joeyh.name/
3f54a43941 Added a comment 2013-12-05 19:57:32 +00:00
http://joeyh.name/
2b463b46d9 Added a comment 2013-12-05 19:52:52 +00:00
Joey Hess
139c4c3a9f update 2013-12-05 15:19:14 -04:00
Joey Hess
3a1c407ef9 fixed windows startup scan file add bug 2013-12-04 23:55:35 -04:00
Joey Hess
8ef79c1f83 windows wtf how did that work moment 2013-12-04 17:39:58 -04:00
Joey Hess
977cbf4fd0 close as dup at submitter request 2013-12-01 16:07:19 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE
252c3bc684 Added a comment: never mind 2013-12-01 18:34:05 +00:00
http://grossmeier.net/
75167c6452 rename forum/New_special_remote_suggeston_-_clean_directory.mdwn to todo/New_special_remote_suggeston_-_clean_directory.mdwn 2013-11-29 06:05:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYSw35UMlOf9rFlP5EUTBz7is5X09qVXI
ed99511720 Added a comment: Support on Motorola razr i 2013-11-28 16:10:38 +00:00
Joey Hess
0bea8a4c55 reinject: Allow to be used in direct mode. 2013-11-26 16:15:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnR6E5iUghMWdUGlbA9CCs8DKaoigMjJXw
f3d7f4337a Added a comment 2013-11-26 09:26:54 +00:00
Richard Hartmann
be43bb8f70 doc: perl -p -i -e s/certianly/certainly/ 2013-11-25 21:40:19 +01:00
Joey Hess
95221c7252 fixed 2013-11-25 16:20:56 -04:00
Joey Hess
87c75417ac OSX upgrades seem to be working now 2013-11-25 14:06:34 -04:00
http://joeyh.name/
d5c2bad48b Added a comment 2013-11-23 19:03:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE
97cc68be2a 2013-11-23 17:09:10 +00:00
Joey Hess
ad653e49cf add 2013-11-22 19:24:12 -04:00
http://joeyh.name/
16e7951d43 Added a comment 2013-11-22 16:58:51 +00:00
Joey Hess
0d7dd05bfd move 2013-11-22 12:52:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5Z8wzidsumLYQnHdrVxpCx8vsd9llSlg
2270dc977e Added a comment 2013-11-22 15:52:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
3e3e5e42d1 2013-11-20 06:45:08 +00:00
GLITTAH
edb50f786d Added a comment 2013-11-19 18:15:15 +00:00
Joey Hess
423e933800 respond 2013-11-19 13:48:31 -04:00
GLITTAH
b24b76006e 2013-11-19 02:56:32 +00:00
http://joeyh.name/
24d30acdc4 Added a comment 2013-11-15 20:51:18 +00:00
Joey Hess
3eeb721a90 combine bugs 2013-11-15 16:42:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk_Di-Ww6ffK-SCHQmIewEO_CdNjVXX17E
d47abf7c9f fix typo 2013-11-15 18:57:29 +00:00
gueux
36e41c7625 2013-11-15 15:12:28 +00:00
gueux
55282738bb rename todo/Check_if_an_upgrade_is_available_in_webapp.mdwn to todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn 2013-11-15 13:29:32 +00:00
gueux
742343b696 2013-11-15 13:28:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg
3953484cec Added a comment 2013-11-13 20:41:52 +00:00
Joey Hess
f30300e877 work around for windows watcher cabal build problem 2013-11-12 21:23:20 -04:00
Joey Hess
9a58de553c remove -Assistant from windows build flag 2013-11-12 17:39:11 -04:00
Joey Hess
4f373503f2 sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end. 2013-11-07 15:02:11 -04:00
Joey Hess
d99bdbbb84 Merge branch 'directguard' 2013-11-07 14:12:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
5e1a5ff508 2013-11-07 11:22:50 +00:00
Joey Hess
00c91816fb Merge branch 'master' into directguard 2013-11-06 13:02:35 -04:00
Joey Hess
3802f2f270 work around lack of receive.denyCurrentBranch in direct mode 
Now that direct mode sets core.bare=true, git's normal prohibition about
pushing into the currently checked out branch doesn't work.

A simple fix for this would be an update hook which blocks the pushes..
but git hooks must be executable, and git-annex needs to be usable on eg,
FAT, which lacks x bits.

Instead, enabling direct mode switches the branch (eg master) to a special
purpose branch (eg annex/direct/master). This branch is not pushed when
syncing; instead any changes that git annex sync commits get written to
master, and it's pushed (along with synced/master) to the remote.

Note that initialization has been changed to always call setDirect,
even if it's just setDirect False for indirect mode. This is needed because
if the user has just cloned a direct mode repo, that nothing has synced
with before, it may have no master branch, and only a annex/direct/master.
Resulting in that branch being checked out locally too. Calling setDirect False
for indirect mode moves back out of this branch, to a new master branch,
and ensures that a manual "git push" doesn't push changes directly to
the annex/direct/master of the remote. (It's possible that the user
makes a commit w/o using git-annex and pushes it, but nothing I can do
about that really.)

This commit was sponsored by Jonathan Harrington.
 2013-11-05 21:08:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
8efdc1a067 Added a comment: feedback 2013-11-05 21:23:12 +00:00
Joey Hess
4510819215 v5 for direct mode, with automatic upgrade 
This includes storing the current state of the HEAD ref, which git annex
sync is going to need, but does not make sync use it.
 2013-11-05 17:05:03 -04:00
http://joeyh.name/
27e940a3f9 Added a comment 2013-11-05 16:46:28 +00:00
Joey Hess
2e3b4469e3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-04 17:32:03 -04:00
Joey Hess
78449ed2ae devblog 2013-11-04 17:30:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
33e8e85bb4 2013-11-04 20:40:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e8641876a2 2013-11-04 11:55:35 +00:00
Joey Hess
230409441c Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 21:07:32 -04:00
Joey Hess
c2b979c550 respond 2013-11-02 20:48:41 -04:00
http://joeyh.name/
7c85dd6768 Added a comment 2013-11-03 00:19:35 +00:00
Joey Hess
e1a24974f1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 20:16:11 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
fcc68d3e32 Added a comment 2013-11-02 23:59:16 +00:00
http://joeyh.name/
5bb89b28eb Added a comment 2013-11-02 23:45:39 +00:00
Joey Hess
1de5eb4c81 respond 2013-11-02 19:44:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
081ce0b4f7 2013-11-02 23:14:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f3cc842390 2013-11-02 23:12:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
26ff2f95e9 2013-11-02 23:05:33 +00:00