Commit graph

2714 commits

Author SHA1 Message Date
Joey Hess
b7d7cc858e
remove old bug
I just fixed this one today; it was not the problem I thought it was.
2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote 2016-03-31 18:54:35 -04:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy 2016-03-31 14:56:10 -04:00
Joey Hess
f63b839763
todo 2016-03-29 18:03:02 -04:00
Joey Hess
4b4a3b0152
todo 2016-03-29 16:44:09 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon 2016-03-29 13:57:48 -04:00
Joey Hess
bcd2350fc7
update 2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae 2016-03-29 12:50:25 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch 2016-03-29 11:07:40 -04:00
185.16.53.225
74fbef73c8 poll vote (Same as for regular git-annex. ~/annex/) 2016-03-24 16:01:43 +00:00
Joey Hess
3a86cdf3e6
comment 2016-03-14 16:39:39 -04:00
Joey Hess
7125a1fb27
rename files containing :
This is mostly to let the repo check out on windows w/o using cygwin's git.

But, bash completion is also crap with : , so ..
2016-03-12 12:57:18 -04:00
Joey Hess
7a01f60eed
update 2016-03-11 20:16:02 -04:00
Joey Hess
cc44813550
simplify 2016-03-11 20:12:31 -04:00
Joey Hess
b9184f69a7
improve propigation of commits from adjusted branches
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.

