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

930 commits

Author SHA1 Message Date
Joey Hess
01b07a9ca6 update 2014-02-14 14:06:51 -04:00
Joey Hess
d007d1ac0c windows: hack to ensure HOME is always set 2014-02-14 14:03:24 -04:00
Joey Hess
c60f0b57d2 windows: Fix daemon pid file locking. 
Well, as much as it can be fixed on windows. Not atomic; not entirely
guarded against the wrong process having the pid file locked.
 2014-02-13 17:02:28 -04:00
Joey Hess
f11f7520b5 windows: Fix process termination code. 
The ctrl-c hack used before didn't actually seem to work.

No haskell libraries expose TerminateProcess. I tried just calling it via
FFI, but got segfaults, probably to do with the wacky process handle not
being managed correctly. Moving it all into one C function worked.

This was hell. The EvilLinker hack was just final icing on the cake.
We all know what the cake was made of.
 2014-02-13 15:53:10 -04:00
Joey Hess
84083ecdd3 Windows: Crazy hack to make file manager not start hidden underneath web browser window 
I can't even..
 2014-02-13 13:16:28 -04:00
Joey Hess
36e66997c6 Windows: Fix startAssistant to not wait for ever for a non-daemonizing process 
Seemed to fix several problems.
 2014-02-13 13:05:07 -04:00
Joey Hess
8952ccec1b windows: fix fsck --incremental to not crash 
Although it is still not incremental.
 2014-02-13 12:40:10 -04:00
http://joeyh.name/
13d44a32ce removed 2014-02-11 21:40:27 +00:00
http://joeyh.name/
9668a29a80 Added a comment 2014-02-11 21:39:46 +00:00
http://joeyh.name/
192e6805b3 Added a comment 2014-02-11 21:39:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
d6dfdca98f Added a comment 2014-02-11 21:05:01 +00:00
Joey Hess
029a1c431a
remove windows --git-dir unix style path hack 
This is no longer necessary, at least with msysgit 1.8.5.2.msysgit.0.
Its root cause may have been fixed by other recent git path fixes.
It was causing the webapp to fail to make repos on other drives.
 2014-02-11 16:12:22 -04:00
Joey Hess
2ed728e7e6
note 2014-02-11 14:16:15 -04:00
Joey Hess
fa24ba2520 plumb creds from webapp to initremote 
Avoids abusing setting environment variables, which was always a hack
and won't work on windows.
 2014-02-11 14:07:56 -04:00
http://schnouki.net/
4ae8685477 Added a comment 2014-02-11 13:38:54 +00:00
Joey Hess
66c9cb6e39
tried everything in webapp on windows. add list of TODOs 2014-02-10 18:24:36 -04:00
http://joeyh.name/
eb266ace3c Added a comment 2014-02-06 17:26:59 +00:00
Joey Hess
5d7777cbe2 set up git email config in clone repos too when running test 
This fixes the problem of the environment variables apparently not being
seen on Windows. I could probably remove the setting of the env vars from
Test.hs now as this covers it better.

Note that outside the test suite, git-annex on windows seems to manage to
configure the repo so commits work on its own.
 2014-02-04 14:31:52 -04:00
Joey Hess
2287c88bfd update 2014-02-03 21:24:23 -04:00
Joey Hess
1c997fd08c fix test suite to pass on windows 
On windows, the sync of the second cloned repo to origin failed, because
synced/master was a non-fast-forward. This may be a bug of its own, but
it's not the issue that this test was intended to test, so disconnect
the repos from origin before syncing.
 2014-02-03 12:12:50 -04:00
Joey Hess
08afe3a1f6 fix failing test case on Windows 
ensure file being modified is all read before it's opened for write
 2014-02-03 10:20:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
c6ee7f143a openwrt packages. multiplle architectures 2014-02-02 22:35:55 +00:00
Joey Hess
089c0109a2 Added ways to configure rsync options to be used only when uploading or downloading from a remote. Useful to eg limit upload bandwidth. 2014-02-02 16:06:34 -04:00
Joey Hess
ee164ccbbb windows test suite down to only 2 failures 2014-01-30 15:57:41 -04:00
Joey Hess
721cc0cd22 rework annexed object locking in direct mode & support Windows 
Seems that locking of annexed objects when they're being dropped was broken
in direct mode:

