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

26279 commits

Author SHA1 Message Date
Joey Hess
d5582865b6
comment 2019-05-23 12:25:51 -04:00
Joey Hess
1e00f861ab
comment 2019-05-23 12:12:44 -04:00
andrew
66b1f2bd15 Added a comment 2019-05-21 23:33:57 +00:00
Joey Hess
52df1b2015
devblog 2019-05-21 15:05:57 -04:00
Joey Hess
d98dc13345
update for preferred content 2019-05-21 14:56:45 -04:00
Joey Hess
e06feb7316
honor preferred content when importing 
Importing from a special remote honors its preferred content too; unwanted
files are not imported. But, some preferred content expressions can't be
checked before files are imported, and trying to import with such an
expression will fail.

Tested this with scenarios including changing the preferred content
expression and making sure merging the import didn't delete files that were
no longer wanted.

There was one minor inefficiency mentioned in the todo that I punted on.
 2019-05-21 14:38:06 -04:00
Joey Hess
ec11575d17
hairyness 2019-05-21 12:54:57 -04:00
Joey Hess
3b9a19171a
Merge branch 'master' into preferred 2019-05-21 11:34:45 -04:00
Joey Hess
5e1221ad53
Improve shape of commit tree when importing from unversioned special remotes 
Make the import have the previous import as a parent, so eg `git log --stat`
displays a useful diff.

Also a minor optimisation, only calculate the depth of the imported history
once.
 2019-05-21 11:32:54 -04:00
Joey Hess
5af9e7f3d0
break out a todo 2019-05-21 11:10:13 -04:00
Joey Hess
e51ca437c4
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-20 16:46:26 -04:00
Joey Hess
357f420ba3
devblog 2019-05-20 16:46:14 -04:00
Joey Hess
97fd9da6e7
add back non-preferred files to imported tree 
Prevents merging the import from deleting the non-preferred files from
the branch it's merged into.

adjustTree previously appended the new list of items to the old, which
could result in it generating a tree with multiple files with the same
name. That is not good and confuses some parts of git. Gave it a
function to resolve such conflicts.

That allowed dealing with the problem of what happens when the import
contains some files (or subtrees) with the same name as files that were
filtered out of the export. The files from the import win.
 2019-05-20 16:43:52 -04:00
Joey Hess
7d177b78e4
docs for export preferred content 
This includes a note about how include= and exclude= match when exporting
a subtree. I don't know if the note is prominent enough, but the
behavior seems unsurprising enough.
 2019-05-20 12:06:02 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
8bec41ceed Added a comment 2019-05-20 15:23:45 +00:00
Joey Hess
12451ea010
Merge branch 'master' into preferred 2019-05-20 10:00:03 -04:00
Joey Hess
fb69a8c215
retitle 2019-05-20 09:59:12 -04:00
Joey Hess
4894bfe3ea
comment 2019-05-20 09:58:36 -04:00
Joey Hess
2246aef3b8
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-20 09:51:25 -04:00
Joey Hess
cc6eb46ac2
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-20 09:50:56 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
06bc46eaa2 Added a comment: it's zsh 2019-05-19 10:05:27 +00:00
anthony@2b89f08c5c67f83d920fe464d7363db8f45cec20
b7a8264c2f Added a comment 2019-05-19 08:39:09 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
02a3160ca5 Added a comment: .profile doesn't take effect 2019-05-18 19:46:09 +00:00
Joey Hess
2d7f295b90
todo 2019-05-17 21:15:36 -04:00
ply
c70f344af4 Added a comment 2019-05-17 20:55:48 +00:00
Ilya_Shlyakhter
d803c1c331 reported issue with git-annex-init silently overwriting repo description 2019-05-17 17:51:25 +00:00
Joey Hess
8958556fe3
thought 2019-05-16 20:41:17 -04:00
Ilya_Shlyakhter
33c16fd936 reported still seeing errors with git-annex-add 2019-05-16 18:36:44 +00:00
aragilar
bea10be73c Added a comment 2019-05-16 08:26:28 +00:00
derobert
1a33402476 Added a comment 2019-05-16 08:12:45 +00:00
aragilar
117c009f23 2019-05-16 06:27:23 +00:00
anthony@ad39673d230d75cbfd19d2757d754030049c7673
2d7186b43d Added a comment 2019-05-15 17:55:58 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
a275f65662 Added a comment: Are we talking about a different installer? 2019-05-14 19:57:41 +00:00
Joey Hess
428435c37c
comment 2019-05-14 15:30:38 -04:00
Joey Hess
6a012c7d0c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-14 15:25:21 -04:00
Joey Hess
24c8b1b15a
update 2019-05-14 15:25:09 -04:00
Ilya_Shlyakhter
846bf51421 Added a comment 2019-05-14 19:23:33 +00:00
Joey Hess
f4de45332c
wording 2019-05-14 15:18:43 -04:00
anthony@ad39673d230d75cbfd19d2757d754030049c7673
f986210657 Added a comment: Should be in ~/.profile 2019-05-14 19:15:08 +00:00
anthony@ad39673d230d75cbfd19d2757d754030049c7673
4e7444cbf1 2019-05-14 19:02:27 +00:00
Joey Hess
5266da2cdd
docs for importing preferred content 2019-05-14 14:43:51 -04:00
Joey Hess
156069f621
Merge branch 'master' into preferred 2019-05-14 14:29:49 -04:00
Joey Hess
f29da41367
fix man page formatting 2019-05-14 14:29:40 -04:00
Joey Hess
9411a7c93c
matching preferred content before key is known 
This will let import try to match preferred content expressions before
downloading the content and generating its key.

If an expression needs a key, it preferredContentParser with
preferredContentKeylessTokens will fail to parse it.

standard and groupwanted are not in preferredContentKeylessTokens
because they may refer to an expression that refers to a key.
That needs further work to support them.
 2019-05-14 14:28:23 -04:00
Joey Hess
a3e24ed533
more design work 2019-05-14 11:49:23 -04:00
Joey Hess
c5a61ee808
closing in on final design for this 2019-05-14 10:52:00 -04:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
53bee6dc5f Added a comment: Re: Empty lines sent by git-annex to an external special remote 2019-05-14 08:48:27 +00:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
c4abfcc368 Added a comment: Empty lines sent by git-annex to an external special remote 2019-05-14 06:36:12 +00:00
Ilya_Shlyakhter
0610789285 Added a comment: checksums of remote data 2019-05-13 22:03:38 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
4c7f38fc2c 2019-05-12 17:02:07 +00:00
ndj
d45dbd678c 2019-05-11 18:33:25 +00:00
Joey Hess
0c7569bb6f
close 2019-05-10 13:59:39 -04:00
Joey Hess
c77d79d343
close old todo 2019-05-10 13:54:32 -04:00
Joey Hess
ae562ad4d7
update old todo item with what still needs doing 
removed old comments that are no longer relevant
 2019-05-10 13:52:40 -04:00
Joey Hess
daa0c6c1c6
close old todo 2019-05-10 13:35:55 -04:00
Joey Hess
d32143e7ad
close 2019-05-10 13:34:44 -04:00
Joey Hess
ccfb800fa6
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-10 13:31:49 -04:00
Joey Hess
82186ca58f
annex.jobs=cpus etc 
Added the ability to run one job per CPU (core), by setting annex.jobs=cpus,
or using option --jobs=cpus or -Jcpus.

