Commit graph

3194 commits

Author SHA1 Message Date
Joey Hess
1d41ae5d2a
init warning on stalled lock probe
init: If lock probing stalls for a long time (eg a broken NFS server),
display a message to let the user know what's taking so long.
2020-06-05 11:06:19 -04:00
Ilya_Shlyakhter
1d189cd08e Added a comment 2020-06-05 14:51:08 +00:00
Joey Hess
e998e4a29a
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-05 10:41:30 -04:00
yarikoptic
8d3ffe50a1 initial whining about long pidlock need detection time 2020-06-05 02:18:31 +00:00
Joey Hess
a3d1f967a8
almost forgot 2020-06-04 16:22:45 -04:00
Joey Hess
2670890b17
convert to withCreateProcess for async exception safety
This handles all createProcessSuccess callers, and aside from process
pools, the complete conversion of all process running to async exception
safety should be complete now.

Also, was able to remove from Utility.Process the old API that I now
know was not a good idea. And proof it was bad: The code size went *down*,
despite there being a fair bit of boilerplate for some future API to
reduce.
2020-06-04 15:45:52 -04:00
Joey Hess
12e7d52c8b
another wrinkle 2020-06-04 14:46:28 -04:00
Joey Hess
e1fc4f7594
make safeCommand stop the process if the thread gets killed
And a comment on a todo item that this commit is perhaps the start of
solving.
2020-06-03 12:52:11 -04:00
Joey Hess
81a811d935
comment 2020-06-03 12:00:44 -04:00
superhair123
4b0dd1fcb2 2020-06-01 13:47:30 +00:00
superhair123
401f0f7d5a 2020-06-01 13:44:15 +00:00
Joey Hess
89b2542d3c
annex.skipunknown with transition plan
Added annex.skipunknown git config, that can be set to false to change the
behavior of commands like `git annex get foo*`, to not skip over files/dirs
that are not checked into git and are explicitly listed in the command
line.

Significant complexity was needed to handle git-annex add, which uses some
git ls-files calls, but needs to not use --error-unmatch because of course
the files are not known to git.

annex.skipunknown is planned to change to default to false in a
git-annex release in early 2022. There's a todo for that.
2020-05-28 15:55:17 -04:00
Joey Hess
a6271b1323
Merge branch 'master' of ssh://git-annex.branchable.com 2020-05-27 12:46:52 -04:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
311e605c28 Added a comment: .noannex 2020-05-27 15:34:54 +00:00
kyle
3e717128f8 Added a comment 2020-05-27 15:19:13 +00:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
7776691ead 2020-05-27 15:10:57 +00:00
Joey Hess
298fa1c081
done 2020-05-27 11:00:57 -04:00
Joey Hess
fc9833f68d
export: Added options for json output
Just worked, no need to do anything except add the options.
2020-05-26 10:31:10 -04:00
Joey Hess
bbdba72624
Merge branch 'master' of ssh://git-annex.branchable.com 2020-05-26 10:21:21 -04:00
yarikoptic
d30dd6daa4 TODO for export --json* options 2020-05-26 04:14:57 +00:00
Joey Hess
6eea4969d3
close 2020-05-25 12:04:56 -04:00
Joey Hess
234764518a
close 2020-05-25 12:02:23 -04:00
Joey Hess
e46717bf18
close 2020-05-25 11:59:21 -04:00
Joey Hess
133de41e49
close 2020-05-25 11:56:27 -04:00
Joey Hess
5f5a2a6b56
close 2020-05-25 11:52:45 -04:00
Joey Hess
fcb288be13
close dup 2020-05-25 11:48:39 -04:00
Joey Hess
4d87d255ee
comment 2020-05-25 11:47:10 -04:00
Joey Hess
7cc5e955b6
close 2020-05-25 11:31:38 -04:00
https://christian.amsuess.com/chrysn
112d2f8e7b Added a comment: Re: Usefulness of batch key processing 2020-05-15 09:33:22 +00:00
https://christian.amsuess.com/chrysn
340287ef94 Added a comment: Usefulness of batch key processing 2020-05-15 09:21:15 +00:00
Joey Hess
5b5a9aaf92
comment 2020-05-05 12:33:28 -04:00
Joey Hess
d2e78dfc0d
prove this optimisation would not be safe, so close 2020-05-04 14:49:42 -04:00
Joey Hess
9fa940569c
added remote variants
Todo item is done at last.

