Commit graph

29753 commits

Author SHA1 Message Date
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
3d786ebb4e Added a comment: Retrieving initremote parameters for new user 2017-02-14 00:03:35 +00:00
Joey Hess
7a06c91f7f
devblog 2017-02-13 17:42:03 -04:00
Joey Hess
3b22ad9f47
Work around sqlite's incorrect handling of umask when creating databases.
Refactored some common code into initDb.

This only deals with the problem when creating new databases. If a repo
got bad permissions into it, it's up to the user to deal with it.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2017-02-13 17:39:16 -04:00
Joey Hess
d2174915c0
response 2017-02-13 16:19:39 -04:00
Joey Hess
47a4b552c0
comment 2017-02-13 16:11:58 -04:00
Joey Hess
748ecc51d8
remove recent addition of receive.denyNonFastForwards to walkthrough
That is a dangerous setting, and not needed.

I tried the walkthrough as it was without it, and syncing in the USB
remote worked ok. There was a problem merging from origin/master, since
that branch didn't exist yet, but that didn't prevent sync from working
at all.

To avoid even that problem, reordered the walkthrough, so files get
committed to the repo before the remote gets set up.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2017-02-13 16:02:53 -04:00
Joey Hess
f431e1aec5
fix commit id 2017-02-13 15:55:32 -04:00
Joey Hess
f36adc2dbc
include problem PairData in error message
Users occasionally report this error firing, and I can't see why,
so include the rejected PairData in the error message.

This is safe even if it contains evil escape characters, because showing
it displays them in escaped form.

This commit was sponsored by Bruno BEAUFILS on Patreon.
2017-02-13 15:54:28 -04:00
Joey Hess
f36c230c78
comment 2017-02-13 15:39:46 -04:00
Joey Hess
976676a7b0
S3: Fix check of uuid file stored in bucket, which was not working.
The check was broken in two ways.. First, nowhere did it error out when
checkUUIDFile found a different UUID already in the file. Instead,
it overwrote the uuid file.

And, checkUUIDFile's implementation was for some reason always failing with
a ConnectionClosed exception. Apparently something to do with using two
different runResourceT's and a response getting GCed inbetween. I'm pretty
sure that used to work, but changed to a more obviously correct
implementation.

This commit was sponsored by Peter Hogg on Patreon.
2017-02-13 15:35:24 -04:00
Joey Hess
b6cfb9a73a
comment 2017-02-13 14:54:13 -04:00
Joey Hess
952474dabc
comment 2017-02-13 14:43:31 -04:00
Joey Hess
6479bf7158
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-13 12:46:15 -04:00
Joey Hess
3ecbde6376
fix OSX build 2017-02-13 12:41:28 -04:00
lasitus
e4218c0369 2017-02-13 03:08:14 +00:00
Edward Betts
0750913136
correct spelling mistakes 2017-02-12 17:30:23 -04:00
http://xgm.de/oid/
7102a73db2 2017-02-12 16:28:03 +00:00
edward
398125b573 correct spelling mistake 2017-02-11 09:16:26 +00:00
edward
d90c51b014 correct spelling mistake 2017-02-11 09:14:27 +00:00
Joey Hess
5e6ced7d0f
Improve pid locking code to work on filesystems that don't support hard links.
Probing for hard link support in the pid locking code is redundant since
git-annex init already probes that. But, it didn't seem worth threading
that data through; the pid locking code runs at most once per git-annex
process, and only on unusual filesystems. Optimising a single hard link
and unlink isn't worth it.

This commit was sponsored by Francois Marier on Patreon.
2017-02-10 15:22:28 -04:00
Joey Hess
913b3b51e3
comment 2017-02-10 14:51:50 -04:00
Joey Hess
1f43ecdf0e
comment 2017-02-10 14:04:55 -04:00
Joey Hess
e2c98f5788
Added git template directory to Linux standalone tarball and OSX app bundle.
Git does not provide a switch to find out where this directory is, and
while the git-init man page says it will always be in
/usr/share/git-core/templates, that's not the case on OSX with git
installed from homebrew. So, I used a hack taking the --man-path and
constructing a path from that. Works on both Debian and OSX at least.
2017-02-10 13:55:54 -04:00
Joey Hess
45f884418f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-10 13:51:53 -04:00
yarikoptic
938db690a8 2017-02-10 02:33:49 +00:00
yarikoptic
c4f1d00a70 Added a comment 2017-02-10 01:38:33 +00:00
Joey Hess
0e7cbadf25
close 2017-02-09 18:59:45 -04:00
Joey Hess
ba61229c77
update 2017-02-09 18:58:13 -04:00
victorsavu3@d059e0a74888923e70a555ce8ab75e8ba00b6eb7
72311753b3 Added a comment: RequestTimeoutException when uploading to glacier 2017-02-09 20:45:42 +00:00
Joey Hess
2e92648383
comment 2017-02-09 16:13:02 -04:00
Joey Hess
c1ece47ea0
import --reinject-duplicates
This is the same as running git annex reinject --known, followed by
git-annex import. The advantage to having it in one command is that it
only has to hash each file once; the two commands have to
hash the imported files a second time.