Built with future expansion in mind, including not defaulting matching on
Concurrency so more constructors can later be added, and using "cpu"
instead of "0".
 2019-05-10 13:27:08 -04:00
Joey Hess
459bbd9005
update roadmap 2019-05-10 12:35:14 -04:00
CandyAngel
0076e9fa03 2019-05-10 11:29:10 +00:00
Ilya_Shlyakhter
e0c73c7f29 Added a comment 2019-05-09 21:07:39 +00:00
yarikoptic
a022f42ab2 new issue on inability to access ftp urls forwarded to from http URL 2019-05-09 20:42:34 +00:00
Ilya_Shlyakhter
63f6389e64 problem with multi-threaded copying to an S3 remote. 2019-05-09 03:00:34 +00:00
strmd
aa66648d2f Added a comment 2019-05-08 17:23:24 +00:00
quzhengrobot@6237b7730f478778d064c18a5a314535129357dd
dff0a44287 Added a comment: Android - gitlab repo 2019-05-08 11:35:04 +00:00
Joey Hess
8b44548d0e
comment 2019-05-07 13:20:03 -04:00
Joey Hess
aaeb85361c
Merge branch 'wip' 2019-05-07 13:07:45 -04:00
Joey Hess
0dead2d6ec
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 13:06:30 -04:00
Joey Hess
7264863a01
add news item for git-annex 7.20190507 2019-05-07 13:06:14 -04:00
Joey Hess
2d33122215
avoid ingest lockdown file escaping the withOtherTmp call 
Fixes bug that caused git-annex to fail to add a file when another
git-annex process cleaned up the temp directory it was using.

Solution is just to push withOtherTmp out to a higher level, so that
the whole ingest process can be completed inside it.

But in the assistant, that was not practical to do, since withOtherTmp runs
in the Annex monad and the assistant does not. Worked around by introducing
a separate temp directory that only the assistant uses for lockdown.
Since only one assistant can run at a time, it's easy to clean up that
directory of old cruft at startup.
 2019-05-07 13:04:57 -04:00
Ilya_Shlyakhter
cc7c20f428 Added a comment 2019-05-07 16:53:10 +00:00
Joey Hess
f98e97669e
comment 2019-05-07 12:10:03 -04:00
Joey Hess
eb592a1f20
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:08:30 -04:00
Joey Hess
d6198442ce
comment 2019-05-07 12:08:07 -04:00
Ilya_Shlyakhter
6d5ba46776 Added a comment 2019-05-07 16:04:58 +00:00
Joey Hess
7da721e356
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 12:04:19 -04:00
Joey Hess
2a41712ef1
avoid stageJournal escaping withOtherTmp 
This is only done for correctness sake; I don't see any way that it
would have caused a problem here. The jlog file escaped withOtherTmp
so another process could swoop in and delete it, but the file is only
used as a buffer for a list of filenames, and its handle gets rewound
and they're read back out, which will still work even if it's already
been deleted.

The only reason I didn't just pre-delete the file and keep the handle
open is I'm not sure that works on all OS's (eg Windows). If there was
a problem that this fixed it might involve an OS that doesn't support
deleting an open file or something like that.
 2019-05-07 11:57:12 -04:00
Ilya_Shlyakhter
d46b916f3b Added a comment 2019-05-07 15:50:52 +00:00
Joey Hess
ce83783fcc
bug report 2019-05-07 11:40:45 -04:00
Joey Hess
09c2516487
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-07 11:21:30 -04:00
Joey Hess
5c217449cc
comment 2019-05-07 11:21:18 -04:00
Joey Hess
37ce10098c
comment 2019-05-07 11:12:00 -04:00
Ilya_Shlyakhter
5638ae9688 Added a comment 2019-05-07 00:59:31 +00:00
Ilya_Shlyakhter
4d0ae18635 Added a comment 2019-05-06 22:38:43 +00:00
Ilya_Shlyakhter
54b0028b5b Added a comment 2019-05-06 20:24:14 +00:00
Joey Hess
b03e65d260
Improved locking when multiple git-annex processes are writing to the .git/index file 2019-05-06 15:15:12 -04:00
Joey Hess
4bc99e4c21
add todo 2019-05-06 14:58:59 -04:00
Joey Hess
65a82e0d27
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 14:45:02 -04:00
Joey Hess
c31d0fe11b
re worktrees 2019-05-06 14:42:51 -04:00
Ilya_Shlyakhter
f0f0d6e61c Added a comment 2019-05-06 18:39:07 +00:00
Joey Hess
4f11885c12
response 2019-05-06 14:01:56 -04:00
Joey Hess
4999e6dd25
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 13:57:39 -04:00
Joey Hess
bf7ecd6892
fix export subtree reversion 
Fix reversion in last release that caused wrong tree to be written to
remote tracking branch after an export of a subtree.

The invariant "commitsha should have the treesha as its tree"
was not met due to a bug. Guarantee it's met by catting the commitsha
to find its actual tree. A little bit slower, but this is not run often.
 2019-05-06 13:57:13 -04:00
Ilya_Shlyakhter
590acf2b0d question about concurrent writing to the git-annex branch by multiple git-annex commands 2019-05-06 17:05:50 +00:00
Joey Hess
0533fde73c
reproduced 2019-05-06 12:43:26 -04:00
Joey Hess
1bae209470
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-06 12:42:49 -04:00
Joey Hess
c6a4779036
analysis 2019-05-06 12:39:35 -04:00
Joey Hess
6ad51d5627
comment 2019-05-06 12:29:53 -04:00
Joey Hess
7c874327aa
comment 2019-05-06 12:25:17 -04:00
Joey Hess
6845c1e020
comment 2019-05-06 12:16:19 -04:00
Joey Hess
7c6ada691b
comment 2019-05-06 12:07:08 -04:00
Joey Hess
b3eed0feac
comment 2019-05-06 12:04:25 -04:00
Joey Hess
1a0c3e864b
close 2019-05-06 12:02:10 -04:00
Joey Hess
bcbaf3a851
update 2019-05-06 10:51:54 -04:00
herbgroll@5a05f17cf9cd3d69057fee2991f630e5a60cd197
947503cc6d 2019-05-05 19:15:28 +00:00
Joey Hess
afd57e137b
tweak to fix man page indent 2019-05-04 11:45:55 -04:00
Joey Hess
fd57780d04
add news item for git-annex 7.20190503 2019-05-03 12:49:01 -04:00
Ilya_Shlyakhter
437fa438e3 Added a comment 2019-05-03 16:31:18 +00:00
Ilya_Shlyakhter
6535d0c1b2 Added a comment 2019-05-03 16:26:40 +00:00
Ilya_Shlyakhter
03a20b225a Added a comment 2019-05-03 16:11:06 +00:00
Joey Hess
9cb795da5f
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 11:53:37 -04:00
Joey Hess
40c749387f
comment 2019-05-03 11:53:03 -04:00
Ilya_Shlyakhter
3d214c3499 Added a comment 2019-05-03 15:50:43 +00:00
Joey Hess
644bae6f66
Merge branch 'master' of ssh://git-annex.branchable.com 2019-05-03 11:38:22 -04:00
Joey Hess
8c4b1d6f1f
response; cleanup 2019-05-03 11:37:41 -04:00
Ilya_Shlyakhter
64bcaff016 added todo for speculate-can-get : extension of speculate-present 2019-05-03 15:34:41 +00:00
yarikoptic
627fe280b0 Added a comment: question about .gitattributes 2019-05-03 15:21:41 +00:00
Joey Hess
60bed2c186
remove 2019-05-03 11:06:35 -04:00
Ilya_Shlyakhter
a153a694f4 Added a comment 2019-05-02 16:04:06 +00:00
yarikoptic
3eeb5a732c initial report 2019-05-01 22:03:53 +00:00
Joey Hess
63ed61ae3d
devblog 2019-05-01 14:46:42 -04:00
Joey Hess
700a3f2787
Merge branch 'master' into import-from-s3 2019-05-01 14:30:52 -04:00
Joey Hess
a405ae015d
remove simple fast-forward todo 
I think the history looks nice enough without that special case.
 2019-05-01 14:29:52 -04:00