For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
2016-03-11 16:05:06 -04:00
Joey Hess
97e97dccda
Merge branch 'master' into adjustedbranch 2016-03-11 12:21:26 -04:00
Joey Hess
5716c39928
thought on reversing commits to adjusted branch 2016-03-04 11:31:26 -04:00
Joey Hess
cf24e9b892
working toward adjusted commit propigation 2016-03-03 16:19:09 -04:00
Joey Hess
91f37673df
can't checkout adjusted branch while index is still locked
There's a race here, but entering an adjusted branch for the first time is
not something to do when a commit is being made at the same time. Although,
may want to prevent the assistant from committing while entering the
adjusted branch.
2016-03-03 14:20:39 -04:00
Joey Hess
102229fc67
need to update master 2016-02-29 17:39:06 -04:00
Joey Hess
70e65db751
note a bug 2016-02-29 17:30:37 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
229db26e83 Added a comment: would it be possible to get a branch only with annexed content? 2016-02-25 03:04:26 +00:00
Joey Hess
2bf90c7b56
updates 2016-02-23 13:21:38 -04:00
Joey Hess
33f540a944
updates 2016-02-22 15:24:06 -04:00
Joey Hess
3ca171ef5c
updates 2016-02-22 13:04:02 -04:00
84.142.108.233
e7dc6b0211 poll vote (My phone (or MP3 player)) 2016-02-17 18:04:23 +00:00
Joey Hess
0b7d8d44d9
update 2016-02-09 16:32:40 -04:00
Joey Hess
73cca6e8c1
update 2016-02-09 16:26:55 -04:00
Joey Hess
9df7743e70
cleanu 2016-02-09 15:11:10 -04:00
Joey Hess
4fc5c21b3f
simplify; no need for separate filter reversal function 2016-02-09 15:09:25 -04:00
Joey Hess
cd84944bc5
improve 2016-02-09 14:59:13 -04:00
Joey Hess
3f8f534646
improve api, removing IO 2016-02-09 14:52:43 -04:00
Joey Hess
c85b774b2e
add RenameFile 2016-02-09 14:44:29 -04:00
Joey Hess
d09b742f48
update 2016-02-09 14:37:59 -04:00
Joey Hess
3188e5e4fe
update 2016-02-09 14:24:32 -04:00
Joey Hess
e4c85c856b
update 2016-02-09 13:51:49 -04:00
Joey Hess
1c9f4e81a6
update 2016-02-09 13:45:40 -04:00
Joey Hess
6dd9b2b63b
push details 2016-02-09 13:08:34 -04:00
Joey Hess
a7b3d8574e
commit details 2016-02-09 13:04:10 -04:00
Joey Hess
7a4e456662
integration with view branches 2016-02-09 12:45:48 -04:00
Joey Hess
09400f7bfb
stacking filters 2016-02-09 12:41:45 -04:00
Joey Hess
d3666228ee
rename v6 design page 2016-02-09 12:34:58 -04:00
Joey Hess
edc5829785
added adjusted_branches design doc, meets at least 2 different needs 2016-02-09 12:30:29 -04:00
Prayag Verma
1ac854f2c0
Fix a typo
`opportunisticly` → `opportunistically`
2016-02-08 10:54:08 -04:00
101.231.32.166
81fd09ec67 poll vote (DCIM directory (photos and videos only)) 2016-02-02 09:00:53 +00:00
Joey Hess
5dc7a24680
update 2016-01-12 13:24:31 -04:00
Joey Hess
0fe43d7f8e
update for v6 unlocked files 2015-12-26 14:59:06 -04:00
14.203.223.70
ff5de4ff57 poll vote (My phone (or MP3 player)) 2015-12-16 07:09:17 +00:00
Joey Hess
eee5bede24
clean up 2015-12-11 11:03:22 -04:00
pweemeeuw@86491f921da15d6a4dc6e1878fd42750b33f6963
8c7b1fe1ac Added a comment: Is android 6.0 supported? 2015-11-30 16:05:13 +00:00
124.40.246.76
74e6ce79ed poll vote (/sdcard/annex) 2015-10-24 18:32:21 +00:00
Joey Hess
1b502eefa1
roadmap update 2015-10-19 14:41:29 -04:00
Joey Hess
49841bbd64 remove unimplennted command-line option from design doc 2015-10-01 12:20:00 -04:00
119.225.142.2
10d6da5249 poll vote (Google Drive) 2015-09-23 22:21:16 +00:00
Joey Hess
175820ec63 response 2015-09-10 12:33:34 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
3c177565e7 Added a comment: but which of the 3? 2015-09-10 03:16:17 +00:00
Joey Hess
cf85370ade response 2015-09-09 17:09:48 -04:00
Joey Hess
04f75ccedf response 2015-09-09 17:03:09 -04:00
Joey Hess
58ea034e7b fix mistaken spelling fix that changed meaning
"uses" is how to spell it.
2015-09-09 13:42:28 -04:00
ypid
c040203ba7 Fixed spelling. 2015-08-31 19:06:02 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
9d1eeab405 Added a comment: WHEREIS -- is it better to just report failure to avoid duplicates? 2015-08-26 14:22:49 +00:00
sjvdwalt@3d195104d8f45061da99fe7f0a97d69dfc49bb5d
30b434303a Added a comment: Stream encoding 2015-08-25 00:36:24 +00:00
https://id.koumbit.net/anarcat
d611ff3094 Added a comment: design phase only 2015-08-18 19:02:30 +00:00
Joey Hess
0050215ed1 enable parallel build for fast mode and explicitly disable for production
Currently, ghc has issues getting reproducible builds with parallel
building. https://ghc.haskell.org/trac/ghc/ticket/4012
2015-08-14 17:39:56 -04:00
Joey Hess
a4fe6e037b oops, didn't mean to commit these changes yet 2015-08-14 14:22:53 -04:00
Joey Hess
290ff35b53 comment 2015-08-14 14:13:49 -04:00
Joey Hess
6bc46e384e Added WHEREIS to external special remote protocol. 2015-08-13 17:27:50 -04:00
Joey Hess
1b34533750 followu 2015-08-11 12:55:25 -04:00
dirk.schmidt@045f26624b94d351628bbb315f94150d627fb18b
894415228b Added a comment: Webapp don open 2015-07-08 12:49:02 +00:00
Joey Hess
f8a11a6ce8 add cjdns and tor also 2015-07-07 01:01:57 -04:00
Joey Hess
99362230bb update; mention snow and generalize the design some 2015-07-07 00:43:45 -04:00
Joey Hess
f8f4577047 plan update 2015-06-12 14:32:18 -04:00
Joey Hess
d2699b6ebe status update 2015-06-12 14:20:21 -04:00
66.55.144.180
cafe6a6b77 poll vote (Tahoe-LAFS) 2015-06-08 15:54:30 +00:00
66.55.144.180
f17ecdff4a poll vote (Tahoe-LAFS) 2015-06-08 15:54:21 +00:00
Joey Hess
89da871942 further thoughts 2015-05-28 10:57:59 -04:00
db48x
1a520e6c95 Added a comment: 14 of 21PB, actually 2015-04-30 02:58:05 +00:00
https://me.yahoo.com/a/idrn495us85k6mwfdMUolYIsyp4-#cf755
6be0a22fbc Added a comment: It's not so bad .. only about 10PB 2015-04-30 01:19:38 +00:00
Joey Hess
68da7dc806 design for enhandcement to preferred content to balance files evenly amoung repos in a group 2015-04-23 11:21:21 -04:00
Joey Hess
148d5b2009 followup 2015-04-09 14:33:11 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlZF5AC-FSxwkiay5ZgEYZwUzN69Wa6PTE
74b14a5252 Added a comment: filename from metadata? 2015-04-06 18:00:26 +00:00
Øyvind A. Holm
490e97ec10 Various typo fixes in doc/*.mdwn 2015-04-02 01:50:17 +02:00
Joey Hess
656fc1c881 fsck: Added --distributed and --expire options, for distributed fsck. 2015-04-01 17:53:16 -04:00
Joey Hess
1688de3f1f update and simplify 2015-03-16 17:04:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmsy_GIefGlGGD_XJp_R6EsWIRUC4ev9XU
cbbb60eff8 Added a comment: This is a BIG task 2015-03-13 20:48:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
50d85ecefb Added a comment 2015-03-09 16:48:18 +00:00
Joey Hess
73540f3e16 Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-06 16:24:23 -04:00
Joey Hess
a383d880da update 2015-03-06 16:24:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
4f96684f85 Added a comment: great to see such a large scale effort ongoing 2015-03-06 04:47:30 +00:00
Joey Hess
6045406deb Added SETURIPRESENT and SETURIMISSING to external special remote protocol
Useful for things like ipfs that don't use regular urls.

An external special remote can add a regular url to a key, and then
git-annex get will download it from the web. But for ipfs, we want to
instead tell git-annex that the uri uses OtherDownloader. Before this
change, the external special remote protocol lacked a way to do that.
2015-03-05 13:50:15 -04:00
Joey Hess
c0ddbaed13 update 2015-03-04 20:45:07 -04:00
Joey Hess
1fb575d84e add end-user view section 2015-03-04 20:38:53 -04:00
Joey Hess
67cd39e8fb groups 2015-03-03 22:40:58 -04:00
Joey Hess
4d0ddb9db7 typo 2015-03-03 22:37:23 -04:00
Joey Hess
5922800c20 clarification 2015-03-03 22:33:46 -04:00
Joey Hess
d45ec91a6b update 2015-03-03 22:30:20 -04:00
Joey Hess
b52e98b79a update 2015-03-03 22:04:34 -04:00
Joey Hess
b380701776 thundering herd 2015-03-03 22:01:08 -04:00
Joey Hess
d5c8c56bce update 2015-03-03 21:57:25 -04:00