Might later want to think about testing some other types of remotes that
can be tested locally. The git remote itself is probably already well
enough tested by the test suite that testremote is not needed. Could
test things like bup, or rsync to a local directory. Or even external,
although that would require embedding an external special remote program
into the test suite..
2020-04-30 13:52:03 -04:00
Joey Hess
b41c0edebd
todo 2020-04-28 17:24:53 -04:00
ct.git-annex@230092d9bd3cf09ced2b9605cdb14ad0a3db265d
d3270a8b9a Added a comment 2020-04-26 20:18:48 +00:00
Joey Hess
985dd4f2ad
comment 2020-04-23 16:21:18 -04:00
Joey Hess
957a87b437
fix absolute filenames fed into --batch and git-annex info 2020-04-15 16:04:05 -04:00
Joey Hess
a14168a321
reproduced 2020-04-15 15:06:53 -04:00
Joey Hess
2caf579718
cache annex index filename for 1.5% speedup to queries 2020-04-10 13:37:04 -04:00
Joey Hess
5e4423c058
new optimisation target 2020-04-09 14:13:00 -04:00
Joey Hess
aeca7c2207
Sped up query commands that read the git-annex branch by around 5%
The only price paid is one additional MVar read per write to the journal.
Presumably writing a journal file dominiates over a MVar read time by
several orders of magnitude.