Joey Hess
7264b9aa8c
tweak wording 2019-05-01 14:29:10 -04:00
Joey Hess
a32f31235a
reuse old imported commits 
This avoids proliferation of different import commits for the same
trees, and makes the resulting git history nice.
 2019-05-01 14:20:26 -04:00
Joey Hess
ed1f53702c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-30 16:34:38 -04:00
Joey Hess
8f9457dec8
devblog 2019-04-30 16:33:48 -04:00
Joey Hess
83a420dd66
update todo 2019-04-30 16:31:46 -04:00
Joey Hess
1503b86a14
make import tree from remote generate a merge commit 
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.

Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.

The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.

This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
 2019-04-30 16:13:21 -04:00
Ilya_Shlyakhter
59922f1f45 Added a comment: format of log files on the git-annex branch 2019-04-30 17:52:41 +00:00
Joey Hess
3a6b9ccada
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-30 12:19:26 -04:00
Joey Hess
9dd764e6f7
Added mimeencoding= term to annex.largefiles expressions. 
* Added mimeencoding= term to annex.largefiles expressions.
  This is probably mostly useful to match non-text files with eg
  "mimeencoding=binary"
* git-annex matchexpression: Added --mimeencoding option.
 2019-04-30 12:17:22 -04:00
TroisSinges
857ad83ca4 2019-04-30 06:06:07 +00:00
yarikoptic
4f53cbbba8 Added a comment: update 2019-04-29 13:41:32 +00:00
Ilya_Shlyakhter
d8dbf53b57 Added a comment: use git-annex-untrust 2019-04-28 17:32:30 +00:00
Ilya_Shlyakhter
95b74b3fc1 removed 2019-04-28 17:29:59 +00:00
Ilya_Shlyakhter
8b8dbf1b70 Added a comment 2019-04-28 17:29:13 +00:00
stratosgear@54a818e85fb71bedb15c5ed52ba9442429f1698b
9a1484f4fb 2019-04-28 16:40:00 +00:00
yarikoptic
6b3cfcd59d Added a comment: change in libmagic behavior 2019-04-26 15:20:22 +00:00
Joey Hess
ff475d71c0
analysis 2019-04-26 10:23:48 -04:00
Joey Hess
cd5e685fd1
comment 2019-04-26 10:18:55 -04:00
Joey Hess
3e85707ccf
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-26 10:17:15 -04:00
yarikoptic
28a3926c8c initial report on twice the add line reported 2019-04-26 14:01:54 +00:00
yarikoptic
ec69ae87ed initial report on strange text file addition to annex instead of git 2019-04-26 13:58:30 +00:00
yarikoptic
b71a1b5483 wishlist for add --json-progress 2019-04-25 16:33:19 +00:00
Joey Hess
6af70dc5f8
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-25 10:54:18 -04:00
Joey Hess
2a6824bf9d
close 2019-04-25 10:49:55 -04:00
TroisSinges
e3de7ba02a 2019-04-25 11:57:58 +00:00
Joey Hess
fcf6a8851e
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-24 18:37:22 -04:00
Joey Hess
5b0e5922f5
devblog 2019-04-24 18:37:04 -04:00
Joey Hess
ca385a09c1
rename problem 2019-04-24 15:52:05 -04:00
Joey Hess
a71ae8053e
Merge branch 'master' into import-from-s3 2019-04-24 15:22:25 -04:00
Joey Hess
5b09b016fe
update 2019-04-24 15:22:02 -04:00
Ilya_Shlyakhter
ae04ab3b91 re: backend variants that compute checksum of chunk checksums 2019-04-24 17:40:13 +00:00
Ilya_Shlyakhter
d9fcc9c6cc added a hyperlink from key internals page to git-annex-examinekey 2019-04-24 17:18:33 +00:00
avar
8876e6a4de Added a comment: A useful command in combination with this 2019-04-24 12:37:36 +00:00
Joey Hess
b4230bd023
devblog 2019-04-23 16:36:50 -04:00
Joey Hess
2d0dd34916
initial work toward correctly merging deeper import histories 
Pure code is tested working, including with even histories that merge
several lines of development. Needs to be hooked up to git histories
next.
 2019-04-23 16:34:19 -04:00
Joey Hess
48d30d8753
Merge branch 'master' into import-from-s3 2019-04-23 15:34:26 -04:00
Joey Hess
c3f5e7863c
some more todos 2019-04-23 15:34:11 -04:00
Joey Hess
8d01b00507
update status 2019-04-23 14:50:33 -04:00
Joey Hess
cab28b48af
reorder 2019-04-23 14:45:34 -04:00
Joey Hess
a42e7a012a
refuse unsafe store to unversioned exporttree with old aws version 
I've developed a patch to aws, once it gets merged, the real version
number of aws can be filled in.
 2019-04-23 14:39:30 -04:00
Joey Hess
ae21c88640
tested S3 import/export with versioned bucket 
rename and delete working
 2019-04-23 13:43:41 -04:00
Joey Hess
0c878899ea
update status 2019-04-23 13:21:38 -04:00
Joey Hess
67d6280242
document importree for S3 2019-04-23 13:19:08 -04:00
Joey Hess
22fbab0563
close 2019-04-23 12:42:13 -04:00
Ilya_Shlyakhter
4c79f2b4ac added suggestion to use git-replace for better implement git-annex-migrate 2019-04-22 01:26:55 +00:00
richih@c163df26fe804f6b596ffbfefe3691879d60c12d
2deb3e9129 2019-04-21 20:27:02 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b851c12972 2019-04-21 20:09:20 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
c1f5e5a9f1 2019-04-21 16:39:13 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
2e31977789 2019-04-20 23:10:26 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b23e3a83b1 2019-04-20 23:06:15 +00:00
Joey Hess
6f846f4c38
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-19 15:21:34 -04:00
Joey Hess
a7ba22ffd3
devblog 2019-04-19 15:20:55 -04:00
Joey Hess
2f79cb4b45
versioned import from S3 is working 
Still some bugs and two stubbed methods to implement though.
 2019-04-19 15:13:49 -04:00
