Commit graph

9741 commits

Author SHA1 Message Date
Joey Hess
69efc2c26b
comment 2020-06-11 17:36:17 -04:00
yarikoptic
c2f84a76bc Added a comment 2020-06-11 21:13:38 +00:00
Joey Hess
b60b8ecc78
clarify 2020-06-11 16:20:18 -04:00
Joey Hess
4e778ef849
response 2020-06-11 16:14:17 -04:00
Joey Hess
8a7c615a8f
import: Avoid using some strange names for temporary keys
The ContentIdentifier can contain almost anything, so could have characters
that are not fit for the filesystem, or might be longer than a key usually
is, or contain a newline, or .... genKeyName deals with those problems.

This should not present a back-compat issue, because this is a temporary
key used while downloading the imported file, before the real key for it
can be generated.
2020-06-11 16:07:36 -04:00
Joey Hess
0017d9a347
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-11 15:44:28 -04:00
Joey Hess
6b0cb2d732
defer cleaning keys db of old data
Avoid creating the keys database during init when there are no unlocked
files, to prevent init failing when sqlite does not work in the filesystem.
2020-06-11 15:40:13 -04:00
Joey Hess
d711dc31fa
response 2020-06-11 14:12:16 -04:00
yarikoptic
646a521473 reporting on a failed unittest on a crippled HOME. 2020-06-11 14:50:37 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
a0ffdac56e 2020-06-11 11:03:07 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
b65e596fb8 Added a comment: I wonder if this is related to the use of tor 2020-06-11 09:56:08 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
9102d31721 Added a comment: git-annex-repair and git annex fsck: no errors found 2020-06-10 14:39:44 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
c4a9647555 noticed confusing two rsync processes to copy one file. 2020-06-10 10:58:05 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
34b088b209 Output of --debug, Formatting 2020-06-08 15:09:20 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
634c66ea49 2020-06-08 14:24:37 +00:00
yarikoptic
08bc7a6867 reporting on SQLite3 problem rendering pidlocked system unusable 2020-06-05 02:31:21 +00:00
nicolas
3319855083 2020-06-04 13:17:39 +00:00
the13thletter
e3b487d41c Added a comment 2020-06-02 14:26:52 +00:00
yarikoptic
e8dd62689b Added a comment 2020-05-28 23:53:58 +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
5b28a37ea1
titles 2020-05-28 13:21:56 -04:00
Joey Hess
5ffc864718
comment 2020-05-28 13:21:40 -04:00
Joey Hess
4bf8f45efe
comment 2020-05-28 12:22:52 -04:00
Joey Hess
5e71e81fb6
close 2020-05-28 12:10:52 -04:00
Joey Hess
1572d72931
remove dup comment 2020-05-28 12:09:37 -04:00
Joey Hess
f2d91be78b
close 2020-05-28 12:08:26 -04:00
Joey Hess
e84d4c7a64
followup 2020-05-28 12:01:35 -04:00
Joey Hess
1d63d2bc83
close 2020-05-28 11:36:30 -04:00
Joey Hess
399eb4bdec
close 2020-05-28 11:32:27 -04:00
Joey Hess
484a74f073
auto-init autoenable=yes
Try to enable special remotes configured with autoenable=yes when git-annex
auto-initialization happens in a new clone of an existing repo. Previously,
git-annex init had to be explicitly run to enable them. That was a bit of a
wart of a special case for users to need to keep in mind.

Special remotes cannot display anything when autoenabled this way, to avoid
interfering with the output of git-annex query commands.

Any error messages will be hidden, and if it fails, nothing is displayed.
The user will realize the remote isn't enable when they try to use it,
and can run git-annex init manually then to try the autoenable again and
see what failed.

That seems like a reasonable approach, and it's less complicated than
communicating something across a pipe in order to display it as a side
message. Other reason not to do that is that, if the first command the
user runs is one like git-annex find that has machine readable output,
any message about autoenable failing would need to not be displayed anyway.
So better to not display a failure message ever, for consistency.

(Had to split out Remote.List.Util to avoid an import cycle.)
2020-05-27 12:40:35 -04:00
Joey Hess
3cf5f303ea
close 2020-05-27 11:03:18 -04:00
Joey Hess
7aba1aa49b
Merge branch 'master' of ssh://git-annex.branchable.com 2020-05-26 14:02:24 -04:00
Joey Hess
864ba4ecaa
disable buggy concurrency in Command.Export
Fix a crash or potentially not all files being exported when sync -J
--content is used with an export remote.

