Commit graph

1031 commits

Author SHA1 Message Date
Joey Hess
20741b1eb4
Automatically convert direct mode repositories to v7 with adjusted unlocked branches
* Automatically convert direct mode repositories to v7 with adjusted
  unlocked branches and set annex.thin.
* init: When run on a crippled filesystem with --version=5,
  will error out, since version 7 is needed for adjusted unlocked branch.
* direct: This command always errors out as direct mode is no longer
  supported.
* indirect: This command has become a deprecated noop.
* proxy: This command is deprecated because it was only needed in direct
  mode. (But it continues to work.)

Also removed mentions of direct mode throughough the documentation.

I have not removed all the direct mode code yet.
2019-08-26 15:05:25 -04:00
Joey Hess
b87ea12b6b
git-annex merge branch
* merge: When run with a branch parameter, merges from that branch.
  This is especially useful when using an adjusted branch, because
  it applies the same adjustment to the branch before merging it.
2019-08-09 13:21:15 -04:00
Joey Hess
fb7d92457f
support using gcrypt with git-lfs special remote 2019-08-05 13:43:45 -04:00
Joey Hess
f5eb28682a
expand 2019-08-04 13:59:24 -04:00
Joey Hess
8460bbcea9
note on git-lfs program 2019-08-04 13:16:59 -04:00
Joey Hess
c5ed11bc3f
documentation for git-lfs special remote 2019-08-04 13:15:47 -04:00
se394@012e89e10cc49919adf6ca062ea68c23230eebe5
390b536436 removed 2019-07-23 18:01:46 +00:00
se394@012e89e10cc49919adf6ca062ea68c23230eebe5
95bfa6e0f5 Added a comment: Exception thrown for runshell 2019-07-23 18:01:31 +00:00
se394@012e89e10cc49919adf6ca062ea68c23230eebe5
88b51c3a45 Added a comment: Exception thrown for runshell 2019-07-23 18:01:22 +00:00
Joey Hess
924e5af6b9
change a few last v6 references to v7
Since v6 is not a usable repo version any longer, it's confusing to have
documentation that refers to it.

This commit was sponsored by Peter on Patreon.
2019-07-17 11:44:57 -04:00
yarikoptic
ec3c16b517 Added a comment: FTR: a dedicated issue on CoW across subvolumes 2019-07-08 19:05:45 +00:00
yarikoptic
537c280e75 removed 2019-07-08 19:05:00 +00:00
yarikoptic
ec62d07883 Added a comment: FTR: a dedicated issue on CoW across subvolumes 2019-07-08 19:04:03 +00:00
Joey Hess
1871295765
rename annex.security.allowed-http-addresses
Renamed annex.security.allowed-http-addresses to
annex.security.allowed-ip-addresses because it is not really specific to
the http protocol, also limiting eg, git-annex's use of ftp and via
youtube-dl, several other protocols.

The old name for the config will still work.