--batch does not get the speedup because then it needs to notice when
another process has made a change. Also made the assistant and other damon
modes bypass the optimisation, which would not help them anyway.
2020-04-09 13:54:43 -04:00
Joey Hess
c0cd07c36b
Ref ByteString conversion done
Test suite passes.
2020-04-07 17:41:09 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
d27a94eec0 Added a comment 2020-03-26 20:36:28 +00:00
Joey Hess
a0d274fed6
Merge branch 'master' of ssh://git-annex.branchable.com 2020-03-25 13:05:47 -04:00
Joey Hess
357f783edf
add priority tags 2020-03-25 13:05:09 -04:00
spwhitton
79ba17946f Added a comment 2020-03-25 16:31:13 +00:00
Joey Hess
24255b3c96
confirmed, and open todo for something mentioned in this bug 2020-03-20 12:00:07 -04:00
thk
677e5f6e12 Added a comment: sponsoring? 2020-03-19 08:40:32 +00:00
Joey Hess
cb6604814c
close 2020-03-16 14:16:55 -04:00
Joey Hess
94e1f02e0c
comment 2020-03-16 14:15:00 -04:00
Joey Hess
c913f57d05
comment 2020-03-16 14:08:49 -04:00
Ilya_Shlyakhter
05df404212 Added a comment: gsasl dependency 2020-03-11 22:13:47 +00:00
spwhitton
e36d6ebe53 report bug 2020-03-11 21:41:21 +00:00
Joey Hess
b2c4ca6da1
comment 2020-03-09 12:33:35 -04:00
Joey Hess
6eb52cf5f1
Merge branch 'master' of ssh://git-annex.branchable.com 2020-03-09 12:07:03 -04:00
Ilya_Shlyakhter
5dedcc9953 added todo: add option to disable fsck upgradable key warnings 2020-03-07 21:01:41 +00:00
thk
98e7a6078b Added a comment: No clear error message for failing names on NTFS 2020-03-07 12:50:19 +00:00
Joey Hess
e87dc1341e
link to upstream bug report 2020-03-06 13:52:48 -04:00
thk
db9958bfc8 Added a comment: Also no clear error for permission problems 2020-03-06 17:51:20 +00:00
Joey Hess
093fde5abd
completed the createDirectoryIfMissing conversion
Remaining calls in the assistant and Annex.Ssh have been audited and are ok.
2020-03-06 12:55:03 -04:00
Joey Hess
6d58ca94d6
some easy createDirectoryUnder conversions 2020-03-05 15:20:10 -04:00
Joey Hess
5b022eea87
implemented createDirectoryUnder 2020-03-05 14:10:34 -04:00
Ilya_Shlyakhter
aa91792d41 Added a comment 2020-03-04 21:34:42 +00:00
Joey Hess
97a8ce0191
comment 2020-03-04 17:12:10 -04:00
Ilya_Shlyakhter
8f48ebd8c2 added todo: restore original environment when running external special remotes from standalone git-annex? 2020-03-04 17:39:02 +00:00
amerlyq+annex@12121d70a602f094228689a0a24d348d478a8af1
4da2a67bbe Added a comment: re: shorter symlinks 2020-03-04 00:48:02 +00:00
Joey Hess
dd89832700
comment 2020-03-02 15:02:22 -04:00
Joey Hess
701f8cb00b
comment 2020-03-02 14:52:02 -04:00
Ilya_Shlyakhter
54d77e94ba Added a comment: adding dotfiles 2020-02-29 21:35:06 +00:00
spwhitton
a025dc23af Added a comment 2020-02-29 16:34:16 +00:00
Ilya_Shlyakhter
4faf850106 added todo suggestion: trust presence info for specific remotes for specified time 2020-02-28 20:14:26 +00:00
Joey Hess
41cb7e90a6
comment 2020-02-28 15:32:50 -04:00
Ilya_Shlyakhter
02f3abb142 added todo request: restore --include-dotfiles as a no-op for backwards compatibility 2020-02-28 18:29:43 +00:00
Joey Hess
2203b0e910
comment 2020-02-28 14:18:09 -04:00
Ilya_Shlyakhter
957dc80c3f Added a comment: batch presence checking 2020-02-27 20:33:44 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
2d3ef2c079 Added a comment 2020-02-27 13:12:28 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
d31fd6cd42 2020-02-27 08:54:34 +00:00
Joey Hess
64639ff9b1
followup and close 2020-02-26 18:29:06 -04:00
Joey Hess
5de1abf3da
todo 2020-02-25 17:44:03 -04:00
Joey Hess
3497e9e510
comment 2020-02-25 16:16:18 -04:00
Joey Hess
9659f1c30f
annex.security.allowed-ip-addresses ports syntax
Extended annex.security.allowed-ip-addresses to let specific ports of an IP
address to be used, while denying use of other ports.
2020-02-25 15:45:52 -04:00
Joey Hess
4316d92b48
comment 2020-02-25 14:38:55 -04:00
Joey Hess
bd8481b23d
comment 2020-02-25 12:46:01 -04:00
Ilya_Shlyakhter
370ce884f3 added todo suggestion: create debug logs but erase them on success 2020-02-24 22:37:51 +00:00
Dan
93af53f0fc Added a comment: Interaction with config annex.synccontent 2020-02-24 21:34:53 +00:00
yarikoptic
00cbbe2789 original TODO for more flexible security.allowed-ip-addresses 2020-02-21 00:04:30 +00:00
admin
d1fe9d0d2a Merge branch 'master' of /home/b-git-annex/source 2020-02-20 20:48:37 +00:00
Ilya_Shlyakhter
1b0685eac1 Added a comment: running parallel commands with xargs 2020-02-20 20:48:36 +00:00
Joey Hess
7f96801642
improve 2020-02-20 16:01:38 -04:00
Joey Hess
f2a925a3f5
comment 2020-02-20 14:45:12 -04:00
Joey Hess
0f9bf2d434
comments 2020-02-20 12:40:34 -04:00
Joey Hess
de144d3867
clean up 2020-02-19 15:04:31 -04:00
Joey Hess
029c883713
Merge branch 'master' into v8 2020-02-19 14:32:11 -04:00
Ilya_Shlyakhter
0ae1a3335e Added a comment: thanks 2020-02-18 20:00:17 +00:00
Joey Hess
c4a1b04e8b
comment 2020-02-18 12:51:59 -04:00
Dan
216c2154ec Added a comment: An overdue and overlong reply 2020-02-17 22:59:22 +00:00
Joey Hess
a78eb6dd58
sync --only-annex and annex.synconlyannex
* Added sync --only-annex, which syncs the git-annex branch and annexed
  content but leaves managing the other git branches up to you.