Joey Hess
55a5d9679a
implemented mkImportableContentsVersioned 2019-04-19 13:39:33 -04:00
yarikoptic
2c61fbf858 Added a comment: indeed a useful use case 2019-04-19 13:26:05 +00:00
Joey Hess
af332f8b36
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-18 16:38:37 -04:00
Joey Hess
e65455fdda
devblog 2019-04-18 16:38:15 -04:00
Joey Hess
1968f6d9c6
designing S3 GetBucketObjectVersions to ImportableContents algo 
I think I have a good algo now, at least poorly explained in English..
 2019-04-18 16:25:04 -04:00
CandyAngel
c9be042c13 removed 2019-04-18 18:07:25 +00:00
maryjil2596
352612618c Added a comment: samsung printer error code u1-2320 2019-04-18 10:10:14 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
fd477eff80 Added a comment: Unusual behavior 2019-04-18 01:36:05 +00:00
jasonb@ab4484d9961a46440958fa1a528e0fc435599057
a2f6d5633f 2019-04-16 21:51:12 +00:00
Joey Hess
2f740d14da
hmm 2019-04-16 13:18:59 -04:00
Joey Hess
7f50371bf2
split out section on common configuration parameters 2019-04-16 13:09:12 -04:00
Joey Hess
935eed0bb0
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-16 12:27:27 -04:00
Joey Hess
eaa4042c39
forgot to add man page 2019-04-16 12:25:49 -04:00
strmd
659292a5a4 Added a comment 2019-04-16 15:12:57 +00:00
CandyAngel
34233d2773 Added a comment 2019-04-16 13:10:03 +00:00
strmd
acf7ac168e 2019-04-16 12:28:46 +00:00
mario
b9c9a74a3b Added a comment: Thanks 2019-04-16 11:07:11 +00:00
Joey Hess
a474304f1d
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-15 13:49:16 -04:00
Joey Hess
c0c38e986d
added renameremote command 2019-04-15 13:49:03 -04:00
Joey Hess
ed1a0926c1
don't list subpages of todos 2019-04-15 13:01:53 -04:00
Joey Hess
de7a510da1
update 2019-04-15 13:00:46 -04:00
Joey Hess
00b1943927
close 2019-04-15 12:59:39 -04:00
Joey Hess
72b01b0faf
todo 2019-04-15 12:55:56 -04:00
CandyAngel
c2f93c77ee Added a comment 2019-04-15 07:34:22 +00:00
mario
e8575fd3b0 2019-04-13 21:43:14 +00:00
Joey Hess
40fe5e8927
todo 2019-04-12 11:49:38 -04:00
Ilya_Shlyakhter
9a7cef06e3 added suggestion for git-annex-get --batch --key 2019-04-11 23:41:17 +00:00
Joey Hess
48c2a95efb
simpler setup instructions 
This commit was sponsored by Denis Dzyubenko on Patreon.
 2019-04-10 12:34:28 -04:00
Joey Hess
d3d6a45918
thoughts 2019-04-10 12:01:52 -04:00
Joey Hess
4c1e08e92d
followup 2019-04-10 10:25:13 -04:00
Joey Hess
f46f9f1bd3
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-10 09:57:44 -04:00
Joey Hess
3b6ea2c244
document importtree=yes 2019-04-10 09:46:27 -04:00
yarikoptic
7e039f9319 original report on inability to get a url 2019-04-10 13:30:17 +00:00
Joey Hess
6babb2c73f
remove wrong uniqueness constraint from ContentIdentifier db 
Fix bug that caused importing from a special remote to repeatedly download
unchanged files when multiple files in the remote have the same content.

Unfortunately, there's really no good way to remove a uniqueness constraint
from a sqlite database. The best that can be done is to make a new table
and copy the data over. But that would require using persistent's
migrations or raw sql, and I don't want to do either.

Instead, a sledgehammer approach: Renamed .git/annex/cid to
.git/annex/cids. When the new database doesn't exist, it will be populated
from the git-annex branch.

Noting deletes the old database. Don't want to delete it out from under
some long-running git-annex process that might be using it. It could
eventually be deleted. But this is such a new feature, probably few repos
have the database in any case.
 2019-04-09 19:58:24 -04:00
Joey Hess
5ece1408ae
analysis 2019-04-09 19:38:55 -04:00
Joey Hess
88bb928f22
devblog 2019-04-09 18:01:03 -04:00
Joey Hess
ae0a64f1c4
bug I noticed 2019-04-09 18:00:49 -04:00
Joey Hess
7b6d0da9b8
adb import 
As well as adding the necessary methods, a few other changes to the adb
remote:

* Use ".annextmp" extension for temp files, to avoid conflict with other
  temp files.
* Stop using "echo $?" to get exit status of command inside adb.
  There were two problems; first the "echo" just before it meant it was
  always 0! And secondly, it seems kind of random on my phone whether it's
  1 or 0, not dependant on whether the command seems to have succeeded.
 2019-04-09 17:52:41 -04:00
Joey Hess
1a1a5177fd
add tip for new adb import feature 
This commit was sponsored by Jake Vosloo on Patreon.
 2019-04-09 17:45:55 -04:00
Joey Hess
5a570da1ab
thoughts 2019-04-09 15:50:52 -04:00
Joey Hess
7bf18f23e5
todo 2019-04-09 14:07:47 -04:00
Joey Hess
2dc20e3fa4
update design doc with final design choices 2019-04-09 13:05:22 -04:00
Joey Hess
b51eceb326
reorg section and expand 
conflict detection at import time is not detected, but I think it's ok
given this reasoning
 2019-04-09 12:59:14 -04:00
Joey Hess
4211281336
remove old forum post that is a spam magnet 
This was never a useful forum post, so I'm willing to sacrifice it.
 2019-04-09 11:42:23 -04:00
