Commit graph

17153 commits

Author SHA1 Message Date
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
6633af6736 Added a comment 2014-01-19 23:56:18 +00:00
Joey Hess
df5e2e3d65 gathd 2014-01-19 19:19:19 -04:00
Joey Hess
12302cd05d Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-19 18:48:17 -04:00
http://joeyh.name/
348a270cfe Added a comment 2014-01-19 22:43:11 +00:00
Joey Hess
b0044a4a0c devblog 2014-01-19 18:12:24 -04:00
Joey Hess
e3625e3d89 include information about remotes just uloaded to when calling handleDropsFrom 2014-01-19 18:11:47 -04:00
Joey Hess
7e6e018408 followups and closures 2014-01-19 17:56:24 -04:00
Joey Hess
b6ba0bd556 sync --content: New option that makes the content of annexed files be transferred.
Similar to the assistant, this honors any configured preferred content
expressions.

I am not entirely happpy with the implementation. It would be nicer if
the seek function returned a list of actions which included the individual
file gets and copies and drops, rather than the current list of calls to
syncContent. This would allow getting rid of the somewhat reundant display
of "sync file [ok|failed]" after the get/put display.

But, do that, withFilesInGit would need to somehow be able to construct
such a mixed action list. And it would be less efficient than the current
implementation, which is able to reuse several values between eg get and
drop.

Note that currently this does not try to satisfy numcopies when
getting/putting files (numcopies are of course checked when dropping
files!) This makes it like the assistant, and unlike get --auto
and copy --auto, which do duplicate files when numcopies is not yet
satisfied. I don't know if this is the right decision; it only seemed to
make sense to have this parallel the assistant as far as possible to start
with, since I know the assistant works.

This commit was sponsored by Øyvind Andersen Holm.
2014-01-19 17:49:54 -04:00
Richard Hartmann
83562fccbc Typo 2014-01-19 22:41:36 +01:00
https://www.google.com/accounts/o8/id?id=AItOawniCRkhl_W87gOK5eElfsef3FoUsUFpAr4
eee3540e2d create 2014-01-19 19:17:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkq2cjugiSvKWiWmcah3CPBqviQV_cin9I
f6c45f8ba4 Added a comment: The world of Mac 2014-01-19 14:13:55 +00:00
https://arthur.lutz.im/
8c027c5ced added bug about .local adresses 2014-01-19 10:53:10 +00:00
http://joeyh.name/
c5c339e87e Added a comment 2014-01-18 22:39:37 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
215c02f0a5 2014-01-18 22:08:15 +00:00
Joey Hess
1729205dba devblog 2014-01-18 17:26:34 -04:00
Yaroslav Halchenko
bae8392ea6 seed .mailmap file for more sensible git shortlog 2014-01-18 15:50:57 -04:00
Joey Hess
85185b8f50 Allow --all to be mixed with matching options like --copies and --in (but not --include and --exclude). 2014-01-18 14:58:56 -04:00
Joey Hess
8ce515ffe4 improve matcher data type to allow matching Keys, instead of just files (no behavior changes) 2014-01-18 14:51:55 -04:00
Joey Hess
a135bbd5a2 note that --all can't be mixed with eg --copies 2014-01-18 13:52:35 -04:00
Joey Hess
939eb666fe clarify sync 2014-01-18 13:26:47 -04:00
Joey Hess
2b1a7895fc list: Fix specifying of files to list. 2014-01-18 13:25:06 -04:00
Joey Hess
163aee374a improve output when there are no known special remotes 2014-01-18 13:21:12 -04:00
Yaroslav Halchenko
0bf41b335b Minor git-annex.mdwn tune ups (trailing spaces, typos, more consistency in tense)
Conflicts:
	doc/git-annex.mdwn -- I have managed to work on an old copy, so overlapped a bit
2014-01-18 13:06:15 -04:00
Joey Hess
d793f20886 whereis supports --json, add option 2014-01-18 13:05:56 -04:00
Joey Hess
456c9eedb0 status: Support --json. 2014-01-18 12:05:10 -04:00
Joey Hess
babd03d252 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-18 12:01:40 -04:00
Joey Hess
1d90e72e91 Remove --json option from commands not supporting it. 2014-01-18 11:54:43 -04:00
Joey Hess
dce9faf6e4 close 2014-01-18 11:44:58 -04:00
http://joeyh.name/
386ce9395d Added a comment 2014-01-18 15:43:00 +00:00
Joey Hess
099c650292 avoid trying to find minimum element of empty map 2014-01-18 11:38:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
9135cb7b7c 2014-01-18 06:13:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
f49edaf104 Added a comment: could it be part/reason of the problem 2014-01-18 06:05:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
2535102e74 Added a comment: repair seems to be also confused 2014-01-18 05:47:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
e714837502 Added a comment: git annex fix starts fixing but then spits bulk of errors 2014-01-18 05:42:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
a2fe022d68 2014-01-18 05:39:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnRRUUZo3W7pAoRoST8P_l0PtUBhvYuzDg
272a661f54 Added a comment: web storage 2014-01-17 22:59:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmz8d2M0lQDYWLSbDQSjYRHfrQkWKgPu60
8e2d2a77a5 Added a comment: re: long polling 2014-01-17 20:27:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawll4Kgp7nMuOKdB0FfbcYZ3KRq7HCS0Slc
029fb5bfc8 Added a comment: Using Gitolite 3.2 2014-01-17 20:14:16 +00:00
http://joeyh.name/
5a3d394b1f Added a comment 2014-01-17 19:36:39 +00:00
Joey Hess
1d3e60830d remove debug print 2014-01-17 15:09:03 -04:00
http://joeyh.name/
8eb13b1ee6 Added a comment 2014-01-17 19:07:11 +00:00
Joey Hess
3cbb366ebc Really fix FTBFS on mipsel and sparc due to test suite not being available on those architectures. 2014-01-17 14:48:56 -04:00
Joey Hess
9a5944c414 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-17 13:48:20 -04:00
Joey Hess
0d544649d0 catch exception checking if url exists when network is disconnected
Leads to better failure message (or possibly fallback to another remote).
2014-01-16 21:24:17 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM
4b4c6277e5 Added a comment: Still crashing (again) 2014-01-16 23:33:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkKNY4BvwyEilAJql8-Q6WpdmJjjntfLHA
9b11c2c0a2 2014-01-16 23:03:59 +00:00
stp
b7dd9f583d Added a comment: Probably confirming this bug 2014-01-16 19:59:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
343246d6b7 Added a comment 2014-01-16 19:11:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
84c2e08568 Added a comment 2014-01-16 18:53:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawll4Kgp7nMuOKdB0FfbcYZ3KRq7HCS0Slc
4c7c4fc4d0 Added a comment: Rebase all branches 2014-01-16 17:47:45 +00:00