Commit graph

23819 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawkutSE8_3fFAETmO_E598zja4gKwYXbb8E
1db143b0a9 2015-04-13 14:50:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkutSE8_3fFAETmO_E598zja4gKwYXbb8E
fe59152921 2015-04-13 14:27:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
83b06ddb6f Added a comment 2015-04-13 14:21:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawksMCAJI5ZUb1LaKL9nxVzEOTsfNkXI7WU
852e6d91b3 2015-04-13 06:18:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
28fe60afa2 2015-04-12 23:12:31 +00:00
CandyAngel
aa75c22427 Added a comment 2015-04-12 22:12:53 +00:00
Joey Hess
2be4834822 info: Added --bytes option. 2015-04-12 14:08:40 -04:00
Joey Hess
0c1789d93f Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-12 12:58:51 -04:00
Joey Hess
b14ec45aa8 info dir: Added information about repositories that contain files in the specified directory.
This is a nearly free feature; it piggybacks on the location log lookups
done for the numcopies stats. So, the only extra overhead is updating
the map of repository sizes.

However, I had to switch to Data.Map.Strict, which needs containers 0.5.
If backporting to wheezy, will probably need to revert this commit.
2015-04-12 12:54:41 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
a850976a0d Added a comment: missed the comment 2015-04-12 13:55:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
968f4db8db Added a comment: now available 2015-04-12 13:49:04 +00:00
cfljam
393f15f9a8 started thread 2015-04-11 20:44:45 +00:00
Joey Hess
0ee0795b01 response 2015-04-11 10:46:51 -04:00
Øyvind A. Holm
6b28b9e281 doc/git-annex-{expire,fromkey}.mdwn: Fix a couple of typos 2015-04-11 16:37:15 +02:00
Joey Hess
aed0ea1763 review 2015-04-11 10:03:51 -04:00
Joey Hess
6ee03fc311 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-11 09:46:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
cdd924176d 2015-04-11 12:26:21 +00:00
Joey Hess
2b79e6fe08 a few hlints 2015-04-11 00:10:34 -04:00
https://id.koumbit.net/anarcat
dd7bfa19f9 Added a comment 2015-04-10 21:33:02 +00:00
Joey Hess
32aa42de7d Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-10 17:17:15 -04:00
Joey Hess
3ed5b5b84c devblog 2015-04-10 17:16:47 -04:00
Joey Hess
40aae2dd11 unused import 2015-04-10 13:16:04 -04:00
https://launchpad.net/~eliasson
02ac2acea4 Added a comment 2015-04-10 15:35:30 +00:00
http://lhealy.livejournal.com/
6eb750c2e6 Added a comment 2015-04-10 15:35:16 +00:00
Joey Hess
d3d92abf95 spotted a few more places where diff-tree needed --
None of these are very likely at all to ever be ambiguous, since tree
refs almost never have symbolic names and the sha is very unlikely
to be in the work tree.. But, let's get it right!
2015-04-09 21:22:35 -04:00
Joey Hess
2879adc551 fix union merge to call diff-index with -- after the ref
Otherwise, if there's a file in the repo with a name matching the ref,
git could get confused and the merge not work.
2015-04-09 21:13:28 -04:00
Joey Hess
06211738c1 Fix activity log parsing.
I had some cargo culting in there that used the wrong type, so it failed
to parse old logs, and overwrote them with the new log.
2015-04-09 21:02:38 -04:00
Joey Hess
6387281cc8 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-09 17:05:53 -04:00
Joey Hess
00a8abac25 comment 2015-04-09 17:05:41 -04:00
https://launchpad.net/~eliasson
f469e8916b Added a comment 2015-04-09 20:43:08 +00:00
Joey Hess
6c884fd556 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-09 16:40:52 -04:00
Joey Hess
0bff7e7596 add news item for git-annex 5.20150409 2015-04-09 16:40:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkQOUUx4LVAk6EnstSLvdv7gZc0NsRlHXw
b149f16915 Added a comment 2015-04-09 20:37:52 +00:00
Joey Hess
500cfbea5c devblog 2015-04-09 16:32:25 -04:00
Joey Hess
055e101c54 response 2015-04-09 16:32:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
3575ee59e2 2015-04-09 19:53:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw
81fa244d5b 2015-04-09 19:48:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw
e4653cda4c 2015-04-09 19:47:44 +00:00
Joey Hess
ce0a82f493 contentlocationn: New plumbing command. 2015-04-09 15:34:47 -04:00
Joey Hess
b22aacab44 prep release 2015-04-09 15:06:46 -04:00
Joey Hess
fa97dd9c3b Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-09 15:03:53 -04:00
Joey Hess
2736c59204 fix webapp reversion caused by relative path changes
webapp: When adding another local repository, and combining it with the
current repository, the new repository's remote path was set to "." rather
than the path to the current repository. This was a reversion caused by the
relative path changes in 5.20150113.
2015-04-09 14:59:08 -04:00
Joey Hess
148d5b2009 followup 2015-04-09 14:33:11 -04:00
Joey Hess
164803007d followup 2015-04-09 14:29:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
404a69b37d 2015-04-09 18:26:39 +00:00
Joey Hess
f24566ddde cannot reproduce 2015-04-09 14:15:13 -04:00
Joey Hess
b99b8d5d4c followup to bug I cannot reproduce, and analysis based presumptive fix 2015-04-09 14:03:44 -04:00
Joey Hess
e1d1c4f51c followup 2015-04-09 13:49:11 -04:00
Joey Hess
9136d3c86f comment 2015-04-09 13:45:47 -04:00
Joey Hess
44c897ef74 moreinfo needed 2015-04-09 13:42:28 -04:00