Commit graph

25616 commits

Author SHA1 Message Date
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