Joey Hess
44f3699485
response 2019-04-09 11:41:51 -04:00
Joey Hess
609c505980
remove massive amount of spam comments on this forum post 2019-04-09 11:40:29 -04:00
Joey Hess
f40edb680c
doc clarification 2019-04-09 11:38:11 -04:00
Joey Hess
8191095bce
comment 2019-04-09 11:13:37 -04:00
Joey Hess
3d4ef050dd
comment 2019-04-09 11:11:29 -04:00
Joey Hess
0a14dfd383
comment 2019-04-09 11:08:18 -04:00
Joey Hess
996055b3cc
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-07 15:35:17 -04:00
jillcaballero
fbb07ee634 Added a comment: Kentucky Derby 2019-04-06 13:14:50 +00:00
Joey Hess
4af55c1f30
Merge branch 'master' of ssh://git-annex.branchable.com 2019-04-05 11:41:46 -04:00
Joey Hess
212c5b84a9
update 2019-04-05 10:35:06 -04:00
adamdwalker
069c074b6d Added a comment: IIHF 2019-04-05 12:37:58 +00:00
yarikoptic
7db8eaf512 initial question about possible "globus" special remote 2019-04-05 02:25:12 +00:00
Joey Hess
1f3245ddf5
close as basis of this is wrong 2019-04-04 12:50:55 -04:00
Joey Hess
d40a3580a5
comment 2019-04-03 13:27:58 -04:00
Joey Hess
727ac0451a
comment 2019-04-03 13:14:54 -04:00
Joey Hess
1b5f4a8e20
comment 2019-04-03 13:11:34 -04:00
Joey Hess
5813005ab6
comment 2019-04-03 13:01:07 -04:00
Joey Hess
e40fcf2530
fix name of --trust-glacier command in man page 2019-04-03 13:00:30 -04:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
2599296a31 be more explicit about new hash format 2019-04-01 19:52:00 +00:00
Ilya_Shlyakhter
d40b2e879f Added a comment: re: key content size 2019-04-01 17:44:29 +00:00
CandyAngel
979f6c7cd1 removed 2019-04-01 07:32:15 +00:00
maryjil2596
a477b519f5 Added a comment: aol account recovery 2019-04-01 06:52:11 +00:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
eb00b3f6da removed 2019-03-31 16:31:47 +00:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
7879bbeafd Added a comment: key content size 2019-03-31 16:31:28 +00:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
f250bb092d Added a comment: key content size 2019-03-31 16:31:09 +00:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
d70f248459 Added a comment: Options don't match git-annex lookupkey --help 2019-03-30 16:05:30 +00:00
driusan@4d47e7deeb2f5d3846792d049ed06f96a0c3ca98
7e92349438 Added a comment: Warning building with cabal 2019-03-30 00:19:11 +00:00
Joey Hess
bc302b56ae
test patch 2019-03-28 16:16:28 -04:00
Joey Hess
c68ae14268
further thought 2019-03-28 15:46:14 -04:00
Joey Hess
a53c2a7e13
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-28 14:04:25 -04:00
Joey Hess
b09c6e3016
todo item based on behavior yoh showed me 2019-03-28 14:04:20 -04:00
Joey Hess
2c735f1747
improve wording 2019-03-28 13:25:14 -04:00
Joey Hess
5d5521d1bb
mention that repo decription can be used 2019-03-28 13:21:37 -04:00
pellman.john@e59e5c6d98d49cd9632d6fbe0c5026ddc71d52fd
afd72811c6 Added a comment: Re: Inconsistent idiom 2019-03-28 03:59:04 +00:00
Joey Hess
e035bc5324
minor typos 2019-03-27 11:15:20 -04:00
Joey Hess
f4c49b8f81
this is not all run as root 2019-03-27 11:15:03 -04:00
Ilya_Shlyakhter
1c334f74d6 Added a comment 2019-03-26 18:27:04 +00:00
Ilya_Shlyakhter
9b4e06d8c2 fixed a typo 2019-03-26 17:51:19 +00:00
Ilya_Shlyakhter
38669f0817 Added a comment: simplifying the interface 2019-03-26 17:40:33 +00:00
yarikoptic
94b9c5da92 Added a comment: annex.thin without hardlinks would be useful for non-crippled systems as well 2019-03-25 18:57:37 +00:00
yarikoptic
cb539a2e5a Added a comment 2019-03-24 23:49:48 +00:00
yarikoptic
49ace859cb Added a comment: The issue persists with recent git-annex 2019-03-24 23:00:30 +00:00
Ilya_Shlyakhter
72b788dfaf re: documenting git-annex dependencies 2019-03-24 18:47:28 +00:00
89.200.13.45
b7512c1146 poll vote (OpenStack SWIFT) 2019-03-23 09:08:09 +00:00
Joey Hess
5c1e4d10e0
add news item for git-annex 7.20190322 2019-03-22 13:57:24 -04:00
Joey Hess
39d55a8541
back-compat warning for protocol=https 2019-03-22 12:22:34 -04:00
Joey Hess
7d37011a11
S3: Added protocol= initremote setting, to allow https to be used on a non-standard port 
protocol=https implies port=443 and
port=443 implies protocol=https
-- this was necessary because the existing configs set port=443, but
with a protocol setting, users will naturally want to use it, and then
there's no need for them to supply the default https port. So we keep
back-compat, add a nicer way to enable https, and also add support for
non-standard https ports.
 2019-03-22 12:17:05 -04:00
Joey Hess
e18ac37ff6
close old bug 2019-03-22 10:32:24 -04:00
Joey Hess
9ada4b38c1
comment 2019-03-22 10:30:22 -04:00
Joey Hess
59c8119b2a
comment 2019-03-22 10:18:07 -04:00
Joey Hess
648756b84d
despam 2019-03-22 10:09:14 -04:00
Joey Hess
ba6b396a97
improve docs 2019-03-22 09:59:56 -04:00
Joey Hess
077efce98b
fix wrong option, followup 2019-03-22 09:51:42 -04:00
Joey Hess
b5d1029b6e
remove unsupported option 2019-03-22 09:46:47 -04:00
Joey Hess
95087e8a87
reopen 2019-03-22 09:44:40 -04:00
Joey Hess
97ae0f2c22
Android: Fix typo of name of armv7l in installation script. Thanks, 4omecha. 2019-03-22 09:39:18 -04:00
Joey Hess
b22d07ba93
comment 2019-03-22 09:32:26 -04:00
Joey Hess
3c58e62142
comment 2019-03-22 09:30:49 -04:00
Joey Hess
5fea7efee7
comment and toddo 2019-03-22 09:23:31 -04:00
gueux
2e4fedf1a4 Added a comment 2019-03-21 22:59:38 +00:00
gueux
a6233719e6 Added a comment 2019-03-21 22:57:36 +00:00
gueux
c789270c44 Added a comment 2019-03-21 20:40:55 +00:00
Fabio
9d7663432b Added a comment: no problem with xdg-open 2019-03-20 21:57:01 +00:00
4omecha@fff0ca6fa5307d92706e5ee6812d8db8f8067df0
65e41fea40 2019-03-20 17:01:58 +00:00
Joey Hess
3bcfc285e7
update 2019-03-20 12:05:58 -04:00
yarikoptic
a008053f24 Added a comment: more info on hanging 2019-03-19 21:04:54 +00:00
Ilya_Shlyakhter
438ff50013 Added a comment 2019-03-19 20:40:50 +00:00
Joey Hess
caa5cca47f
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-19 15:57:19 -04:00
Joey Hess
0204d3443e
thought 2019-03-19 15:56:47 -04:00
Ilya_Shlyakhter
10291efa55 added suggestion for git-annex-test to do simple sanity checks on external utils before running tests that depend on them 2019-03-19 18:55:59 +00:00
Joey Hess
cf0ec85548
comment 2019-03-19 14:00:41 -04:00
Joey Hess
56b1274d8c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-19 13:56:46 -04:00
Joey Hess
2118006711
comment 2019-03-19 13:53:32 -04:00
Joey Hess
1c2f6aee11
comment 2019-03-19 13:45:28 -04:00
yarikoptic
0b3d68d116 Added a comment 2019-03-19 17:41:12 +00:00
Joey Hess
738325ffb7
comment 2019-03-19 13:40:46 -04:00
Joey Hess
cce81f9b0c
comment 2019-03-19 13:34:45 -04:00
Joey Hess
059ff44e8b
comment 2019-03-19 13:28:08 -04:00
yarikoptic
5cfaf1ad39 Added a comment: reporting back 2019-03-19 17:01:10 +00:00
meribold
5b2caf30ae Added a comment: Re: Best solution to save disk space on exFAT 2019-03-19 14:32:29 +00:00
meribold
8f0117545c Added a comment: Re: Best solution to save disk space on exFAT 2019-03-19 14:22:57 +00:00
meribold
ab725aeb89 Added a comment: Re: Best solution to save disk space on exFAT 2019-03-19 14:14:38 +00:00
jamie@b5676b90eec0401ca8faac7c972eaf5676891601
ffb9b3160c Added a comment 2019-03-19 03:32:33 +00:00
Joey Hess
0f20c8c517
comment 2019-03-18 22:54:34 -04:00
yarikoptic
7bd01999fd fixed up formatting typo 2019-03-18 23:24:50 +00:00
yarikoptic
d992d13c11 tune up ;) 2019-03-18 22:56:22 +00:00
yarikoptic
97fc3866bb initial report on pre-commit hanging 2019-03-18 22:55:08 +00:00
Joey Hess
14c7be943a
devblog 2019-03-18 16:43:57 -04:00
Joey Hess
5ab97333e4
import: Let --force overwrite symlinks, not only regular files 
The docs already implied this should work.
 2019-03-18 16:40:15 -04:00
