Commit graph

21168 commits

Author SHA1 Message Date
yomguy
f22edfebab 2016-09-29 14:29:24 +00:00
yomguy
a962f341bd 2016-09-29 14:26:12 +00:00
yomguy
942095d7ca 2016-09-29 14:24:49 +00:00
git-annex@5b470e1f6ed6d30997d729f0a8b1c841dea886f1
2f91b3677c Added a comment: Using gitolite 3.6.6 mirror not working with annex 2016-09-28 18:12:56 +00:00
Joey Hess
3416cd8148
remove incorrect bit about multiple concurrent transfers, and improve description of protocol flow 2016-09-26 19:19:32 -04:00
Joey Hess
410b1c2b1f
todo 2016-09-26 19:06:56 -04:00
Joey Hess
6bdb6d4570
devblog 2016-09-26 16:53:42 -04:00
Joey Hess
76e5d8bf8a
comment 2016-09-26 16:53:27 -04:00
Joey Hess
f3b84f4603
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-26 16:49:21 -04:00
Joey Hess
a8734698eb
more profiling 2016-09-26 16:39:18 -04:00
Joey Hess
a197cf743d
profiling 2016-09-26 15:49:42 -04:00
sven.rieke@2bfe1de15de1bb402f962e41f9e5bfc1be1cf8d1
a1c7b514e7 2016-09-25 15:01:28 +00:00
sven.rieke@2bfe1de15de1bb402f962e41f9e5bfc1be1cf8d1
d8a714a881 2016-09-25 15:00:18 +00:00
madduck
40f41c3c4d 2016-09-25 13:25:03 +00:00
PaulK
ad5c60414e Added a comment 2016-09-25 03:08:41 +00:00
erics
348be33161 2016-09-25 02:28:19 +00:00
erics
a11c700aea Added a comment 2016-09-25 00:33:57 +00:00
PaulK
8b2d5e194f Added a comment 2016-09-24 04:16:52 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
9c651b9608 Added a comment: +may be "byte-target" field? ;) 2016-09-24 02:43:22 +00:00
Joey Hess
a59148c3a7
cleanup 2016-09-23 09:47:48 -04:00
Joey Hess
d1dabb3327
add news item for git-annex 6.20160923 2016-09-23 09:46:19 -04:00
https://anarc.at/openid/
184153ba98 Added a comment: thanks for considering this! 2016-09-22 12:43:12 +00:00
JasonWoof
b1bdb2b898 Added a comment: simpler use case 2016-09-22 00:40:08 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
8510652dd4 Added a comment 2016-09-21 22:49:56 +00:00
Joey Hess
a862e10f7c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 18:02:53 -04:00
Joey Hess
d9a0f26560
devblog 2016-09-21 17:56:50 -04:00
Joey Hess
c8edd22aee
update 2016-09-21 17:56:40 -04:00
Joey Hess
ef681321a9
comment 2016-09-21 17:53:59 -04:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
29b29a81fa Added a comment: re: regular ssh remote 2016-09-21 21:30:25 +00:00
Joey Hess
c910004d50
addurl, importfeed: Improve behavior when file being added is gitignored. 2016-09-21 17:21:48 -04:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
04ac96e232 Added a comment: re: mangling is normal 2016-09-21 21:12:16 +00:00
Joey Hess
f7ac2bc868
comment 2016-09-21 16:46:45 -04:00
Joey Hess
db2eba442a
comment 2016-09-21 16:38:02 -04:00
Joey Hess
44acb145e0
comment 2016-09-21 16:23:41 -04:00
Joey Hess
ca5902e14f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 16:15:13 -04:00
Joey Hess
bd2cfe008c
response 2016-09-21 16:14:11 -04:00
Joey Hess
0de88a9b68
response 2016-09-21 16:05:50 -04:00
Joey Hess
10b22a2548
comment 2016-09-21 15:58:02 -04:00
Joey Hess
3b2222d753
update 2016-09-21 15:53:34 -04:00
Joey Hess
181d027ace
merge 2016-09-21 15:47:37 -04:00
Joey Hess
08b7832d9d
comment 2016-09-21 15:39:32 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
3ed30143a7 Added a comment 2016-09-21 19:32:07 +00:00
Joey Hess
5057234dec
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 15:24:53 -04:00
Joey Hess
a569f195b7
fix bugs in handing of deep branches with sync and adjusted branches
* sync: Previously, when run in a branch with a slash in its name,
  such as "foo/bar", the sync branch was "synced/bar". That conflicted
  with the sync branch used for branch "bar", so has been changed to
  "synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
  such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
  That conflicted with the adjusted branch used for branch "bar",
  so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
  changes back to the parent branch when it had a slash in its name.
  This bug has been fixed.

Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.

Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.