* Added annex.synconlyannex git config setting, which can also be set with
  git-annex config to configure sync in all clones of the repo.

Use case is then the user has their own git workflow, and wants to use
git-annex without disrupting that, so they sync --only-annex to get the
git-annex stuff in sync in addition to their usual git workflow.

When annex.synconlyannex is set, --not-only-annex can be used to override
it.

It's not entirely clear what --only-annex --commit or --only-annex
--push should do, and I left that combination not documented because I
don't know if I might want to change the current behavior, which is that
such options do not override the --only-annex. My gut feeling is that
there is no good reasons to use such combinations; if you want to use
your own git workflow, you'll be doing your own committing and pulling
and pushing.

A subtle question is, how should import/export special remotes be handled?
Importing updates their remote tracking branch and merges it into master.
If --only-annex prevented that git branch stuff, then it would prevent
exporting to the special remote, in the case where it has changes that
were not imported yet, because there would be a unresolved conflict.

I decided that it's best to treat the fact that there's a remote tracking
branch for import/export as an implementation detail in this case. The more
important thing is that an import/export special remote is entirely annexed
content, and so it makes a lot of sense that --only-annex will still sync
with it.
2020-02-17 16:33:10 -04:00
Joey Hess
96eb008910
comment 2020-02-17 13:42:21 -04:00
Joey Hess
d04e6aac6c
comment 2020-02-17 12:26:09 -04:00
Joey Hess
d2e0996c04
comment 2020-02-17 12:04:54 -04:00
Joey Hess
ef3e203436
comment 2020-02-17 11:56:08 -04:00
yarikoptic
0af85edb58 Added a comment 2020-02-14 17:20:29 +00:00
yarikoptic
8214da5715 Initial TODO on making --whatelse machine readable 2020-02-14 17:18:37 +00:00
Dan
6d82045149 Added a comment: Still wanted (update with example) 2020-02-13 20:08:48 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
9e7ce2076f Added a comment: Three union-mounting methods that *don't* work 2020-02-08 06:21:05 +00:00
Ilya_Shlyakhter
83fb031460 Added a comment: potential security issues? 2020-02-06 21:00:57 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
227206c089 2020-02-06 06:56:41 +00:00
Ilya_Shlyakhter
5c57440482 Added a comment: example of where retries could help 2020-02-05 22:19:30 +00:00
Ilya_Shlyakhter
28dc7d01de Added a comment: retries due to locked index file 2020-02-05 16:59:44 +00:00
Ilya_Shlyakhter
8db097e081 Added a comment: aborting stuck operations so they can be retried 2020-02-05 16:39:40 +00:00
https://christian.amsuess.com/chrysn
1a306aea34 Added a comment: union mounting and hidemissing 2020-02-04 09:01:53 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
3367266cdb Added a comment: Interim shell script 2020-02-04 07:26:11 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
5996fc6df0 removed 2020-02-04 07:16:20 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
36623e963e Added a comment: Interim shell scripts 2020-02-04 06:43:04 +00:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
b44b35da63 Added a comment: Similar use case 2020-02-04 03:48:40 +00:00
Chel
2198ba76f7 Added a comment 2020-02-01 02:55:07 +00:00
Chel
b65d7f3d04 Added a comment 2020-02-01 02:32:02 +00:00
Ilya_Shlyakhter
8d3364265e Added a comment: simpler proposal 2020-01-31 21:46:58 +00:00
Ilya_Shlyakhter
36e298daff Added a comment 2020-01-31 20:32:01 +00:00
https://christian.amsuess.com/chrysn
8ae290623e Added a comment: Re: comment 1 2020-01-31 19:48:02 +00:00
Ilya_Shlyakhter
76a432dacc Added a comment: alternate keys 2020-01-31 19:23:38 +00:00
anarcat
21f58eeb3d link to the xxhash todo 2020-01-30 19:46:11 +00:00
Joey Hess
6f7a09c50f
fix quoting 2020-01-30 15:44:11 -04:00
Joey Hess
4131b7da04
fix inline 2020-01-30 15:40:46 -04:00
Joey Hess
a767622ad8
list of confirmed todos
aka, an actual todo list again
2020-01-30 15:37:21 -04:00
Joey Hess
b238f5e2a9
comment 2020-01-30 15:27:00 -04:00
Joey Hess
cffa2446e8
tagged the past 2 years of open todos and followed up to a few of them
also moved some that were really bug reports to bugs/ and closed a
couple
2020-01-30 15:22:05 -04:00
Joey Hess
c08d5612ee
correction 2020-01-30 13:04:53 -04:00
Joey Hess
962f1f2363
mention limitation of --known 2020-01-30 12:54:15 -04:00
Joey Hess
18efb40c85
comment 2020-01-30 12:49:00 -04:00
Joey Hess
103eb66fdb
comment 2020-01-30 12:43:31 -04:00
Joey Hess
be417c847c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-30 12:41:17 -04:00
Joey Hess
e2ac9cf521
already fixed 2020-01-30 12:40:39 -04:00
Joey Hess
1427203226
comment 2020-01-30 11:42:36 -04:00
Ilya_Shlyakhter
9be407d49a Added a comment: use case to record chunked state 2020-01-29 17:48:43 +00:00
Joey Hess
f746a65877
more tagging 2020-01-29 11:34:14 -04:00
Joey Hess
1a0071f4d5
tagging todo items 2020-01-29 11:28:32 -04:00
Joey Hess
281bf13236
comment 2020-01-29 10:44:43 -04:00
https://christian.amsuess.com/chrysn
d2bc23487a Added a comment: Re: use of RAM disk 2020-01-29 07:49:12 +00:00
Ilya_Shlyakhter
8789697805 Added a comment: chunks and checksums 2020-01-28 18:20:36 +00:00
Ilya_Shlyakhter
486a0b236d Added a comment: use of RAM disk 2020-01-28 17:23:32 +00:00
https://christian.amsuess.com/chrysn
5f7be42858 Added a comment: Use of the RAM disk 2020-01-28 14:03:18 +00:00
Ilya_Shlyakhter
f2c13f73c9 added todo request: setpresentkey option to record chunked state 2020-01-27 20:28:46 +00:00
Ilya_Shlyakhter
2b1357bcc8 added suggestion: option to put temp files on a RAM disk 2020-01-27 18:24:44 +00:00
Ilya_Shlyakhter
9dd0de11eb added todo: let external remotes declare support for named pipes 2020-01-27 01:22:10 +00:00
Chel
99ead7bcf4 Added a comment 2020-01-26 22:48:09 +00:00
Joey Hess
5c6bf1be97
--whatelse is a better name than --describe-other-params
The use case is basically the user having forgotten, so --help would be
best, but it would be quite hard to include this in --help, since it may
even have to spin up an external special remote program.