Joey Hess
258e8f8f29
Removed bundled gpg from the Linux standalone build and OSX dmg 
Because gpg now always wants to use gpg-agent, and shipping such a daemon
in those is not a good idea.
 2019-03-18 16:31:07 -04:00
Joey Hess
c96e623343
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-18 16:00:20 -04:00
Joey Hess
d5ee5fef65
fsck: Detect situations where annex.thin has caused data loss to the content of locked files. 
In particular, when two files had the same content, and one was unlocked
and modified, with annex.thin that can corrupt the content of the
annex object, and so fsck on the other file should detect that.

getKeyStatus was relying on Database.Keys.getAssociatedFiles to tell
when a file is unlocked, but that can false positive because the
database can list old associated files.

Instead, separate out the case of unlocked object which has multiple
hardlinks when annex.thin is in use.
 2019-03-18 15:59:43 -04:00
Ilya_Shlyakhter
c07c30bc5d Added a comment 2019-03-18 19:54:05 +00:00
Ilya_Shlyakhter
78d832f48b Added a comment 2019-03-18 19:44:08 +00:00
Joey Hess
60ca3ce043
Add -- before %f in the smudge/clean filter configuration 
To support filenames starting with dashes.

To update the config of existing repositories, you can re-run git-annex init.

Perhaps it should check every time for the old config and update it, but
that has several problems:

	- read-only repos
	- unexpected commands like `git annex find` changing git configs
	  might be surprising behavior

Since filenames starting with dashes are not super common and the user can
re-init easily enough if their repo needs fixed, I went for the simplest
fix.
 2019-03-18 14:12:13 -04:00
Joey Hess
e7f3e2a937
close as not a git-annex bug but a termux bug 2019-03-18 14:10:08 -04:00
Ilya_Shlyakhter
af34ef79ab Added a comment 2019-03-18 18:08:06 +00:00
Joey Hess
da99edac58
followup 2019-03-18 14:00:33 -04:00
Joey Hess
93df756184
moreinfo 2019-03-18 13:58:29 -04:00
Joey Hess
98650e8435
moreinfo 2019-03-18 13:50:41 -04:00
Joey Hess
ac33a5e85e
close 2019-03-18 13:45:02 -04:00
Joey Hess
ae9b28df77
comment 2019-03-18 13:37:44 -04:00
Joey Hess
8758f9c561
addurl --file: Fix a bug that made youtube-dl be used unneccessarily when adding an html url that does not contain any media. 2019-03-18 13:34:29 -04:00
Joey Hess
a87da159c1
comment 2019-03-18 13:21:43 -04:00
Joey Hess
2c0b8e6d4d
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-18 13:08:09 -04:00
Joey Hess
6491b62614
Makefile: Added install-home target which installs git-annex into the HOME directory 2019-03-18 12:36:03 -04:00
yarikoptic
e7294158aa youtube-dl protection kicks in where it shouldn't 2019-03-18 15:32:12 +00:00
Joey Hess
95e94b9d00
comment 2019-03-18 11:20:29 -04:00
Joey Hess
0fbfe8afb2
comment 2019-03-18 11:14:17 -04:00
maryjil2596
e3edc74838 Added a comment: iTunes Error 0xe8000015 2019-03-18 06:42:20 +00:00
jamie@b5676b90eec0401ca8faac7c972eaf5676891601
8c515b284e Added a comment 2019-03-17 03:29:31 +00:00
jamie@b5676b90eec0401ca8faac7c972eaf5676891601
860d2c38c2 Added a comment: strace 2019-03-16 22:17:37 +00:00
jamie@b5676b90eec0401ca8faac7c972eaf5676891601
a303327295 2019-03-16 22:13:49 +00:00
6yearold@36d59212c29d2959d6532d6db7928f01541bcf83
0ca577f932 2019-03-16 17:41:44 +00:00
sameerds
27c96d9b70 Added a comment: did not work for me 2019-03-16 10:07:09 +00:00
CandyAngel
2d6a364d4b removed 2019-03-14 12:02:41 +00:00
michelleaugud@9066f1a87c39514d1a75cd2f2bad842dccd7e0d4
e5923524f4 Added a comment: Now git-annex can be used on Android! 2019-03-14 11:51:13 +00:00
spwhitton
1812ec5dab more info 2019-03-13 18:15:08 +00:00
spwhitton
04acb0308a post question 2019-03-13 17:55:03 +00:00
Ilya_Shlyakhter
2951793905 added bug report where git worktree remove fails 2019-03-13 17:54:52 +00:00
CandyAngel
959b511b55 Added a comment 2019-03-13 08:33:37 +00:00
amindfv
13230c8f46 2019-03-13 07:20:12 +00:00
amindfv
d94f0e7a7d 2019-03-13 07:05:29 +00:00
Ilya_Shlyakhter
56fd24de0d added suggestion for importing files from special remotes without downloading them 2019-03-12 17:18:28 +00:00
gioele@678b7c03f524f2669b179b603f65352fcc16774e
db0757375b Added a comment: FAT/NTFS and POSIX allow different characters in file names 2019-03-12 10:51:20 +00:00
Joey Hess
4ed0c3d02f
devblog 2019-03-11 14:47:00 -04:00
Joey Hess
e1ab9a6d41
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-11 14:30:50 -04:00
Joey Hess
91f0f76252
need to write a tip 
deferred because a tip that is limited to the directory special remote
is not very interesting to most
 2019-03-11 14:30:05 -04:00
Joey Hess
5dd21116b7
update for deprecation of --tracking option 2019-03-11 14:27:01 -04:00
Joey Hess
4d610ee98a
Merge branch 'importtree' 2019-03-11 14:17:59 -04:00
Joey Hess
ffec06aaec
update 2019-03-11 14:13:58 -04:00
Joey Hess
057999f0fc
fix sync --content with remote.name.annex-tracking-branch=master:subdir 
It was exporting the whole tree not just the subdir. Now tested fully
working in both directions.
 2019-03-11 14:07:52 -04:00