Crash as described in fixed bug report.

waitForAllRunningCommandActions inserted in several points where all the
commandActions started before need to have finished before moving on to
the next stage of the export. A race across those points could have
maybe resulted in not all files being exported, or a wrong tree being
export.

For example, changeExport starting up an action like
a rename of A to B. Then, with that action still running, fillExport
uploading a new A, *before* the rename occurred. That race seems
unlikely to have happened. There are some other ones that this also
fixes.
2020-05-26 13:54:08 -04:00
https://christian.amsuess.com/chrysn
7211cf63b6 Added a comment 2020-05-26 16:35:25 +00:00
Joey Hess
0bcecb67f5
export: Let concurrent transfers be done with -J or annex.jobs
Tested working, although I did find this bug in my testing, which also
afflicts sync -J to an export remote.
2020-05-26 11:44:07 -04:00
Joey Hess
e283c28249
comment 2020-05-26 11:21:10 -04:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
1ac2b8cc07 Added a comment 2020-05-25 11:07:08 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
91a8b271f7 Added a comment 2020-05-25 11:06:05 +00:00
https://christian.amsuess.com/chrysn
6ae6242a42 Tried --preserve-filename with a torrent, didn't work 2020-05-25 10:03:16 +00:00
arseni.lapunov@34f437c25a6a8c6d317dce0bb7c5b44d568fa595
55acb2e522 Added a comment: git-annex get fails 2020-05-22 14:28:24 +00:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
49a01413bc 2020-05-22 11:15:27 +00:00
Joey Hess
27459c6e3f
Support building with tasty-1.3
This commit was sponsored by Ethan Aubin.
2020-05-21 15:26:44 -04:00
Joey Hess
75bfcca462
Merge branch 'master' of ssh://git-annex.branchable.com 2020-05-21 14:47:51 -04:00
Joey Hess
e63dcbf36c
fix embedcreds=yes reversion
Fix bug that made enableremote of S3 and webdav remotes, that have
embedcreds=yes, fail to set up the embedded creds, so accessing the remotes
failed.

(Regression introduced in version 7.20200202.7 in when reworking all the
remote configs to be parsed.)

Root problem is that parseEncryptionConfig excludes all other config keys
except encryption ones, so it is then unable to find the
credPairRemoteField. And since that field is not required to be
present, it proceeds as if it's not, rather than failing in any visible
way.

This causes it to not find any creds, and so it does not cache
them. When when the S3 remote tries to make a S3 connection, it finds no
creds, so assumes it's being used in no-creds mode, and tries to find a
public url. With no public url available, it fails, but the failure doesn't
say a lack of creds is the problem.

Fix is to provide setRemoteCredPair with a ParsedRemoteConfig, so the full
set of configs of the remote can be parsed. A bit annoying to need to
parse the remote config before the full config (as returned by
setRemoteCredPair) is available, but this avoids the problem.

I assume webdav also had the problem by inspection, but didn't try to
reproduce it with it.

Also, getRemoteCredPair used getRemoteConfigValue to get a ProposedAccepted
String, but that does not seem right. Now that it runs that code, it
crashed saying it had just a String.

Remotes that have already been enableremoted, and so lack the cached creds
file will work after this fix, because getRemoteCredPair will extract
the creds from the remote config, writing the missing file.

This commit was sponsored by Ilya Shlyakhter on Patreon.
2020-05-21 14:35:30 -04:00
Joey Hess
0ae63d5eec
comment 2020-05-21 13:06:46 -04:00
Joey Hess
d5b7d2a473
followup and close 2020-05-21 12:30:51 -04:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
50357aa48b Added a comment 2020-05-20 13:54:23 +00:00
Joey Hess
224208a657
comment 2020-05-19 13:18:34 -04:00
arseni.lapunov@34f437c25a6a8c6d317dce0bb7c5b44d568fa595
de86a8d579 2020-05-18 15:07:35 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
1259b73c39 2020-05-18 08:00:16 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
b4e94b2a41 2020-05-18 07:59:55 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
7ab8b9a451 2020-05-18 07:58:43 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
b0bfb1e0e5 2020-05-17 08:13:41 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
0b1e94074e 2020-05-16 15:08:34 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
42072fe9ad 2020-05-16 15:07:41 +00:00
braun.markus89@51b521a42cc994db864df308627bd6454f9c309d
fc7caa5b2b 2020-05-16 15:06:42 +00:00
jeanpmbox-456@7222359de8d1f37a7cf25a519e8faf90a9517b50
99c4eb020e Added a comment 2020-05-15 21:21:30 +00:00
jeanpmbox-456@7222359de8d1f37a7cf25a519e8faf90a9517b50
2db70d70d1 Added a comment 2020-05-15 21:14:53 +00:00
Joey Hess
6361074174
convert renameExport to throw exception
Finishes the transition to make remote methods throw exceptions, rather
than silently hide them.