I also considered --umm but typoed it the first time I tried it as
--uum, and while memorable, it's too cutesy. --whatelse is good because
it explicitly asks, what other params, besides the ones I've given?
2020-01-20 17:04:45 -04:00
Joey Hess
2be4122bfc
include passthrough params in --describe-other-params 2020-01-20 16:53:27 -04:00
Joey Hess
0b6fb506eb
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-17 17:30:09 -04:00
Joey Hess
b1c224dd48
done 2020-01-17 17:18:44 -04:00
yarikoptic
c1e2389e8e moving under datalad project, since I do not see explicit repronim-specific use case addressed 2020-01-17 17:32:08 +00:00
Joey Hess
8017f41476
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-15 14:16:27 -04:00
Joey Hess
ba518c625c
comment 2020-01-15 14:08:58 -04:00
kyle
76aa98ce83 Added a comment: re: what am I doing wrong? 2020-01-14 03:19:22 +00:00
yarikoptic
0fa983803f Added a comment: what am I doing wrong? 2020-01-13 20:05:40 +00:00
Joey Hess
4a135934ff
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-10 14:53:00 -04:00
Joey Hess
71ecfbfccf
be stricter about rejecting invalid configurations for remotes
This is a first step toward that goal, using the ProposedAccepted type
in RemoteConfig lets initremote/enableremote reject bad parameters that
were passed in a remote's configuration, while avoiding enableremote
rejecting bad parameters that have already been stored in remote.log