Joey Hess
e1fdc8b374
record only subtree in export db and log after importing a subtree 2019-03-11 13:45:01 -04:00
Joey Hess
e46e40bf05
fix update of export tracking branch when exporting branch:subdir 2019-03-11 13:44:12 -04:00
Joey Hess
2912429640
better indicate when special remotes do not support renameExport 
Avoid a warning message when renameExport is not supported, and just
fallback to deleting with a subsequent re-upload. Especially needed for
importtree remotes, where renameExport needs to be disabled.

This changes the external special remote protocol, but in a
backwards-compatible way. A reply of UNSUPPORTED-REQUEST to an older
version of git-annex will cause it to make renameExport return False.
 2019-03-11 12:53:24 -04:00
Joey Hess
c755788256
sync: import when annex-tracking-branch is configured 
This works, and tested syncing both gets changes from a special remote
and sends changes to it, keeping it fully in sync nicely!

But have not tried it with a subdir configured.
 2019-03-09 13:57:49 -04:00
Joey Hess
633021e135
--no-push and remote.name.annex-push prevent exporting trees to special remotes 
Users may want sync to only export, or only import and this is broadly
analagous to push and pull, so it makes sense to use the same
configuration for it.
 2019-03-09 13:21:49 -04:00
Joey Hess
d9ee048d85
doc updates for import 2019-03-09 13:10:30 -04:00
publiwebmaxter@739143dcf7422b8de1502bf2925640bed6ef7014
0941ff5190 Added a comment 2019-03-09 08:33:49 +00:00
Joey Hess
6149a3b9bd
added progress bars 
clean up old todo item I checked earlier, see commit
dec30d2b14
 2019-03-08 12:43:03 -04:00
Joey Hess
e412129523
concurrency and status messages when downloading from import 2019-03-08 12:33:44 -04:00
Joey Hess
033e47b7d7
update 2019-03-07 19:44:00 -04:00
Joey Hess
33d79d84ff
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-07 16:15:52 -04:00
Joey Hess
a66dd19e15
devblog 2019-03-07 16:15:28 -04:00
anarcat
dba0e89b71 Added a comment 2019-03-07 20:15:10 +00:00
Joey Hess
ee5f1422df
remove debug print 2019-03-07 16:08:58 -04:00
Joey Hess
7e35c81ada
locking problem 2019-03-07 15:22:23 -04:00
anarcat
b43d382841 Added a comment: or -c annex.verify=false 2019-03-07 18:23:02 +00:00
anarcat
afeb00b19a Added a comment: parallelizing checksum and get 2019-03-07 18:21:22 +00:00
Joey Hess
9a72785307
fixes to export db lookup when accessing importtree=yes 
Now in a fresh clone with a importtree=yes remote enabled,
git annex fsck --from the remote works.
 2019-03-07 14:10:56 -04:00
Joey Hess
93025dd59f
add missing locking of ContentIdentifier database when writing 
This is not super efficient; it would be better to lock the database
once and build up a queue of changes and flush once.

But, storeExportWithContentIdentifier is likely going to be the really
expensive part, so let's do the simple thing and only optimise later if
needed.
 2019-03-07 13:32:33 -04:00
Joey Hess
3f449f845e
update 2019-03-07 13:28:18 -04:00
Joey Hess
68d1661251
cross-repo import now working correctly 2019-03-07 12:31:35 -04:00
crest
2cf3d68fe0 2019-03-07 10:48:01 +00:00
501st_alpha1
5843c0f905 Added a comment: Figured out how to sync with Keybase 2019-03-07 06:52:25 +00:00
Joey Hess
ee251b2e2e
implement updating the ContentIdentifier db with info from the git-annex branch 
untested

This won't be super slow, but it does need to diff two likely large
trees, and since the git-annex branch rarely sits still, it will most
likely be run at the beginning of every import.

A possible speed improvement would be to only run this when the database
did not contain a ContentIdentifier. But that would only speed up
imports when there is no new version of a file on the special remote,
at most renames of existing files being imported.

A better speed improvement would be to record something in the git-annex
branch that indicates when an import has been run, and only do the diff
if the git-annex branch has record of a newer import than we've seen
before. Then, it would only run when there is in fact new
ContentIdentifier information available from a remote. Certianly doable,
but didn't want to complicate things yet.
 2019-03-06 18:04:30 -04:00
Joey Hess
dec30d2b14
updates 
Note that I tried an evil remote that lists ImportLocations with
../../../ in them and indeed this resulted in git blowing up and the
import failing, and not writing outside the repo.
 2019-03-06 17:07:36 -04:00
Joey Hess
8e9713b769
add export+import test case 2019-03-06 16:49:33 -04:00
Joey Hess
b3d30e7d70
remove unncessary locking of ContentIdentifier db 
Remote.Helper.ExportImport only reads from it, and locking is only
needed when writing.
 2019-03-06 14:36:57 -04:00
yarikoptic
9f908c8856 Added a comment: more details on coreutils cp treatment of reflink 2019-03-06 16:00:35 +00:00
Joey Hess
f957f64278
add todo 2019-03-06 11:24:06 -04:00
maryjil2596
79643e1e54 Added a comment: Epson Printer Error Code 0x9d 2019-03-06 07:44:26 +00:00
maryjil2596
478776eab4 Added a comment: Epson Printer Error Code 0x9d 2019-03-06 07:43:56 +00:00
Joey Hess
89065f69cb
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-05 17:23:18 -04:00
Joey Hess
41c616d4a6
devblog 2019-03-05 17:23:06 -04:00
Joey Hess
0db393d82f
add bug 2019-03-05 17:19:26 -04:00
Joey Hess
5767b1b00d
avoid updating tracking branch when transfer to export throws exception 2019-03-05 16:51:13 -04:00
Joey Hess
dc278c059c
fix STM crash 
git-annex: thread blocked indefinitely in an STM transaction
failed

git-annex: sqlite query crashed
CallStack (from HasCallStack):
  error, called at ./Database/Handle.hs:98:42 in main:Database.Handle
failed

This needs further investigation.
 2019-03-05 16:37:40 -04:00
Joey Hess
46d33e804a
added checkPresentExportWithContentIdentifier 
Ugh, don't like needing to add this, but I can't see a way around it.
 2019-03-05 16:03:03 -04:00
Joey Hess
fd2a1aaa17
avoid using renameExport on import remotes 2019-03-05 14:57:48 -04:00
Joey Hess
9df9a3f82b
more todo 2019-03-05 14:55:22 -04:00
Joey Hess
f7be2e9d37
document how conflicts are handled with imports 2019-03-05 14:55:06 -04:00
tjbk123@277355c7f00c6df42e960e85caafa4b294872337
b7af89a8b4 Added a comment: Best solution to save disk space on exFAT 2019-03-05 18:23:03 +00:00
Joey Hess
8c54604e67
import+export from directory special remote fully working 
Had to add two more API calls to override export APIs that are not safe
for use in combination with import.

It's unfortunate that removeExportDirectory is documented to be allowed
to remove non-empty directories. I'm not entirely sure why it's that
way, my best guess is it was intended to make it easy to implement with
just rm -rf.
 2019-03-05 14:20:14 -04:00
Joey Hess
554b7b7f3e
fix todo 2019-03-04 18:20:12 -04:00
Joey Hess
cd3a2b023a
initial try at using storeExportWithContentIdentifier 
Untested, and I'm not sure about the locking of the ContentIdentifier db.
 2019-03-04 17:50:41 -04:00