* When taking the lock before dropping, it created the .git/annex/objects
  file, as an empty file. It seems that the dropping code deleted that,
  but that is not right, and for all I know could in some situation cause
  a corrupted object to leak out.
* When the lock was checked, it actually tried to open each direct mode
  file, and checked if it was locked. Not the same lock used above, and
  could also fail if some consumer of the file locked it.

Fixed this, and added windows support by switching direct mode to lock a
.lck file.
 2014-01-28 16:43:11 -04:00
Joey Hess
4d0223e962 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-26 15:08:10 -04:00
Joey Hess
a3f61ea75d close 2014-01-26 15:00:57 -04:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
9f790028bd 2014-01-26 18:51:55 +00:00
Joey Hess
605fb7075b move to todo 2014-01-26 14:08:36 -04:00
Joey Hess
5fc2d760ea Optimise non-bare http remotes; no longer does a 404 to the wrong url every time before trying the right url. Needs annex-bare to be set to false, which is done when initially probing the uuid of a http remote. 2014-01-26 13:03:25 -04:00
Joey Hess
c0b6d9b343 close 2014-01-23 16:58:44 -04:00
Joey Hess
3da0064657 assistant unused file handling 
Make sanity checker run git annex unused daily, and queue up transfers
of unused files to any remotes that will have them. The transfer retrying
code works for us here, so eg when a backup disk remote is plugged in,
any transfers to it are done. Once the unused files reach a remote,
they'll be removed locally as unwanted.

If the setup does not cause unused files to go to a remote, they'll pile
up, and the sanity checker detects this using some heuristics that are
pretty good -- 1000 unused files, or 10% of disk used by unused files,
or more disk wasted by unused files than is left free. Once it detects
this, it pops up an alert in the webapp, with a button to take action.

TODO: Webapp UI to configure this, and also the ability to launch an
immediate cleanup of all unused files.

This commit was sponsored by Simon Michael.
 2014-01-22 22:53:18 -04:00
Joey Hess
4b55afe9e9 add "unused" preferred content expression 
With a really nice optimisation that keeps it from having any overhead
in normal operation!

This commit was sponsored by Ulises Vitulli.
 2014-01-22 16:35:32 -04:00
Joey Hess
02896ee15d preferred content stability analysis 2014-01-22 15:55:44 -04:00
Joey Hess
5f6ebfcd07 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-22 14:37:32 -04:00
Joey Hess
05ead99cc2 promote forum post to feature request; add design 2014-01-22 14:35:38 -04:00
http://olivier.mehani.name/
4207564827 Added a comment 2014-01-22 13:08:21 +00:00
Joey Hess
f2713a3bb9 benchmarked numcopies .gitattributes in preferred content 
Checking .gitattributes adds a full minute to a git annex find looking for
files that don't have enough copies. 2:25 increasts to 3:27. I feel this is
too much of a slowdown to justify making it the default. So, exposed two
versions of the preferred content expression, a slow one and a fast but
approximate one.

I'm using the approximate one in the default preferred content expressions
to avoid slowing down the assistant.
 2014-01-21 18:49:25 -04:00
Joey Hess
3159da2693 Add and use numcopiesneeded preferred content expression. 
* Add numcopiesneeded preferred content expression.
* Client, transfer, incremental backup, and archive repositories
  now want to get content that does not yet have enough copies.

This means the asssistant will make copies of files that don't yet
meet the configured numcopies, even to places that would not normally want
the file.

For example, if numcopies is 4, and there are 2 client repos and
2 transfer repos, and 2 removable backup drives, the file will be sent
to both transfer repos in order to make 4 copies. Once a removable drive
get a copy of the file, it will be dropped from one transfer repo or the
other (but not both).

Another example, numcopies is 3 and there is a client that has a backup
removable drive and two small archive repos. Normally once one of the small
archives has a file, it will not be put into the other one. But, to satisfy
numcopies, the assistant will duplicate it into the other small archive
too, if the backup repo is not available to receive the file.