This does not eliminate every place where a remote config is parsed and a
default value is used if the parse false. But, I did fix several
things that expected foo=yes/no and so confusingly accepted foo=true but
treated it like foo=no. There are still some fields that are parsed with
yesNo but not not checked when initializing a remote, and there are other
fields that are parsed in other ways and not checked when initializing a
remote.

This also lays groundwork for rejecting unknown/typoed config keys.
2020-01-10 14:52:48 -04:00
https://christian.amsuess.com/chrysn
0207c44201 Added a comment: Summary; Application: shared thumbnails 2020-01-10 08:41:20 +00:00
Joey Hess
f735efc22c
comment 2020-01-09 16:54:11 -04:00
Joey Hess
e07a2d81d1
comment 2020-01-08 14:26:48 -04:00
Ilya_Shlyakhter
fdaa4e841a Added a comment: git-annex in docker on Windows 2020-01-08 16:16:32 +00:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
ac8139edc0 Added a comment: WSL 1/2 experience 2020-01-08 15:20:07 +00:00
Joey Hess
8aa6f60fc3
plan 2020-01-07 14:27:53 -04:00
spwhitton
6a47c66388 Added a comment 2020-01-07 12:29:49 +00:00
Joey Hess
b5fc1b97f7
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-06 15:40:48 -04:00
Joey Hess
6db883d6db
comment 2020-01-06 15:39:50 -04:00
Joey Hess
1bd7ec6f06
fix typo in close 2020-01-06 15:35:11 -04:00
Joey Hess
4bb3d76c8c
comment 2020-01-06 15:33:06 -04:00
Joey Hess
0cb3bcbcb5
comment 2020-01-06 15:29:51 -04:00
yarikoptic
aec7892a9f Added a comment 2020-01-06 19:27:23 +00:00
Joey Hess
128ecac047
close, redundant 2020-01-06 14:44:37 -04:00
Joey Hess
6456672feb
comment and close 2020-01-06 14:42:40 -04:00
Joey Hess
ba0150ebba
comments 2020-01-06 14:33:29 -04:00
Joey Hess
2de3dddfd2
reinject --known: Fix bug that prevented it from working in a bare repo.
ifAnnexed in a bare repo passes to git cat-file :./filename , which it
refuses to do since the repo is bare.