In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.

This commit was sponsored by Riku Voipio.
2016-09-21 15:23:47 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
8abcc4c282 Added a comment: Pre Commit Hook 2016-09-21 19:20:05 +00:00
Joey Hess
8dae86eac2
bug 2016-09-21 14:57:20 -04:00
Joey Hess
489b9c8869
comments 2016-09-21 14:29:17 -04:00
Joey Hess
f6fc40456d
comment, retitle 2016-09-21 13:42:42 -04:00
Joey Hess
ce03779e8c
comment and close 2016-09-21 13:32:45 -04:00
Joey Hess
460f7c09b7
response 2016-09-21 13:22:47 -04:00
Joey Hess
74c6d5a8ff
comment 2016-09-21 13:19:02 -04:00
Joey Hess
154a501b76
comment 2016-09-21 13:17:03 -04:00
Joey Hess
886ef2d005
lacking problem description 2016-09-21 13:09:35 -04:00
Joey Hess
c2218b78c3
close 2016-09-21 13:06:34 -04:00
Joey Hess
1702505f60
comment 2016-09-21 13:06:12 -04:00
Joey Hess
bfc8d649b8
comment 2016-09-21 12:56:35 -04:00
Joey Hess
6c6304b2f2
comment 2016-09-21 12:53:29 -04:00
Joey Hess
d905d418d3
comment 2016-09-21 12:51:40 -04:00
Joey Hess
9ed7246a60
answer 2016-09-21 12:49:38 -04:00
Joey Hess
7bbb9f9370
comment 2016-09-21 12:16:52 -04:00
Joey Hess
3d5cae918c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-21 11:58:49 -04:00
Joey Hess
e5760d00ac
update 2016-09-21 11:32:40 -04:00
braiamp@5e499cae72e60f63a517d773978deffdfec35c4c
c1c132c2d7 2016-09-21 05:35:43 +00:00
PaulK
13ed6c83bb Added a comment 2016-09-19 04:39:08 +00:00
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1
d4998bfb51 Added a comment: Groups... 2016-09-18 20:35:01 +00:00
kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1
132c074e28 2016-09-18 18:57:18 +00:00
https://anarc.at/openid/
da089228e1 promote the neurodebian backport since the official backport looks like it will never come 2016-09-18 01:56:21 +00:00
git-starter
2f4901f576 2016-09-16 14:40:49 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
7c5ff428a8 I got the files to come back, but I don't want Android making these dumb delete-loads-of-newly-added-stuff commits 2016-09-16 03:03:19 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
d62ee47ab3 2016-09-16 01:56:57 +00:00
Joey Hess
45a59390d2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-15 13:24:03 -04:00
Joey Hess
0e30e71e9c
info: Support being passed a treeish, and show info about the annexed files in it similar to how a directory is handled. 2016-09-15 12:51:00 -04:00
Adam000
efeb0c4f78 Added a comment 2016-09-15 16:03:42 +00:00
Adam000
95df12fa9a Added a comment 2016-09-15 15:57:59 +00:00
Adam000
4bdfb52f0b 2016-09-15 09:28:55 +00:00
Joey Hess
c9c6db5ebc
comment 2016-09-15 00:55:15 -04:00
Adam000
7a439e9df2 2016-09-15 00:34:37 +00:00
Adam000
0b772742c5 2016-09-15 00:10:56 +00:00
Joey Hess
ddc1b46fc2
comment 2016-09-14 12:28:18 -04:00
Joey Hess
a417b1db6e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-14 12:19:28 -04:00
Joey Hess
916f05e890
comment 2016-09-14 12:18:48 -04:00
git-starter
f630a893c2 Added a comment: clarification 2016-09-13 20:27:23 +00:00
git-starter
d5bc4bf9dc 2016-09-13 15:48:30 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
a1809b2827 Added a comment 2016-09-13 07:05:48 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
848d160077 Added a comment 2016-09-12 19:57:03 +00:00
Aaron
021ebc651d Added a comment: Any thoughts Joey? 2016-09-10 15:15:44 +00:00
anarcat
a12f1afd8e fix markup 2016-09-10 14:18:10 +00:00
anarcat
8f8800bba0 sign this so i follow its changes 2016-09-10 14:17:58 +00:00
anarcat
7a89a172b0 two more ideas 2016-09-10 14:13:42 +00:00
Gus
2f963eb049 Added a comment: Never mind 2016-09-10 09:15:57 +00:00
atrent
201a99f510 2016-09-10 07:23:07 +00:00
Joey Hess
61faf240d5
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-09 16:40:11 -04:00
Joey Hess
3e22d60549
copy, move, mirror: Support --json and --json-progress. 2016-09-09 16:24:26 -04:00
Joey Hess
c277a21ece
done 2016-09-09 16:17:28 -04:00
Joey Hess
05d4438383
addurl, get: Added --json-progress option, which adds progress objects to the json output.
This doesn't work right when used with -J yet, and there is some really
ugly hand-crafting of part of the json output.
2016-09-09 15:06:54 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1f1b7adecf initial whining 2016-09-09 18:45:02 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
9947c8384f 2016-09-09 18:00:41 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
96ef6001ff Added a comment 2016-09-09 12:47:31 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
16b2604a20 Added a comment 2016-09-09 06:51:45 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
f97c4fe93b Added a comment: Similar issue on Debian machine 2016-09-08 20:04:45 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
492e417cc8 removed 2016-09-08 19:51:06 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
4a64b69a9b Added a comment: Tried on another machine, same problem 2016-09-08 19:49:14 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
cf57a506cc Added a comment: output of git annex version 2016-09-08 18:48:44 +00:00
Gus
821aae68d3 2016-09-08 18:40:08 +00:00
Gus
59f79b8cb7 2016-09-08 18:37:19 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
c183de67d0 2016-09-08 18:33:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
981987bebc Added a comment 2016-09-08 18:08:49 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
4af313288e Added a comment: concurrent-output-1.7.7 2016-09-08 17:41:28 +00:00
Joey Hess
8e9267a1ed
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 13:20:22 -04:00
Joey Hess
2cb94bf026
comment 2016-09-08 12:32:10 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
b9d8c97942 Added a comment: also CPU (on git and git-annex processes) doesn't go to 100% 2016-09-08 16:32:08 +00:00
Joey Hess
079c5a03c6
comment 2016-09-08 12:24:20 -04:00
Joey Hess
442558aecf
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 12:19:33 -04:00
Joey Hess
dff511a2fe
update 2016-09-08 12:18:58 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
fc795e84a4 Added a comment 2016-09-08 16:12:08 +00:00
Joey Hess
673065ea05
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-08 12:06:11 -04:00
Joey Hess
41191ce9ad
designs 2016-09-08 12:04:09 -04:00
https://me.yahoo.com/a/yx5Y6EI1t.759Jsu63ZWqYclCmpOmxxd.ramtw--#7114a
9b48eeba87 2016-09-08 13:09:22 +00:00
pigmonkey
8f0ba291e7 Added a comment 2016-09-07 20:38:36 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
8dbe7a6a26 Added a comment: This seems relevant to the comment directly previous this one. 2016-09-07 20:27:49 +00:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
b9041def67 Added a comment: Build failure 2016-09-07 18:25:20 +00:00
Joey Hess
a7a301fd7d
add news item for git-annex 6.20160907 2016-09-07 11:33:55 -04:00
Joey Hess
e33f9f22a6
followup 2016-09-07 11:11:54 -04:00
Joey Hess
ae658ddcdc
close; notabug 2016-09-07 11:07:42 -04:00
Joey Hess
d18bc92251
remove cruft 2016-09-07 11:07:25 -04:00
pigmonkey
ed0a7b0ad9 Added a comment 2016-09-06 23:10:47 +00:00
onionjake
9aacde3f65 Added a comment 2016-09-06 19:45:06 +00:00
onionjake
a885d23bad you can create bugs with empty titles 2016-09-06 19:44:11 +00:00
Joey Hess
34e137e6b3
devblog 2016-09-06 15:19:53 -04:00
Joey Hess
612043c55a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-06 12:47:02 -04:00
Joey Hess
31289da691
get -J: Download different files from different remotes when the remotes have the same costs.
Only done in -J mode because only if there's concurrency can downloading
from two remotes be faster. Without concurrency, it's likely the case that
sequential downloads from the same remote are faster than switching back
and forth between two remotes.

