Commit graph

1013 commits

Author SHA1 Message Date
Joey Hess
37467a008f
annex.addunlocked expressions
* annex.addunlocked can be set to an expression with the same format used by
  annex.largefiles, in case you want to default to unlocking some files but
  not others.
* annex.addunlocked can be configured by git-annex config.

Added a git-annex-matching-expression man page, broken out from
tips/largefiles.

A tricky consequence of this is that git-annex add --relaxed
honors annex.addunlocked, but an expression might want to know the size
or content of an url, which it's not going to download. I decided it was
better not to fail, and just dummy up some plausible data in that case.

Performance impact should be negligible. The global config is already
loaded for annex.largefiles. The expression only has to be parsed once,
and in the simple true/false case, it should not do any additional work
matching it.
2019-12-20 15:56:25 -04:00
Joey Hess
4acbb40112
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.

Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.

Performance notes:

git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.

git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 13:01:41 -04:00
MichaelC
df7bf60998 Added a comment: Does android adb special remote support MTP? 2019-12-10 21:23:31 +00:00
michael.clifford.com@7ca464bc0ba25fd5f2922deb8f531668727a66fb
80b0c9b514 removed 2019-12-10 21:02:23 +00:00
michael.clifford.com@7ca464bc0ba25fd5f2922deb8f531668727a66fb
3c4053e455 Added a comment: android special remote via mtp supported? 2019-12-10 21:01:53 +00:00
Joey Hess
5877de5e80
git-lfs: remember urls, and autoenable remotes using known urls
* git-lfs: The url provided to initremote/enableremote will now be
  stored in the git-annex branch, allowing enableremote to be used without
  an url. initremote --sameas can be used to add additional urls.
* git-lfs: When there's a git remote with an url that's known to be
  used for git-lfs, automatically enable the special remote.
2019-11-18 16:09:09 -04:00
Joey Hess
31a5b58b2c
documentation for making git add only annex when configured by annex.largefiles
Code change should be trvial, but not yet implemented. This
significantly complicated the task of documenting how git-annex works.

I'm not sure how useful the annex.gitaddtoannex confguration is after
this change; seems that if a user has an annex.largefiles they will want
it applied consistently. But the last thing I want to hear is more
complaining from users about git add doing something they don't want it
to.

There's a pretty high risk users who got used to the git add behavior
and don't have annex.largefiles configured will miss the NEWS and
complain bitterly about their suddenly bloated repositories. Oh well.

Removed outdated comments about the old behavior to avoid confusion.
I don't know if I've found all the places that griping spread to.
2019-10-24 14:01:54 -04:00
anarcat
b4a9397c4a Added a comment: right! forgot about log -S 2019-10-23 20:16:26 +00:00
anarcat
2755a22c37 update from comments 2019-10-23 20:15:40 +00:00
Joey Hess
a632a16f14
comment 2019-10-21 12:53:04 -04:00
Lukey
c452f01843 Added a comment 2019-10-21 16:27:50 +00:00
anarcat
a2bc387c6b i always have trouble finding this 2019-10-21 15:40:56 +00:00
Joey Hess
37f725a9f7
Merge branch 'master' into sameas 2019-10-11 15:56:00 -04:00
Joey Hess
c0e88b7695
sameas documentation 2019-10-11 14:04:58 -04:00
Joey Hess
3cc23df35b
improve conversion example 2019-10-08 14:17:04 -04:00
Dwk
a9c5a68b65 Added a comment: annexed -> normal git does not work if annexed file was unlocked 2019-10-05 01:45:14 +00:00
Joey Hess
a9f078da43
Merge branch 'master' of ssh://git-annex.branchable.com 2019-09-30 14:21:23 -04:00
Joey Hess
ca0ca6012f
remove -n from example
That was only needed with git-annex before v7. The pre-commit hook no
longer scans for and re-locks typechanged files.
2019-09-30 13:34:26 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
04ec673d51 Fix typo and incorrect references to "git annex peer" 2019-09-29 23:34:25 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
b45deddbcd Added a comment: Follow-up thought 2019-09-29 22:08:29 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
1f28ddf470 Added a comment: Can conversion to/from annexed be made easier? 2019-09-29 22:04:32 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
32c6ea563e fix walktrough typo 2019-09-29 21:46:46 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
4db7370c4b Added a comment: Issue on openSUSE with Tor's requirement for Python 2.7 2019-09-29 16:41:15 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
7192063f84 Improve installation instructions for Magic Wormhole, and mention Python 2 and executable name dependencies 2019-09-29 16:20:21 +00:00
Joey Hess
6ae0a44c64
git-lfs: Added support for http basic auth 2019-09-24 14:46:20 -04:00
tobiasBora
ca89c40656 Added a comment: Download either video and audio 2019-09-23 09:14:29 +00:00
Joey Hess
e347216a69
link 2019-09-16 14:44:56 -04:00
Joey Hess
a53e8e6b55
forum thread as requested 2019-09-16 14:43:10 -04:00
Joey Hess
6e81911d9c
comment 2019-09-16 13:37:38 -04:00
Joey Hess
061231621e
Merge branch 'master' into v7-default 2019-09-10 16:06:43 -04:00
ginquistador@86f226616ead98d2733e249429918f241f928064
95468047d6 Added a comment: Disappointed with git add 2019-09-03 07:30:28 +00:00
Joey Hess
3f0eef4baa
v7 for all repositories
* Default to v7 for new repositories.
* Automatically upgrade v5 repositories to v7.
2019-08-30 14:09:14 -04:00
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