A bit on the fence about this one, because when renameExport fails,
it falls back to deleting instead, and so does the user care why it failed?

However, it did let me clean up several places in the code.

This commit was sponsored by Ethan Aubin.
2020-05-15 15:08:09 -04:00
https://launchpad.net/~felixonmars
f246e78fd7 2020-05-13 20:35:29 +00:00
Joey Hess
a6adea4aaf
Merge branch 'master' of ssh://git-annex.branchable.com 2020-05-13 14:05:11 -04:00
Joey Hess
c1cd402081
make storeKey throw exceptions
When storing content on remote fails, always display a reason why.

Since the Storer used by special remotes already did, this mostly affects
git remotes, but not entirely. For example, if git-lfs failed to connect to
the endpoint, it used to silently return False.
2020-05-13 14:03:00 -04:00
Chymera
e42d2ce0c7 Added a comment 2020-05-13 04:15:53 +00:00
ryan.singer@5db89d157f0565db67eac571e2433fa96c187e32
3b231f900c Added a comment 2020-05-12 23:26:11 +00:00
Joey Hess
898770dda1
comment 2020-05-12 13:58:14 -04:00
Joey Hess
35b3c891af
followup 2020-05-12 12:48:07 -04:00
Chymera
47bd71b096 2020-05-12 07:05:23 +00:00
Joey Hess
2a8fdfc7d8
Display a warning message when asked to operate on a file inside a directory that's a symbolic link to elsewhere
This relicates git's behavior. It adds a few stat calls for the command
line parameters, so there is some minor slowdown, but even with thousands
of parameters it will not be very noticable, and git does the same statting
in similar circumstances.

Note that this does not prevent eg "git annex add symlink"; the symlink
will be added to git as usual. And "git annex find symlink" will silently
list nothing as well. It's only "symlink/foo" or "subdir/symlink/foo" that
triggers the warning.
2020-05-11 15:03:35 -04:00
Joey Hess
39d7e6dd2a
addurl --preserve-filename for other remotes
Finishing work begun in 6952060665

Also, truncate filenames provided by other remotes if they're too long,
when --preserve-filename is not used. That seems to have been omitted
before by accident.
2020-05-11 14:33:27 -04:00
Joey Hess
cabbc91b18
addurl, importfeed: Allow '-' in filenames, as long as it's not the first character 2020-05-11 13:50:49 -04:00
Joey Hess
568c2b58c2
comments 2020-05-11 12:49:50 -04:00
Joey Hess
0e2e8df8bf
bug 2020-05-11 12:38:40 -04:00
yarikoptic
2b125e0dd7 Added a comment 2020-05-09 22:10:44 +00:00
the13thletter
b8a472ba84 2020-05-08 22:10:29 +00:00
Joey Hess
6952060665
addurl --preserve-filename and a few related changes
* addurl --preserve-filename: New option, uses server-provided filename
  without any sanitization, but with some security checking.

  Not yet implemented for remotes other than the web.

* addurl, importfeed: Avoid adding filenames with leading '.', instead
  it will be replaced with '_'.

  This might be considered a security fix, but a CVE seems unwattanted.
  It was possible for addurl to create a dotfile, which could change
  behavior of some program. It was also possible for a web server to say
  the file name was ".git" or "foo/.git". That would not overrwrite the
  .git directory, but would cause addurl to fail; of course git won't
  add "foo/.git".

sanitizeFilePath is too opinionated to remain in Utility, so moved it.

The changes to mkSafeFilePath are because it used sanitizeFilePath.
In particular:

	isDrive will never succeed, because "c:" gets munged to "c_"
	".." gets sanitized now
	".git" gets sanitized now
	It will never be null, because sanitizeFilePath keeps the length
	the same, and splitDirectories never returns a null path.