Joey Hess
aaacf431d8
handle importtree=yes config 
For now, it's only allowed when exporttree=yes is also set.
That simplified the implementation, but could later be changed if
there's a remote that makes sense to be an import but not an export.
However, it may work just as well to make a remote be readonly to
prevent export to it while still allowing import.
 2019-03-04 16:07:35 -04:00
Joey Hess
5f17a9cc50
docs for importtree config 2019-03-04 15:39:19 -04:00
Joey Hess
3cd19fb4d0
use InodeCache to avoid races in import from directory special remote 
This does not avoid all possible races, but it does avoid all likely
ones, and is demonstratably better than git's own handling of races
where files get modified at the same time as it's updating the working
tree.

The main thing this won't detect are not unlikely races where part
of a file gets changed while it's being copied and then the file is
restored to its original condition before the modification check.
No, it's more likely that the limitations of checking inode, size,
and mtime won't detect certian modifications, involving eg mmapped
files.
 2019-03-04 13:57:23 -04:00
Horus
81c747ba69 Added a comment 2019-03-04 08:59:22 +00:00
Horus
153b1e3a2b 2019-03-03 13:21:02 +00:00
Joey Hess
d2b34da4be
Merge branch 'master' of ssh://git-annex.branchable.com 2019-03-01 16:59:22 -04:00
Joey Hess
8de8574d5e
devblog 2019-03-01 16:55:24 -04:00
Joey Hess
51fc969b66
notes 2019-03-01 16:44:34 -04:00
Joey Hess
18d7a1dbbb
make export and sync update special remote tracking branch 
The branch is only updated once the export is 100% complete. This way,
if an export is started but interrupted and so the remote does not yet
contain some of the files, an import will make a commit on the old
branch, and so won't delete the missing files.
 2019-03-01 16:35:48 -04:00
Joey Hess
d28b0a8bd0
use disconnected history for import tracking branch 
This avoids the first merge from it deleting all files in the current
branch, which was very surpring and unwanted behavior.
 2019-03-01 14:33:29 -04:00
Joey Hess
740f957cef
new problem 2019-03-01 13:49:26 -04:00
Joey Hess
1c8793691a
import: update location log for removed files 2019-03-01 13:26:59 -04:00
Joey Hess
5402c39882
plan for item 2019-03-01 12:56:20 -04:00
feulif
4bd3bd4e95 2019-02-28 21:51:54 +00:00
Ilya_Shlyakhter
e7de4f48f9 Added a comment: thanks for working on this 2019-02-28 18:06:27 +00:00
Joey Hess
84c9c93d58
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-27 16:50:32 -04:00
Joey Hess
200e007131
devblog 2019-02-27 16:50:21 -04:00
Joey Hess
a3f6e07fec
todo 2019-02-27 15:56:32 -04:00
Joey Hess
b1f10fbb4d
update location log during import 2019-02-27 13:58:03 -04:00
Joey Hess
e2e57f8556
initial export support for directory special remote 
This does not guard against race condition yet, it's only for testing
purposes.
 2019-02-27 13:42:34 -04:00
Joey Hess
45aacd888b
import downloader complete (untested) 
Made some api changes.

listImportableContents needs to provide the size
of the data, so the downloader can check disk free space.

retrieveExportWithContentIdentifier is passed the filepath to write to

Use temporary "CID" key during download of a ContentIdentifier from a
remote, so withTmp can be used and then move the content to the real key
once it's known.
 2019-02-27 13:15:02 -04:00
gueux
c7f8286e73 Added a comment 2019-02-27 09:34:12 +00:00
cman122887@9badeb8bdb364090f0a22e00ba16426ad65c34c9
913454e514 Added a comment: similar? 2019-02-27 02:47:57 +00:00
Ilya_Shlyakhter
cf53e50624 removed 2019-02-26 19:42:40 +00:00
Joey Hess
f4b773e9a1
incomplete action to download files from import 2019-02-26 15:25:28 -04:00
Joey Hess
e4e464da65
import command is updating tracking branch 2019-02-26 13:15:48 -04:00
Joey Hess
760f26ebc6
Merge branch 'master' into importtree 2019-02-26 11:36:36 -04:00
hoabg102@4a7a5918bc078f792113da142cf8c6d825a1825c
facbbfd91b 2019-02-26 08:50:57 +00:00
hoabg102@4a7a5918bc078f792113da142cf8c6d825a1825c
b94bcc8e77 2019-02-26 02:33:43 +00:00
Ilya_Shlyakhter
7bfca4fc05 added bug report for when git-annex-import declines to import files that are under the repo but are git-ignored 2019-02-25 18:34:16 +00:00
mario
c39fd60958 Added a comment: Find (and other operations) over multiple repos 2019-02-25 14:33:27 +00:00
Ilya_Shlyakhter
a8f0b482bf added question about using own gpg/gpg-agent with standalone git-annex 2019-02-24 22:14:00 +00:00
Ilya_Shlyakhter
d269336f19 added bug report re: incomplete gpg in standalone git-annex sandbox 2019-02-24 21:58:39 +00:00
Ilya_Shlyakhter
8e635a0ee6 fixed URL link 2019-02-24 21:15:11 +00:00
Ilya_Shlyakhter
4bd02fbeda added bug report for the standalone runshell related to caching locale info 2019-02-24 21:06:33 +00:00
sameerds
22e9a49bd9 Added a comment: +1 2019-02-24 17:06:30 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
ea3e6322e7 Added a comment 2019-02-24 07:01:35 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
1202a2a48c removed 2019-02-24 06:59:21 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
24ebc3d12e Added a comment 2019-02-24 06:56:43 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
8c777cb36d removed 2019-02-24 06:43:34 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
eb6c0608e6 Added a comment 2019-02-24 06:41:01 +00:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
3f450e5271 Added a comment 2019-02-24 01:20:15 +00:00
Joey Hess
89ee156059
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-23 16:04:15 -04:00
Joey Hess
15a4f91d07
devblog 2019-02-23 16:03:29 -04:00
Joey Hess
7072f7a071
note 2019-02-23 15:57:18 -04:00
Joey Hess
5bac8babdb
doc updated for import tree 
Deprecated git annex export --tracking because it makes sense to have a
single configuration of tracking for both imports and exports.
 2019-02-23 15:46:03 -04:00
david.j.buckmaster@984ff2704feacab53415ac5647206517d18f88f8
663c62d7ce 2019-02-23 18:38:42 +00:00
Joey Hess
464485bffe
Merge branch 'master' into importtree 2019-02-23 13:58:22 -04:00
Joey Hess
d685b119df
more design 2019-02-23 13:55:26 -04:00
Joey Hess
c5ceefdca6
Merge branch 'master' into importtree 2019-02-22 22:03:00 -04:00
Joey Hess
3c405838f8
more design 2019-02-22 22:02:50 -04:00
Joey Hess
4e0d08b66b
Merge branch 'master' into importtree 2019-02-22 21:18:13 -04:00
Joey Hess
200dc632f5
more design 2019-02-22 21:18:01 -04:00
Joey Hess
8c836623b7
design work 2019-02-22 16:18:09 -04:00