Commit graph

7321 commits

Author SHA1 Message Date
Joey Hess
f08ad2f916
retitle 2016-11-01 13:50:09 -04:00
Joey Hess
5f3390336a
comment 2016-10-31 18:41:22 -04:00
Joey Hess
b530e43285
Fix reversion in 6.20161012 that prevented adding files with a space in their name. 2016-10-31 18:39:37 -04:00
Joey Hess
a986b12cf2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-10-31 18:34:27 -04:00
aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7
32feb186c6 Added a comment 2016-10-31 22:31:44 +00:00
Joey Hess
040b26b2f6
comments 2016-10-31 18:07:11 -04:00
aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7
80ecf6496a 2016-10-31 21:40:06 +00:00
aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7
bec8368911 Added a comment 2016-10-31 21:29:42 +00:00
Joey Hess
7ec02ad9e6
reproduce 2016-10-31 17:18:04 -04:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
cf3234391f Added a comment 2016-10-31 20:59:30 +00:00
Joey Hess
29f33155d6
comment 2016-10-31 16:56:40 -04:00
Joey Hess
d00a59b4c3
comment 2016-10-31 16:37:40 -04:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
54d0e9fb56 Added a comment 2016-10-31 19:50:23 +00:00
Joey Hess
fd5396bdab
response 2016-10-31 15:34:19 -04:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
c5a459bc81 Added a comment: SOLVED 2016-10-31 19:08:17 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
affaa85b7d Added a comment 2016-10-31 18:51:17 +00:00
Joey Hess
ec2e1569e6
Linux standalone: Fix location of locale files in the bundle.
The Makefile was putting them in git-annex.linux/i18n/i18n, and so I18NPATH
did not point to the files. I think that on close enough to Debian systems,
localedef then fell back to using the system-wide locale files, while on
other systems it would fail to generate locales.
2016-10-31 14:31:46 -04:00
Joey Hess
2ad7b00e29
Assistant, repair: Fix ignoring of git fsck errors due to duplicate file entries in tree objects. 2016-10-31 14:00:37 -04:00
Joey Hess
adaeba010f
comment 2016-10-31 13:03:12 -04:00
aranea@650e41fad422f2a4d6f36ca1f20d41b7c0f18ab7
3fc82fb4e2 Feature request: Support for skein512_256 hash 2016-10-30 15:09:53 +00:00
EskildHustvedt
f23452ff34 2016-10-29 08:06:00 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
cf168e1c6f Added a comment 2016-10-28 10:17:19 +00:00
Joey Hess
0ae08947ac
Run ssh with ServerAliveInterval 60
So that stalled transfers will be noticed within about 3 minutes,
even if TCPKeepAlive is disabled or doesn't work.

Rather than setting with -o, use -F with another config file,
so that any settings in ~/.ssh/config or /etc/ssh/ssh_config overrides this.
2016-10-26 16:41:34 -04:00
Joey Hess
075602b1df
comment 2016-10-26 16:18:52 -04:00
Joey Hess
8dcf79694d
enable forwardRetry for command-line transfers
If a transfer fails for some reason, but some data managed to be sent, the
transfer will be retried. (The assistant already did this.)

Possible impacts:

* More ssh prompts if ssh needs to prompt for a password to connect to a
  host, or is prompting about some other problem like a ssh key mismatch.

* More data transfer due to retrying, epecially when a remote does not
  support resuming a transfer.

  In the worst case, a lot of data will be transferred but it fails before
  the end, and then all that data gets transferred again plus one byte more;
  repeat until it manages to get the whole file.
2016-10-26 15:38:27 -04:00
Joey Hess
ca2435b21b
remove duplicate of top of page 2016-10-26 14:25:54 -04:00
Joey Hess
0e9224b2b4
comment 2016-10-26 14:24:13 -04:00
Joey Hess
3237976d76
comment 2016-10-26 14:13:00 -04:00
Joey Hess
8f2547ef89
comment 2016-10-26 14:04:59 -04:00
Joey Hess
c546e3a5c8
cose 2016-10-26 13:44:08 -04:00
Joey Hess
a7e9db48a7
comment 2016-10-26 13:27:18 -04:00
Joey Hess
55d4d51590
Merge branch 'master' of ssh://git-annex.branchable.com 2016-10-26 13:17:19 -04:00
Joey Hess
1a8ba7eab4
Improve ssh socket cleanup code to skip over the cruft that NFS sometimes puts in a directory when a file is being deleted. 2016-10-26 13:16:41 -04:00
jonan
80dac1cfdd 2016-10-25 10:51:29 +00:00
JohnKozak
c65cbaee99 2016-10-23 21:05:57 +00:00
JohnKozak
daa66dc8bd 2016-10-23 18:30:21 +00:00
ewen
ecb6ca5602 2016-10-21 06:12:49 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
38e76f27b9 Added a comment 2016-10-19 10:28:13 +00:00
johannes@12f1850a57e13cc234b5ebf88a5d3ac68915a6c2
6d4f446a06 2016-10-18 10:09:44 +00:00
Joey Hess
3a3f126956
close 2016-10-17 16:36:35 -04:00
Joey Hess
10ca4b9788
Improve style of offline html build of website. 2016-10-17 15:55:49 -04:00
Joey Hess
cc5de0a94b
close 2016-10-17 15:30:33 -04:00
Joey Hess
8e22114735
upgrade: Handle upgrade to v6 when the repository already contains v6 unlocked files whose content is already present.
Closes https://github.com/datalad/datalad/issues/1020

The use of runWriter in scanUnlockedFiles broke due to this change;
it failed with blocked indefinitely in mvar, because the database write
handle was taken while linkFromAnnex needed to also write to it (to update
the inode cache). So, switched to using a separate runWriter for each call
to addAssociatedFileFast. A little less efficient, but not greatly; the
writes should all still be cached.
2016-10-17 15:19:47 -04:00
Joey Hess
93425dd575
note 2016-10-17 14:21:55 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
17cce14d19 original whining 2016-10-17 16:17:59 +00:00
https://launchpad.net/~helpunclejackoff
867a4ac4e8 Added a comment: Dumb old me.... 2016-10-15 10:12:17 +00:00
Joey Hess
3f25317ad5
fix tree graft-in bug
When adding a tree like a/b/c/d when a/b already exists, fixes the bug that
the tree that got created was a/b/a/b/c/d

Just need to flatten out the top N directories of the tree that's being
grafted in, so we get the c/d part. This was complicated by the Tree
data type being a rose tree rather than a regular tree.

This commit was sponsored by Nick Daly on Patreon.
2016-10-11 15:36:40 -04:00
Joey Hess
66ebf1a8f9
add test case for sync_in_adjusted_branch_deleted_recently_added_files
This commit was sponsored by Denis Dzyubenko on Patreon.
2016-10-11 14:22:49 -04:00
Joey Hess
b82c3e0783
sync: Fix bug in adjusted branch merging that could cause recently added files to be lost when updating the adjusted branch.
The modification flag was not being set when making modifications deep
in a tree, so parent trees were not updated to contain the modified tree.

Seems to have exposed another bug where the wrong filename gets grafted in.

This commit was sponsored by Brock Spratlen on Patreon.
2016-10-10 15:00:45 -04:00
Joey Hess
d2527c421c
more analysis 2016-10-10 14:23:24 -04:00