Note that, reinject somefile someannexedfile in a bare repo silently does
nothing, because someannexedfile is never actually an annexed worktree
file, because the repo is bare.
2020-01-06 14:22:22 -04:00
Joey Hess
d9ed94f15b
comment 2020-01-06 13:59:03 -04:00
Joey Hess
84960da522
comment 2020-01-06 13:24:39 -04:00
Joey Hess
a9086df1e7
update
Removed some encoding issues that I think are no longer a problem.
2020-01-06 13:06:10 -04:00
Joey Hess
0c904bdf5d
comment 2020-01-06 13:06:06 -04:00
Joey Hess
491a2fd72f
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-06 12:55:26 -04:00
Joey Hess
d19dbdb05e
comment 2020-01-06 12:52:59 -04:00
AdamSpiers
d5ab0ec1cc Added a comment: Would you accept a patch implementing an annex.autocommit gitattribute? 2020-01-06 16:12:54 +00:00
yarikoptic
d734068724 a new TODO for having windows build with MagicMime 2020-01-04 04:25:48 +00:00
Joey Hess
bc70a8b3f6
comments 2020-01-01 15:03:01 -04:00
Joey Hess
2cea674d1e
Merge branch 'master' into v8 2020-01-01 14:26:43 -04:00
Joey Hess
503788238c
add --force-annex/--force-git
options make it easier to override annex.largefiles configuration
(and potentially safer as it avoids bugs like the smudge bug fixed
in the last release)

Deleted some old comments that were posted to the man page discussing such
options.

Updated docs that used -c annex.largefiles to use the options.

Note that addSmallOverridden was needed to avoid the clean filter running
on the file. It would be possible to make addFile also update the index
directly, rather than going via git add. However, it was not necessary,
and I want to avoid breaking on some edge case, particularly if the code in
addSmallOverridden has some oversight.

Also, when annex.addunlocked is set and annex.largefiles does not match a file,
git annex add --force-large works, but git status will then show the file
as added, with a unstaged modification. The unstaged modification adds the
file to git. This is identical behavior to using -c annex.largefiles=nothing
when annex.addunlocked is set. This does not prevent committing what was
intended to be added. I have not gotten to the bottom of why git thinks
the file is modified and runs it through the clean filter in this case.
2020-01-01 14:03:06 -04:00
Ilya_Shlyakhter
98b5762963 Added a comment: named pipes and external remotes 2019-12-31 01:38:03 +00:00
Joey Hess
8ea9f1bc5c
comment 2019-12-30 14:36:04 -04:00
Joey Hess
ea3cb7d277
fix a case where file tracked by git unexpectedly becomes annex pointer file
smudge: When annex.largefiles=anything, files that were already stored in
git, and have not been modified could sometimes be converted to being
stored in the annex. Changes in 7.20191024 made this more of a problem.
This case is now detected and prevented.
2019-12-27 15:08:03 -04:00
Joey Hess
4176b335a6
implelented in v8 2019-12-26 16:39:27 -04:00
Joey Hess
3cd3757236
annex.dotfiles
The git add behavior changes could be avoided if it turns out to be
really annoying, but then it would need to behave the old way when
annex.dotfiles=false and the new way when annex.dotfiles=true. I'd
rather not have the config option result in such divergent behavior as
`git annex add .` skipping a dotfile (old) vs adding to annex (new).

Note that the assistant always adds dotfiles to the annex.
This is surprising, but not new behavior. Might be worth making it also
honor annex.dotfiles, but I wonder if perhaps some user somewhere uses
it and keeps large files in a directory that happens to begin with a
dot. Since dotfiles and dotdirs are a unix culture thing, and the
assistant users may not be part of that culture, it seems best to keep
its current behavior for now.
2019-12-26 16:33:39 -04:00
Joey Hess
2b821eb225
Merge branch 'master' into sqlite 2019-12-26 15:15:42 -04:00
spwhitton
d107ce1e77 Added a comment 2019-12-21 23:03:46 +00:00
spwhitton
01b8eb5e3d add workaround 2019-12-21 22:20:31 +00:00
spwhitton
72c5f9132c report bug 2019-12-21 22:11:38 +00:00
spwhitton
1a5e29c47c fix copy/paste mistake 2019-12-21 04:20:40 +00:00
spwhitton
501492a40a file bug 2019-12-21 04:19:56 +00:00
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
7d50e98646
thought 2019-12-19 16:44:08 -04:00
Joey Hess
02e00fd7ab
Merge branch 'master' into sqlite 2019-12-19 16:33:42 -04:00
Joey Hess
e8651fbd09
comment 2019-12-19 13:39:08 -04:00