If both old and new name are set, the new name will win.
2019-05-30 12:43:40 -04:00
Joey Hess
d98dc13345
update for preferred content 2019-05-21 14:56:45 -04:00
Joey Hess
700a3f2787
Merge branch 'master' into import-from-s3 2019-05-01 14:30:52 -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
Joey Hess
48d30d8753
Merge branch 'master' into import-from-s3 2019-04-23 15:34:26 -04:00
Joey Hess
cab28b48af
reorder 2019-04-23 14:45:34 -04:00
yarikoptic
2c61fbf858 Added a comment: indeed a useful use case 2019-04-19 13:26:05 +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
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
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
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
b22d07ba93
comment 2019-03-22 09:32:26 -04:00
gueux
2e4fedf1a4 Added a comment 2019-03-21 22:59:38 +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
sameerds
27c96d9b70 Added a comment: did not work for me 2019-03-16 10:07:09 +00:00
Joey Hess
5dd21116b7
update for deprecation of --tracking option 2019-03-11 14:27:01 -04:00
anarcat
dba0e89b71 Added a comment 2019-03-07 20:15:10 +00:00
yarikoptic
9f908c8856 Added a comment: more details on coreutils cp treatment of reflink 2019-03-06 16:00:35 +00:00
tjbk123@277355c7f00c6df42e960e85caafa4b294872337
b7af89a8b4 Added a comment: Best solution to save disk space on exFAT 2019-03-05 18:23:03 +00:00
CandyAngel
a5d9ab3ad7 Added a comment 2019-02-19 14:13:48 +00:00
chris@a3ac8acdfdc53fa269c7b9bda4306c25b92d6624
5bd190aab2 Added a comment: Files with spaces 2019-02-19 14:04:05 +00:00
madalu
18e060cd11 2019-02-04 14:40:03 +00:00
madalu
b0bf1c40a6 Correct date 2019-01-21 15:42:39 +00:00
colin.brosseau@d444b2b3412af38b85f7b4b340b9c44a412b5698
938ca1c698 Added a comment: NTFS Make it clear that it'll not work with annex.thin 2019-01-03 18:04:58 +00:00
tomi.ollila@7588dbee63d5e035a85167fe207afb49287f9d1a
176f65fb8f Added a comment: git config remote.origin.annex-ignore true 2018-12-26 20:33:36 +00:00
Joey Hess
7a2d257159
comment 2018-12-03 13:35:23 -04:00
anarcat
f5ec2f074d note git-annex not supported by gitlab anymore 2018-11-30 21:27:03 +00:00
leni536
7285ffef62 2018-11-28 09:02:12 +00:00
yarikoptic
acb4bcf2db Added a comment 2018-11-21 19:56:45 +00:00
Mowgli
98af4f51d1 Added a comment: reflink and subvolume 2018-11-21 19:41:30 +00:00
Mowgli
9f3dfeb9a1 removed 2018-11-21 19:40:04 +00:00
Mowgli
a23d982153 Added a comment: reflink and subvolume 2018-11-21 19:38:56 +00:00
yarikoptic
beffd92109 Added a comment 2018-11-21 19:21:48 +00:00
Mowgli
8b76e284a8 Added a comment: reflink and subvolume 2018-11-21 19:01:11 +00:00
metst13@1d16544ec52801db7efb2895d3dc7a4458b8eb45
7bca7542d6 Added a comment 2018-11-06 16:10:11 +00:00
metst13@1d16544ec52801db7efb2895d3dc7a4458b8eb45
1803ba1bcc Added a comment: clone to the server 2018-11-06 14:58:39 +00:00
anarcat
6d954cc132 upload to the test collection, giving users an idea of how to change collections as well as forcing people to think before they upload 2018-11-05 16:02:23 +00:00
CandyAngel
b9063f94fc Added a comment 2018-10-27 22:33:21 +00:00
Joey Hess
6fd37fb016
Merge branch 'v7' 2018-10-26 13:52:09 -04:00
Joey Hess
9488a53023
update docs 2018-10-26 12:19:44 -04:00
CandyAngel
ed0e3fc43c Added a comment 2018-10-26 11:35:19 +00:00
Joey Hess
636f4a68a9
doc update 2018-10-25 18:56:14 -04:00
Joey Hess
234842a347
v7
Install new git hooks in this version.

This does beg the question of what to do if git later gets eg a
post-smudge hook, that could run git-annex smudge --update. I think the
thing to do in that case would be to make git-annex smudge --update
install the new hooks. That way, as the user uses git-annex, the hook
would be created pretty quickly and without needing any extra syscalls
except for when git-annex smudge --update is called.

I considered doing something like that for installation of the
post-checkout and post-merge hooks, which would have avoided the need
for v7. But the only place it was cheap to do it would be in git-annex smudge
which could cheaply notice that smudge.log didn't exist yet and so know
the hooks needed to be installed. But since smudge used to populate pointer
files, it would be quite surprising if a single git checkout/merge failed
to update the work tree, and so that idea didn't work out.

The other reason for v7 is psychological -- users don't need to worry
about whether they might be running an old version of git-annex that
doesn't support their v7 repository very well. And bug reports about
"v6" have gotten a bit of a bad association in my head since they often
hit one of the known limitations and didn't realize it was experimental.

newtyped RepoVersion Int to avoid needing 2 comparisons in
versionSupportsUnlockedPointers etc. Also it's just nicer.