There is some hairy MVar code here, but basically it just keeps
the activeremotes MVar full except when deciding which remote to assign
to a thread.

Also affects gets by sync --content -J

This commit was sponsored by Jochen Bartl.
2016-09-06 12:45:21 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c50dce1cc9 Added a comment: current status? 2016-09-06 14:11:25 +00:00
leni536
9065e994b4 2016-09-06 09:34:14 +00:00
Joey Hess
e9f7310a7d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-09-05 19:44:35 -04:00
Joey Hess
1b8d8faa3a
applied 2016-09-05 19:43:59 -04:00
anarcat
afe24c6618 copy --from --to 2016-09-05 22:05:02 +00:00
Joey Hess
73bf74ce98
devblog 2016-09-05 16:39:30 -04:00
Joey Hess
e1706d0a47
comment 2016-09-05 16:28:25 -04:00
Joey Hess
2574bb0b32
todo 2016-09-05 16:28:00 -04:00
Joey Hess
2a5173d566
comment 2016-09-05 16:18:07 -04:00
Joey Hess
2a6494723a
dup forum post 2016-09-05 16:12:54 -04:00
Joey Hess
dd0dff9dc4
Assistant, repair: Filter out git fsck lines about duplicate file entries in tree objects. 2016-09-05 16:08:49 -04:00
Joey Hess
2610103a48
comment 2016-09-05 16:00:51 -04:00
Joey Hess
a64b33fe3b
close 2016-09-05 15:50:05 -04:00
Joey Hess
7170f16d5e
comment 2016-09-05 15:49:19 -04:00
Joey Hess
bca7305a6f
comment 2016-09-05 15:46:42 -04:00
Joey Hess
f07df4ae2a
comment 2016-09-05 15:42:13 -04:00
Joey Hess
07d4fdba78
comment 2016-09-05 15:39:41 -04:00
Joey Hess
219e2fa157
Make --json and --quiet suppress automatic init messages
And any other messages that might be output before a command starts.

Fixes a reversion introduced in version 5.20150727.

During the optparse-applicative conversion, I needed a place to run
per-command global option setters, and I made it get run during the seek stage. But
that is too late to have --json and --quiet disable output produced in the
check stage. Fix is just to run those per-command global option setters at
the same time as the all-command global option setters.

This commit was sponsored by Thom May.
2016-09-05 15:34:38 -04:00
Joey Hess
12db586469
comment 2016-09-05 14:27:15 -04:00