Also, on the off chance a web server suggests a filename of "",
ignore that, rather than trying to save to such a filename, which would
fail in some way.
2020-05-08 16:22:55 -04:00
Joey Hess
54599207f7
note 2020-05-08 15:56:15 -04:00
Joey Hess
980de9c910
comment 2020-05-08 13:21:16 -04:00
Joey Hess
de396fac80
comment 2020-05-08 13:16:46 -04:00
ryan.singer@5db89d157f0565db67eac571e2433fa96c187e32
25b6f7ca96 2020-05-07 22:11:04 +00:00
ryan.singer@5db89d157f0565db67eac571e2433fa96c187e32
f88c26c211 2020-05-07 22:09:44 +00:00
ryan.singer@5db89d157f0565db67eac571e2433fa96c187e32
6b49594d91 2020-05-07 22:08:30 +00:00
yarikoptic
a3d196fe39 original complaint about filenames obfuscated by addurl 2020-05-07 21:07:28 +00:00
Joey Hess
1532d67c3e
S3: Support signature=v4
To use S3 Signature Version 4. Some S3 services seem to require v4, while
others may only support v2, which remains the default.

I'm also not sure if v4 works correctly in all cases, there is this
upstream bug report: https://github.com/aristidb/aws/issues/262
I've only tested it against the default S3 endpoint.
2020-05-07 13:18:11 -04:00
Joey Hess
bb88a01910
upgrade: When upgrade fails due to an exception, display it.
37b42e72e7 made it catch exceptions but
thought they were unlikely to be useful to display, which may be right when
a git command fails, but not in the case yoh found.
2020-05-07 12:22:32 -04:00
Joey Hess
5eb101b720
respond and close 2020-05-07 12:10:46 -04:00
yarikoptic
c719998eed initial report on silent fail to upgrade 2020-05-07 15:02:41 +00:00
glasserc
6a9c3a710d Added a comment: Is dead really the solution here? 2020-05-06 20:29:04 +00:00
Joey Hess
0040d2c129
sync: Avoid an ugly error message when nothing has been committed to master yet and there is a synced master branch to merge from
Now the warning gets displayed, which is better than an arcane git error.

The warning is still kind of ugly, especially when the pull later in the
sync will clear up what it warns about. But, this is an unusual situation
not likely to happen, and if there is no remote to pull from, the warning
message is needed or the sync will seem to succeed despite not merging the
synced master branch.

Would still be better if it could merge the synced master branch in this
situation, making an empty commit to master to do it seems wrong, and
otherwise it would need a whole separate code path, and would bypass using
git merge in favor of say, setting master to the syned branch. Which would
bypass git configs like arguably merge.ff and certianly
merge.verifySignatures. So don't want to do that.
2020-05-05 14:31:37 -04:00
Joey Hess
681928e828
close 2020-05-05 12:52:23 -04:00
Joey Hess
ebbd8f94e6
response 2020-05-05 12:45:35 -04:00
Joey Hess
93db6bef15
improve docs 2020-05-05 12:39:38 -04:00
Joey Hess
3e91461c0f
close too old version 2020-05-04 13:05:41 -04:00
Joey Hess
f9ed30de3b
avoid beware of the leopard situation
* Display a warning message when a remote uses a protocol, such as
  git://, that git-annex does not support. Silently skipping such a
  remote was confusing behavior.

  It sets annex-ignore, so the warning is only displayed once.

* Also display a warning message when a remote, without a known uuid,
  is located in a directory that does not currently exist, to avoid
  silently skipping such a remote.

  This is a bit more debatable, since git-annex get will say,
  try making repository available. And since it does not set annex-ignore,
  the warning will be displayed repeatedly. It's also an extreme edge case,
  I don't think I've ever seen it happen in real life.
2020-05-04 13:01:11 -04:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
e116eb642a Added a comment: Still fails with git-annex 8.20200330 via backports 2020-05-04 09:02:03 +00:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
e81d516a0a 2020-05-03 02:39:31 +00:00
Joey Hess
e4a626018f
reproduced and some analysis 2020-05-01 14:58:24 -04:00
Joey Hess
f9f4f29cc2
fix extension 2020-05-01 14:18:57 -04:00
Joey Hess
bcf3604757
fix format 2020-05-01 12:30:58 -04:00
kyle
111b747be3 Added a comment: thanks! 2020-04-28 21:41:30 +00:00
Joey Hess
a386639a72
Merge branch 'master' of ssh://git-annex.branchable.com 2020-04-28 17:25:25 -04:00