This commit was sponsored by John Pellman on Patreon.
2018-10-25 18:24:23 -04:00
Joey Hess
5a39b5a012
new tip
(Still need to make git annex sync --content update the adjusted branch
to expose files it downloaded, which this relies on.)

This commit was sponsored by Ewen McNeill on Patreon.
2018-10-20 13:55:15 -04:00
Joey Hess
b72f1e1b48
update android docs for termux
This commit was sponsored by John Pellman on Patreon.
2018-10-13 12:11:47 -04:00
Joey Hess
f430fda73b
move comment 2018-10-11 13:35:13 -04:00
Joey Hess
c5b6c55afc
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-11 13:33:14 -04:00
Joey Hess
0240775f32
adding arm64 build, and improved termux installation process
* Added arm64 Linux standalone build. (No autobuilder yet.)
* Improved termux installation process.

Added git-annex-install.sh script to avoid user needing to type as much in
termux. The scope of this script is limited; runshell handles the rest.

Runshell runs termux-fix-shebang on the shell scripts. The problem is
the bundled bin/sh script, deleting that script also works, but then the
others probably use the system Android /bin/sh, which could be old or
broken or not posix or whatever. Using termux sh to run the scripts is
better.

This commit was sponsored by Eric Drechsel on Patreon.
2018-10-11 13:32:00 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
897e5ba57d Added a comment: Works now!! 2018-10-11 16:09:00 +00:00
Joey Hess
3b8ce5a89a
update 2018-10-10 18:16:07 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
87206a985a Added a comment: aarch64 still broken, please help 2018-10-09 09:17:11 +00:00
Joey Hess
9d7fe7d1f2
response 2018-10-08 12:10:02 -04:00
anarcat
2bbe1a8faf Added a comment: asked upstream 2018-10-07 18:07:05 +00:00
Teyras
8317223b98 Added a comment: gcrypt support 2018-10-06 12:14:45 +00:00
madalu
c38656d70e Fix typo 2018-09-22 22:46:20 +00:00
madalu
d61b22202c Warning about upcoming shutdown of webdav access to box.com 2018-09-22 22:45:45 +00:00
anarcat
f396676dba link to webdav more explicitely 2018-09-06 01:01:04 +00:00
Joey Hess
10138056dc
v6: avoid accidental conversion when annex.largefiles is not configured
v6: When annex.largefiles is not configured for a file, running git add or
git commit, or otherwise using git to stage a file will add it to the annex
if the file was in the annex before, and to git otherwise. This is to avoid
accidental conversion.

Note that git-annex add's behavior has not changed, for reasons explained
in the added comment.

Performance: No added overhead when annex.largefiles is configured.
When not configured, there is an added call to catObjectMetaData,
which involves a round trip through git cat-file --batch.
However, the earlier catKeyFile primes the cache for it.

This commit was supported by the NSF-funded DataLad project.
2018-08-27 14:51:10 -04:00
Joey Hess
35e1697377
expand 2018-08-17 10:48:18 -04:00
Joey Hess
82cfcfc838
better index file refresh method
Use git update-index --refresh, since it's a little bit more
efficient and the user can be told to run it if a locked index prevents
git-annex from running it.

This also fixes the problem where an annexed file was deleted in the index
and a get of another file that uses the same key caused the index update to
add back the deleted file. update-index will not add back the deleted file.

Documented in tips/unlocked_files.mdwn the gotcha that the index update
may conflict with other operations. I can't see any way to possibly avoid
that conflict.

One new todo about a race that causes a modification to be accidentially
staged.

Note that the assistant only flushes the git command queue when it
commits a modification. I have not tested the assistant with v6 unlocked
files, but assume most users of the assistant won't care if the index
shows a file as modified for a while.

This commit was supported by the NSF-funded DataLad project.
2018-08-16 14:16:24 -04:00
Joey Hess
63a81cd20a
response 2018-08-09 15:49:36 -04:00
Joey Hess
7b9762b6af
document converting from git to annex and back 2018-08-09 15:06:51 -04:00
Joey Hess
c5d93650c9
prevent fetch/merge/push to cache 2018-08-03 14:10:05 -04:00
yarikoptic
214a6b7742 Added a comment: could we just make it "avoidable"? 2018-08-03 17:54:01 +00:00
Joey Hess
38190c6ca2
response 2018-08-03 13:28:11 -04:00
Joey Hess
1a02fc1159
Fix wrong sorting of remotes when using -J
It was sorting by uuid, rather than cost!