I notice that these examples are fairly unlikely setups .. the old behavior
was not too bad, but it's nice to finally have it really correct.

.. Almost. I have skipped checking the annex.numcopies .gitattributes
out of fear it will be too slow.

This commit was sponsored by Florian Schlegel.
 2014-01-20 17:35:29 -04:00
Joey Hess
5ddbd24a1c stability analysis 2014-01-20 17:11:02 -04:00
Joey Hess
d66535f065 global numcopies setting 
* numcopies: New command, sets global numcopies value that is seen by all
  clones of a repository.
* The annex.numcopies git config setting is deprecated. Once the numcopies
  command is used to set the global number of copies, any annex.numcopies
  git configs will be ignored.
* assistant: Make the prefs page set the global numcopies.

This global numcopies setting is needed to let preferred content
expressions operate on numcopies.

It's also convenient, because typically if you want git-annex to preserve N
copies of files in a repo, you want it to do that no matter which repo it's
running in. Making it global avoids needing to warn the user about gotchas
involving inconsistent annex.numcopies settings.
(See changes to doc/numcopies.mdwn.)

Added a new variety of git-annex branch log file, that holds only 1 value.
Will probably be useful for other stuff later.

This commit was sponsored by Nicolas Pouillard.
 2014-01-20 16:47:56 -04:00
Joey Hess
e7f8c1911a design for preferred content numcopies check 2014-01-20 14:28:33 -04:00
Joey Hess
cfa6865056 wontfix 2014-01-20 12:36:19 -04:00
Joey Hess
7e6e018408 followups and closures 2014-01-19 17:56:24 -04:00
http://olivier.mehani.name/
9c23012b5a 2014-01-16 02:27:25 +00:00
http://olivier.mehani.name/
895f4584f3 Added a comment 2014-01-16 02:22:19 +00:00
Joey Hess
e10972905a wontfix 2014-01-15 13:20:03 -04:00
https://launchpad.net/~fbe
467651e653 2014-01-15 12:23:07 +00:00
http://olivier.mehani.name/
2f605d7d56 Added a comment 2014-01-15 02:26:31 +00:00
http://olivier.mehani.name/
2d3371f525 2014-01-15 00:48:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkgy5Qf4bivpTfYPw_yh92OcDlesrVTREg
1ed7a4c144 Added a comment 2014-01-12 20:31:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlzlNQbf6wBgv9j6-UqfpXcQyAYMF8S3t4
72bbafadb2 Added a comment 2014-01-12 09:19:32 +00:00
Joey Hess
8e15fae706 foo 2014-01-10 15:30:09 -04:00
namelessjon
7f7a8da320 Added a comment: inode starvation 2014-01-09 15:30:16 +00:00
Joey Hess
1dd4b17bdf update 2014-01-08 20:01:12 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlgyVag95OnpvSzQofjyX0WjW__MOMKsl0
48bf3ec4f6 2014-01-08 22:50:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
711a78deb8 2014-01-08 06:45:01 +00:00
Joey Hess
71dea8d173 move wishlist item out out of bug list 2014-01-06 14:19:42 -04:00
http://joeyh.name/
b8e9a3e56d Added a comment 2014-01-04 19:18:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
5b10c51e00 2014-01-04 02:29:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA
9f80431d33 2014-01-02 22:33:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlKguAW2rkgcUqK2mmxlYnh4Jj578A4AIA
87fc579c2d 2014-01-02 22:30:48 +00:00
Joey Hess
07c5c4d8f3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-02 13:27:08 -04:00
http://joeyh.name/
e0624c933e Added a comment 2014-01-02 17:25:50 +00:00
Joey Hess
2e963f7ba0 close 2014-01-02 13:23:58 -04:00
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
Joey Hess
768c323e74 add 2013-11-02 16:48:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ
c4e7b2a4d4 Added a comment 2013-10-29 00:29:03 +00:00
Joey Hess
230bfa9688 add --want-get and --want-drop options 
New --want-get and --want-drop options which can be used to test preferred
content settings. For example, "git annex find --in . --want-drop"
 2013-10-28 14:50:17 -04:00