This commit was sponsored by Shane-o on Patreon.
2017-02-09 15:41:00 -04:00
Joey Hess
eae186e4b9
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-09 15:33:42 -04:00
Joey Hess
f617988a29
Make import --deduplicate and --skip-duplicates only hash once, not twice
import: --deduplicate and --skip-duplicates were implemented inneficiently;
they unncessarily hashed each file twice. They have been improved to only
hash once.

The new approach is to lock down (minimally) and hash files, and then
reuse that information when importing them.

This was rather tricky, especially in detecting changes to files while
they are being imported.

The output of import changed slightly. While before it silently skipped
over files with eg --skip-duplicates, now it shows each file as it starts
to act on it. Since every file is hashed first thing, it would otherwise
not be clear what file import is chewing on. (Actually, it wasn't clear
before when any of the duplicates switches were used.)

This commit was sponsored by Alexander Thompson on Patreon.
2017-02-09 15:32:22 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
16be7b5cc5 Added a comment 2017-02-09 09:05:34 +00:00
dharrison@27b3fc3aa4a83cdc03f8e82ab4a8d4f6455e603d
de77aa6965 New Bug Report 2017-02-08 01:42:30 +00:00
dharrison@27b3fc3aa4a83cdc03f8e82ab4a8d4f6455e603d
5b38458342 removed 2017-02-08 01:32:52 +00:00
dharrison@27b3fc3aa4a83cdc03f8e82ab4a8d4f6455e603d
76e48fcd82 Added a comment: MacOSX and Debian cannot decrypt eachother's S3 credentials 2017-02-08 01:26:09 +00:00
CandyAngel
278f9f0454 Added a comment 2017-02-07 22:51:15 +00:00
Joey Hess
30ab4ecc4b
response 2017-02-07 18:07:47 -04:00
Joey Hess
e7e36b6e72
import: Changed how --deduplicate, --skip-duplicates, and --clean-duplicates determine if a file is a duplicate
Before, only content known to be present somewhere was considered a
duplicate. Now, any content that has been annexed before will be considered
a duplicate, even if all annexed copies of the data have been lost.

Note that --clean-duplicates and --deduplicate still check numcopies,
so won't delete duplicate files unless there's an annexed copy.

This makes import use the same method as reinject --known.

The man page already said that duplicate meant "its content is either
present in the local repository already, or git-annex knows of another
repository that contains it, or it was present in the annex before but has
been removed now". So, this is really only bringing the implementation into
line with the man page.

This commit was sponsored by Jochen Bartl on Patreon.
2017-02-07 17:41:58 -04:00
Joey Hess
a8e64d4148
response 2017-02-07 17:23:41 -04:00
Joey Hess
2b4813bd16
clarify description of --skip-duplicates behavior 2017-02-07 16:39:29 -04:00
Joey Hess
539784a1f0
close as dup 2017-02-07 15:21:55 -04:00
Joey Hess
d644316c94
respond and close 2017-02-07 15:18:45 -04:00
Joey Hess
27e89aeffc
initremote: When a uuid= parameter is passed, use the specified UUID for the new special remote, instead of generating a UUID.
This can be useful in some situations, eg when the same data can be
accessed via two different special remote backends.
2017-02-07 15:10:41 -04:00
Joey Hess
5c804cf42e
add SetupStage parameter to RemoteType.setup
Most remotes have an idempotent setup that can be reused for
enableremote, but in a few cases, it needs to tell which, and whether
a UUID was provided to setup was used.

This is groundwork for making initremote be able to provide a UUID.
It should not change any behavior.

Note that it would be nice to make the UUID always be provided to setup,
and make setup not need to generate and return a UUID. What prevented
this simplification is Remote.Git.gitSetup, which needs to reuse the
UUID of the git remote when setting it up, and so has to return that
UUID.

This commit was sponsored by Thom May on Patreon.
2017-02-07 14:55:58 -04:00
Joey Hess
7487b4da47
comment 2017-02-07 13:51:23 -04:00
Joey Hess
3439f3cc87
assistant: Make --autostart --foreground wait for the children it starts.
Before, the --foreground was ignored when autostarting.

This commit was sponsored by Denis Dzyubenko on Patreon.
2017-02-07 13:31:45 -04:00
Joey Hess
571eca4680
comment 2017-02-07 13:11:02 -04:00
Joey Hess
a89d98af6d
comment 2017-02-07 13:08:33 -04:00