Avoid future bugs of this kind by changing the Ord to primarily compare
by cost, with uuid only used when the cost is the same.

This commit was supported by the NSF-funded DataLad project.
2018-08-03 13:10:50 -04:00
yarikoptic
8de71a743c Added a comment: re: annex merge cache 2018-08-02 18:49:51 +00:00
Joey Hess
03ac0978d6
response 2018-08-02 14:16:18 -04:00
yarikoptic
5d56429a1e Added a comment: re: annex merge cache 2018-08-02 17:35:22 +00:00
yarikoptic
62b5f4e90f Added a comment: re: parallel and costs 2018-08-02 17:28:46 +00:00
Joey Hess
184cae8172
followup 2018-08-02 13:15:59 -04:00
yarikoptic
05e573e672 Added a comment: could be taken as a feature! but also annex should avoid merging cache git-annex 2018-08-02 14:30:51 +00:00
yarikoptic
7d74517717 Added a comment: is it "safe" to tune? 2018-08-02 13:53:04 +00:00
yarikoptic
7281099574 Added a comment: is not going from cache with parallel get e.g. -J 2 2018-08-02 13:33:09 +00:00
Joey Hess
5b1c1b1490
Merge branch 'master' of ssh://git-annex.branchable.com 2018-08-01 15:34:53 -04:00
Joey Hess
6e6c9cc6d3
Added --accessedwithin matching option.
Useful for dropping old objects from cache repositories.

But also, quite a genrally useful thing to have..

Rather than imitiating find's -atime and other options, all of which are
pretty horrible to use, I made this match files accessed within a time
period, using the same duration format used by git-annex schedule and
--limit-time

In passing, changed the --limit-time option parser to parse the
duration, instead of having it later throw an error.

This commit was supported by the NSF-funded DataLad project.
2018-08-01 15:34:03 -04:00
Joey Hess
fd5a392006
cache remotes via annex-speculate-present
Added remote.name.annex-speculate-present config that can be used to
make cache remotes.

Implemented it in Remote.keyPossibilities, which is used by the
get/move/copy/mirror commands, and nothing else. This way, things like
whereis will not show content that's speculatively present.

The assistant and sync --content were not using Remote.keyPossibilities,
and were changed to use it.

The efficiency hit should be small; Remote.keyPossibilities is only
used before transferring a file, which is the expensive operation.
And, it's only doing one lookup of the remoteList and a very cheap
filter over it.

Note that, git-annex still updates the location log when copying content
to a remote with annex-speculate-present set. In this case, the location
tracking will indicate that content is present in the remote. This may
not be wanted for caches, or may not be a real problem for them. TBD.

This commit was supported by the NSF-funded DataLad project.
2018-08-01 14:28:05 -04:00
msloco@dab095e2e54192078b3eedcd000f7d838a169f5b
2ca412754a Added a comment: samee here 2018-07-31 22:21:48 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
46e86cc5b0 Added a comment: still broken on aarch64 2018-07-29 08:48:22 +00:00
Joey Hess
081f8e57c6
Support working trees set up by git-worktree.
Support working trees set up by git-worktree, by setting up some symlinks
such that git-annex links work right.

Also improved support for repositories created with --separate-git-dir.
At least recent git makes a .git file for those (older may have used a
symlink?), so that also needs to be converted to a symlink.

This commit was sponsored by Nick Piper on Patreon.
2018-07-18 14:27:26 -04:00
Joey Hess
49cc94f61f
add docs about p2p --pair being broken in old versions 2018-07-05 11:52:52 -04:00
Joey Hess
096f2261a7
added an example transcript 2018-07-04 15:26:07 -04:00
Joey Hess
ba0745b5c2
S3: fix documentation of publicurl
5f0f063a7a documented it as being
configured automatically, but the code never did that. Rather than try
to hard-code whatever urls amazon  uses for its buckets, it seems better
to ask the user to find the url and set it.
2018-07-02 12:30:39 -04:00
Joey Hess
4f3b9db725
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-26 11:09:50 -04:00