http://joeyh.name/
66c094a251 Added a comment 2013-10-28 17:11:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ
d245201e6d 2013-10-28 08:38:06 +00:00
lorenzo
ca77441eeb removed 2013-10-27 23:56:44 +00:00
lorenzo
3ab515722d Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS 2013-10-27 23:56:26 +00:00
lorenzo
3cc3692d3d Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS 2013-10-27 23:55:06 +00:00
Joey Hess
2a872dc576 thought 2013-10-26 15:58:02 -04:00
Joey Hess
9bca19052c move wishlist todo from forum 2013-10-26 15:56:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
919e1f48db Added a comment 2013-10-19 15:43:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
0e75b69fd8 removed 2013-10-19 15:43:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
c74cb9b352 Added a comment 2013-10-19 15:39:52 +00:00
http://joeyh.name/
9d318b655b Added a comment 2013-10-19 15:33:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
0b1ed85008 2013-10-19 15:13:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlhE8Xar6m4x3JSILXdm-Y5KhwHTH5qzKQ
a20f7eecdd Added a comment: +1 2013-10-14 14:43:11 +00:00
GLITTAH
d8e5a7cf64 2013-10-13 23:07:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
fa969371a3 Added a comment 2013-10-07 13:33:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
3db1985a01 Added a comment 2013-10-05 10:45:16 +00:00
http://joeyh.name/
71dba0187a Added a comment 2013-10-04 20:50:34 +00:00
http://joeyh.name/
1537c21eb0 Added a comment 2013-10-04 20:17:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
13f776140d 2013-10-04 14:41:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
f0ec3d355a 2013-10-04 14:39:15 +00:00
http://cstork.org/
c5ef652a4d Added a comment: How should this interact with the trust model and location tracking? 2013-10-04 11:13:11 +00:00
Joey Hess
6b37fcffd8 assistant: More robust inotify handling; avoid crashing if a directory cannot be read. 2013-09-30 13:11:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl-g0hYpGY11pBP_42lHh5GWTyFuB4UwH8
7a6c7acb51 Added a comment 2013-09-25 23:08:56 +00:00
Joey Hess
5ff9224b10 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-25 15:30:45 -04:00
http://joeyh.name/
f30b4f7208 Added a comment 2013-09-25 18:47:13 +00:00
http://joeyh.name/
f1d069164b Added a comment 2013-09-25 18:03:55 +00:00
Joey Hess
9cae3a21f6 dup 2013-09-25 13:14:50 -04:00
http://joeyh.name/
af2f437bb4 Added a comment 2013-09-25 17:14:28 +00:00
https://id.koumbit.net/anarcat
3399d826d4 mention wishlist 2013-09-21 14:06:07 +00:00
https://id.koumbit.net/anarcat
136d307d12 2013-09-21 14:04:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmOsy6nbvPyXLd--qqjPMLnVIzxgZwtKlQ
306eddd575 Added a comment 2013-09-20 19:03:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo
746fd0ea74 Added a comment 2013-09-20 11:29:04 +00:00
http://joeyh.name/
591d6a3281 Added a comment 2013-09-19 21:01:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmOsy6nbvPyXLd--qqjPMLnVIzxgZwtKlQ
fa06e0abf7 2013-09-17 06:52:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmOsy6nbvPyXLd--qqjPMLnVIzxgZwtKlQ
064d931062 2013-09-17 06:52:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmOsy6nbvPyXLd--qqjPMLnVIzxgZwtKlQ
e4388f1149 2013-09-17 06:49:48 +00:00
Joey Hess
d903da141f close 2013-09-13 16:02:09 -04:00
Joey Hess
5eb08006c1 close 2013-09-13 15:59:38 -04:00
Joey Hess
aa23b6cf1a Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-13 15:58:06 -04:00
Joey Hess
f3d4746e04 close 2013-09-13 15:57:34 -04:00
Joey Hess
11c4fa96ea close 2013-09-13 15:56:34 -04:00
http://joeyh.name/
8dbddff424 Added a comment 2013-09-13 19:53:52 +00:00
Joey Hess
f325f8a384 move to todo 2013-09-13 15:25:53 -04:00
Joey Hess
26ce5020d7 move wishlist items to todo 2013-09-13 15:09:37 -04:00
https://id.koumbit.net/anarcat
113f1f4b4c thanks! 2013-09-12 21:14:13 +00:00
Joey Hess
ccbb379536 avoid setting PREFIX if already set 2013-09-12 16:22:03 -04:00
https://id.koumbit.net/anarcat
961c63f9a8 make my concerns more explicit 2013-09-12 19:18:50 +00:00
https://id.koumbit.net/anarcat
0a03cbb9a5 2013-09-12 18:21:31 +00:00
Joey Hess
5aecf2b42d Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-12 14:06:19 -04:00
https://id.koumbit.net/anarcat
aa8fc208a4 sorry for the noise 2013-09-12 17:50:34 +00:00
https://id.koumbit.net/anarcat
f6d8b1aec2 2013-09-12 17:50:00 +00:00
https://id.koumbit.net/anarcat
2307f7a59a 2013-09-12 17:48:56 +00:00
Joey Hess
662503a28f merged 2013-09-12 13:03:17 -04:00
Joey Hess
dfcf72890d enbolden man page 2013-09-12 12:59:53 -04:00
Joey Hess
6c8613c8cb close 2013-09-12 12:48:28 -04:00
gueux
3260c5605f Added a comment: syntax 2013-09-12 14:05:16 +00:00
gueux
fec02101d5 rename bugs/importfeed:_allow___36____123__itemdate__125___with_--template.mdwn to todo/importfeed:_allow___36____123__itemdate__125___with_--template.mdwn 2013-09-12 13:31:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
b4a35bd981 2013-09-12 10:34:40 +00:00
https://id.koumbit.net/anarcat
a20b460fdd status update: code has been reviewed, needs merge 2013-09-11 15:13:20 +00:00
https://id.koumbit.net/anarcat
1b9de447db prototype ready for review 2013-09-11 05:20:05 +00:00
https://id.koumbit.net/anarcat
252381c57d 2013-09-11 00:54:35 +00:00
https://id.koumbit.net/anarcat
f23c980123 document some IRC discussions 2013-09-11 00:25:29 +00:00
https://id.koumbit.net/anarcat
84c206eabf sign 2013-09-10 23:37:25 +00:00
https://id.koumbit.net/anarcat
3c79cf2d1d clarify, simplify with toc 2013-09-10 21:54:52 +00:00
https://id.koumbit.net/anarcat
2915124b12 add another idea: use an external bittorrent client 2013-09-10 21:52:23 +00:00
https://id.koumbit.net/anarcat
b048e13a8c remove self-recriminations and keep the good stuff, thanks for this great idea! :) 2013-09-10 21:45:11 +00:00
https://id.koumbit.net/anarcat
0536b69e15 fix link 2013-09-10 21:40:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
e34c3b087b 2013-09-09 21:55:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c4e6b01b02 Added a comment 2013-09-09 11:50:05 +00:00
http://joeyh.name/
a7e4d49035 2013-09-09 11:30:26 +00:00
Joey Hess
89731a2737 clarify 2013-09-06 14:08:58 -04:00
Joey Hess
fe22a04513 close 2013-09-06 14:08:15 -04:00
Joey Hess
c5236b7f74 close 2013-09-04 23:25:41 -04:00
Gastlag
d9bc4bd276 Added a comment: Gittorrent 2013-08-28 21:49:56 +00:00
Richard Hartmann
56df3e498c Fix own comment 2013-08-28 22:01:49 +02:00
http://a-or-b.myopenid.com/
5ecdb286ac 2013-08-28 01:43:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d50bb5012d Added a comment 2013-08-27 20:02:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d85592c80a 2013-08-26 23:00:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
93ef36d655 2013-08-26 22:57:14 +00:00
Joey Hess
ad5937a0ce thought 2013-08-26 16:03:50 -04:00
https://id.koumbit.net/anarcat
db6ba4163b removed 2013-08-26 05:07:59 +00:00
https://id.koumbit.net/anarcat
1eb7f214e1 Added a comment: documentation? 2013-08-26 05:06:19 +00:00