git-annex.git
10 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 14 Oct 2015 16:37:58 +0000 (12:37 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

10 years agoChanged drop ordering when using git annex sync --content or the assistant, to drop...
Joey Hess [Wed, 14 Oct 2015 16:33:02 +0000 (12:33 -0400)]
Changed drop ordering when using git annex sync --content or the assistant, to drop from remotes first and from the local repo last. This works better with the behavior changes to drop in many cases.

10 years agotiming info
anarcat [Tue, 13 Oct 2015 20:37:41 +0000 (20:37 +0000)]
timing info

10 years agofix various build warnings, mostly on Windows
Joey Hess [Tue, 13 Oct 2015 17:24:44 +0000 (13:24 -0400)]
fix various build warnings, mostly on Windows

And some when S3 is disabled

10 years agoAdded a comment
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8 [Tue, 13 Oct 2015 16:57:24 +0000 (16:57 +0000)]
Added a comment

10 years agoput Win32-extras in extra-deps as it's not yet in lts
Joey Hess [Tue, 13 Oct 2015 16:34:01 +0000 (12:34 -0400)]
put Win32-extras in extra-deps as it's not yet in lts

10 years agomore notes
anarcat [Tue, 13 Oct 2015 16:02:06 +0000 (16:02 +0000)]
more notes

10 years agoworkarounds
anarcat [Tue, 13 Oct 2015 14:14:16 +0000 (14:14 +0000)]
workarounds

10 years agoclarification
anarcat [Tue, 13 Oct 2015 11:41:09 +0000 (11:41 +0000)]
clarification

10 years agoAdded a comment
darkfeline [Tue, 13 Oct 2015 05:24:26 +0000 (05:24 +0000)]
Added a comment

10 years agonew bug
Antoine Beaupré [Tue, 13 Oct 2015 04:47:58 +0000 (00:47 -0400)]
new bug

10 years ago(no commit message)
darkfeline [Tue, 13 Oct 2015 04:33:24 +0000 (04:33 +0000)]

10 years agodoc/devblog/day_322-326__concurrent_drop_safety.mdwn: Wording
Richard Hartmann [Mon, 12 Oct 2015 20:50:16 +0000 (22:50 +0200)]
doc/devblog/day_322-326__concurrent_drop_safety.mdwn: Wording

10 years agocomment typo
Joey Hess [Mon, 12 Oct 2015 20:32:52 +0000 (16:32 -0400)]
comment typo

10 years agofix windows build
Joey Hess [Mon, 12 Oct 2015 19:48:59 +0000 (15:48 -0400)]
fix windows build

10 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 12 Oct 2015 19:09:47 +0000 (15:09 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

10 years agofix export list to work on windows
Joey Hess [Mon, 12 Oct 2015 19:08:17 +0000 (15:08 -0400)]
fix export list to work on windows

10 years agoresponse
Joey Hess [Mon, 12 Oct 2015 18:55:02 +0000 (14:55 -0400)]
response

10 years agoAvoid unncessary write to the location log when a file is unlocked and then added...
Joey Hess [Mon, 12 Oct 2015 18:46:28 +0000 (14:46 -0400)]
Avoid unncessary write to the location log when a file is unlocked and then added back with unchanged content.

Implemented with no additional overhead of compares etc.

This is safe to do for presence logs because of their locality of change;
a given repo's presence logs are only ever changed in that repo, or in a
repo that has just been actively changing the content of that repo.

So, we don't need to worry about a split-brain situation where there'd
be disagreement about the location of a key in a repo. And so, it's ok to
not update the timestamp when that's the only change that would be made
due to logging presence info.

10 years agoAdded a comment
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Mon, 12 Oct 2015 18:21:21 +0000 (18:21 +0000)]
Added a comment

10 years agocomment
Joey Hess [Mon, 12 Oct 2015 17:29:00 +0000 (13:29 -0400)]
comment

10 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 12 Oct 2015 17:17:01 +0000 (13:17 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

10 years agoresponse
Joey Hess [Mon, 12 Oct 2015 17:16:00 +0000 (13:16 -0400)]
response

10 years agoresponse
Joey Hess [Mon, 12 Oct 2015 17:13:27 +0000 (13:13 -0400)]
response

10 years agoresponse
Joey Hess [Mon, 12 Oct 2015 17:08:34 +0000 (13:08 -0400)]
response

10 years agoclose
Joey Hess [Mon, 12 Oct 2015 17:06:58 +0000 (13:06 -0400)]
close

10 years agoavoid ugly error about MVar if the sqlite worker thread crashes
Joey Hess [Mon, 12 Oct 2015 17:00:22 +0000 (13:00 -0400)]
avoid ugly error about MVar if the sqlite worker thread crashes

10 years ago(no commit message)
efraim@78c5af2ab57cf0d7aa23bae3dd0adb700c98217c [Sun, 11 Oct 2015 20:05:14 +0000 (20:05 +0000)]

10 years ago(no commit message)
tribut [Sun, 11 Oct 2015 17:33:20 +0000 (17:33 +0000)]

10 years agouse action, not sideAction
Joey Hess [Sun, 11 Oct 2015 17:29:44 +0000 (13:29 -0400)]
use action, not sideAction

sideAction is for things not generally related to the current action being
performed. And, it adds a newline after the side action. This was not the
right thing to use for stuff like "checksum", where doing a checksum is
part of the git annex get process, and indeed we want it to display
"(checksum...) ok"

10 years agoAdded a comment
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Sun, 11 Oct 2015 16:51:07 +0000 (16:51 +0000)]
Added a comment

10 years agoAdded a comment
dah [Sat, 10 Oct 2015 19:02:56 +0000 (19:02 +0000)]
Added a comment

10 years agoAdded a comment
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Sat, 10 Oct 2015 18:53:58 +0000 (18:53 +0000)]
Added a comment

10 years agoAdded a comment
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Sat, 10 Oct 2015 10:16:15 +0000 (10:16 +0000)]
Added a comment

10 years agofix close tag
Joey Hess [Fri, 9 Oct 2015 22:12:00 +0000 (18:12 -0400)]
fix close tag

10 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 9 Oct 2015 22:05:10 +0000 (18:05 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

10 years agoMerge branch 'dropproof'
Joey Hess [Fri, 9 Oct 2015 22:03:00 +0000 (18:03 -0400)]
Merge branch 'dropproof'

10 years agomassive devblog
Joey Hess [Fri, 9 Oct 2015 22:02:35 +0000 (18:02 -0400)]
massive devblog

10 years agoadd inAnnex check to local lockKey
Joey Hess [Fri, 9 Oct 2015 22:00:37 +0000 (18:00 -0400)]
add inAnnex check to local lockKey

10 years agoclose bug
Joey Hess [Fri, 9 Oct 2015 21:32:12 +0000 (17:32 -0400)]
close bug

10 years agoimprove display when lockcontent fails
Joey Hess [Fri, 9 Oct 2015 21:21:02 +0000 (17:21 -0400)]
improve display when lockcontent fails

/dev/null stderr; ssh is still able to display a password prompt
despite this

Show some messages so the user knows it's locking a remote, and
knows if that locking failed.

10 years agoimplement lockContent for ssh remotes
Joey Hess [Fri, 9 Oct 2015 20:55:41 +0000 (16:55 -0400)]
implement lockContent for ssh remotes

10 years agocleanup changelog
Joey Hess [Fri, 9 Oct 2015 20:18:16 +0000 (16:18 -0400)]
cleanup changelog

10 years agoalso generate a drop safety proof for move --from remote
Joey Hess [Fri, 9 Oct 2015 20:16:03 +0000 (16:16 -0400)]
also generate a drop safety proof for move --from remote

10 years agotests and verified that the bug is fixed, in all the cases I identified
Joey Hess [Fri, 9 Oct 2015 19:59:42 +0000 (15:59 -0400)]
tests and verified that the bug is fixed, in all the cases I identified

10 years agofix local dropping to not require extra locking of copies, but only that the local...
Joey Hess [Fri, 9 Oct 2015 19:48:02 +0000 (15:48 -0400)]
fix local dropping to not require extra locking of copies, but only that the local copy be locked for removal

10 years agoimprove message when drop failed due to no locked copy
Joey Hess [Fri, 9 Oct 2015 19:14:25 +0000 (15:14 -0400)]
improve message when drop failed due to no locked copy

10 years agorename constructor
Joey Hess [Fri, 9 Oct 2015 19:01:16 +0000 (15:01 -0400)]
rename constructor

10 years agoverify local copy of content with locking
Joey Hess [Fri, 9 Oct 2015 18:57:32 +0000 (14:57 -0400)]
verify local copy of content with locking

10 years ago(no commit message)
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d [Fri, 9 Oct 2015 18:45:13 +0000 (18:45 +0000)]

10 years agodisplay drop safety proofs in debug mode
Joey Hess [Fri, 9 Oct 2015 17:47:19 +0000 (13:47 -0400)]
display drop safety proofs in debug mode

10 years agoAdded a comment: post-receive hook
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d [Fri, 9 Oct 2015 17:41:51 +0000 (17:41 +0000)]
Added a comment: post-receive hook

10 years agofix lockKey to run callback in original Annex monad, not local remote's
Joey Hess [Fri, 9 Oct 2015 17:35:28 +0000 (13:35 -0400)]
fix lockKey to run callback in original Annex monad, not local remote's

10 years agocontent locking during drop working for local git remotes
Joey Hess [Fri, 9 Oct 2015 17:07:03 +0000 (13:07 -0400)]
content locking during drop working for local git remotes

Only ssh remotes lack locking now

10 years agofinish and use lockContent interface
Joey Hess [Fri, 9 Oct 2015 16:36:04 +0000 (12:36 -0400)]
finish and use lockContent interface

10 years agoimprove drop proof code
Joey Hess [Fri, 9 Oct 2015 15:09:46 +0000 (11:09 -0400)]
improve drop proof code

10 years agorefactor
Joey Hess [Fri, 9 Oct 2015 14:30:22 +0000 (10:30 -0400)]
refactor

10 years agoremoved
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Fri, 9 Oct 2015 08:47:42 +0000 (08:47 +0000)]
removed

10 years agoAdded a comment
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Fri, 9 Oct 2015 08:45:45 +0000 (08:45 +0000)]
Added a comment

10 years agoAdded a comment
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Fri, 9 Oct 2015 08:45:25 +0000 (08:45 +0000)]
Added a comment

10 years ago(no commit message)
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw [Fri, 9 Oct 2015 08:35:31 +0000 (08:35 +0000)]

10 years agoAdded a comment
darkfeline [Fri, 9 Oct 2015 02:25:57 +0000 (02:25 +0000)]
Added a comment

10 years ago(no commit message)
darkfeline [Fri, 9 Oct 2015 02:19:40 +0000 (02:19 +0000)]

10 years agoAdded a comment: Sharing S3 bucket between repos
darkfeline [Fri, 9 Oct 2015 01:16:25 +0000 (01:16 +0000)]
Added a comment: Sharing S3 bucket between repos

10 years agoTrustedCopy is good enough to allow dropping
Joey Hess [Thu, 8 Oct 2015 22:32:31 +0000 (18:32 -0400)]
TrustedCopy is good enough to allow dropping

By definition, a trusted repository is trusted to always have its location
tracking log accurate. Thus, it should never be in a position where content
is being dropped from it concurrently, as that would result in the location
tracking log not being accurate.

10 years agotry harder to verify until at least one VerifiedCopyLock is obtained
Joey Hess [Thu, 8 Oct 2015 22:20:36 +0000 (18:20 -0400)]
try harder to verify until at least one VerifiedCopyLock is obtained

This avoids a failure where eg, we start with RecentlyVerifiedCopies
for all remotes, and so didn't do any active verification, which is
required.

Also, dedup the list of VerifiedCopies when checking if we have enough,
in case 2 copies of a UUID slip in.

10 years agorequire 1 locked copy while dropping from local or a remote
Joey Hess [Thu, 8 Oct 2015 22:11:39 +0000 (18:11 -0400)]
require 1 locked copy while dropping from local or a remote

See doc/bugs/concurrent_drop--from_presence_checking_failures.mdwn for
discussion about why 1 locked copy is all we can require, and how this
fixes concurrent dropping bugs.

Note that, since nothing yet generates a VerifiedCopyLock yet, this commit
breaks dropping temporarily.

10 years agosupport invalidating existing VerifiedCopys
Joey Hess [Thu, 8 Oct 2015 21:58:32 +0000 (17:58 -0400)]
support invalidating existing VerifiedCopys

10 years agoadd VerifiedCopy data type
Joey Hess [Thu, 8 Oct 2015 20:55:11 +0000 (16:55 -0400)]
add VerifiedCopy data type

There should be no behavior changes in this commit, it just adds a more
expressive data type and adjusts code that had been passing around a [UUID]
or sometimes a Maybe Remote to instead use [VerifiedCopy].

Although, since some functions were taking two different [UUID] lists,
there's some potential for me to have gotten it horribly wrong.

10 years agoadd removeKey action to Remote
Joey Hess [Thu, 8 Oct 2015 19:01:38 +0000 (15:01 -0400)]
add removeKey action to Remote

Not implemented for any remotes yet; probably the git remote is the only
one that will ever implement it.

10 years agounused import
Joey Hess [Thu, 8 Oct 2015 18:59:34 +0000 (14:59 -0400)]
unused import

10 years agoI think this comment is stale/confusing; remove
Joey Hess [Thu, 8 Oct 2015 18:51:44 +0000 (14:51 -0400)]
I think this comment is stale/confusing; remove

10 years agogit-annex-shell: Added lockcontent command, to prevent dropping of key's content.
Joey Hess [Thu, 8 Oct 2015 18:47:46 +0000 (14:47 -0400)]
git-annex-shell: Added lockcontent command, to prevent dropping of key's content.

10 years agoadd lockContentShared
Joey Hess [Thu, 8 Oct 2015 18:27:37 +0000 (14:27 -0400)]
add lockContentShared

Also, rename lockContent to lockContentExclusive

inAnnexSafe should perhaps be eliminated, and instead use
`lockContentShared inAnnex`. However, I'm waiting on that, as there are
only 2 call sites for inAnnexSafe and it's fiddly.

10 years agoexport FileMode type
Joey Hess [Thu, 8 Oct 2015 18:26:21 +0000 (14:26 -0400)]
export FileMode type

10 years agoAdded a comment: ah -- the 32bit build I guess
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Thu, 8 Oct 2015 17:50:50 +0000 (17:50 +0000)]
Added a comment: ah -- the 32bit build I guess

10 years agoadd tryLockShared
Joey Hess [Thu, 8 Oct 2015 17:40:23 +0000 (13:40 -0400)]
add tryLockShared

10 years agoopen lock file ReadOnly when taking shared lock
Joey Hess [Thu, 8 Oct 2015 17:31:55 +0000 (13:31 -0400)]
open lock file ReadOnly when taking shared lock

It's only necessary to open a file for write when taking an exclusive lock.

10 years agoAdded a comment: standalone builds
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4 [Thu, 8 Oct 2015 16:35:11 +0000 (16:35 +0000)]
Added a comment: standalone builds

10 years agoAdded a comment: Git Version
jec@8edf298ac8f8152bffcd4fdc1a310949d3547fe4 [Wed, 7 Oct 2015 20:24:05 +0000 (20:24 +0000)]
Added a comment: Git Version

10 years agoAdded a comment
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Wed, 7 Oct 2015 20:22:16 +0000 (20:22 +0000)]
Added a comment

10 years agoAdded a comment
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626 [Wed, 7 Oct 2015 20:12:20 +0000 (20:12 +0000)]
Added a comment

10 years agogetting proof-y
Joey Hess [Wed, 7 Oct 2015 19:52:56 +0000 (15:52 -0400)]
getting proof-y

10 years agoDebian: Remove dependency on transformers library, as it is now included in ghc.
Joey Hess [Wed, 7 Oct 2015 16:26:48 +0000 (12:26 -0400)]
Debian: Remove dependency on transformers library, as it is now included in ghc.

Backporters will need to revert this.

10 years agotitles
Joey Hess [Wed, 7 Oct 2015 15:28:07 +0000 (11:28 -0400)]
titles

10 years agoindents
Joey Hess [Wed, 7 Oct 2015 15:25:55 +0000 (11:25 -0400)]
indents

10 years agoalternative solution
Joey Hess [Wed, 7 Oct 2015 15:23:27 +0000 (11:23 -0400)]
alternative solution

10 years agoanalysis of some topologies, and idea to generate moves
Joey Hess [Wed, 7 Oct 2015 15:03:15 +0000 (11:03 -0400)]
analysis of some topologies, and idea to generate moves

10 years agoDebian: Add torrent library to build-depends as it's packaged now, and stop recommend...
Joey Hess [Wed, 7 Oct 2015 13:08:37 +0000 (09:08 -0400)]
Debian: Add torrent library to build-depends as it's packaged now, and stop recommending bittornado | bittorrent.

10 years agobe verbose to debug problem with aws
Joey Hess [Tue, 6 Oct 2015 23:56:25 +0000 (19:56 -0400)]
be verbose to debug problem with aws

10 years agoadd test cases for copy --auto
Joey Hess [Tue, 6 Oct 2015 21:35:29 +0000 (17:35 -0400)]
add test cases for copy --auto

(Only --from for now, should add --to sometime but I'm on low sleep so this
is the mininal test to catch the reversion just fixed, bad me for doing it
backwards and incompletely.)

10 years agocopy --auto was checking the wrong repo's preferred content. (--from was checking...
Joey Hess [Tue, 6 Oct 2015 21:29:44 +0000 (17:29 -0400)]
copy --auto was checking the wrong repo's preferred content. (--from was checking what --to should, and vice-versa.) Fixed this bug, which was introduced in version 5.20150727.

10 years agooops, didn't mean to commit this debug
Joey Hess [Tue, 6 Oct 2015 21:28:20 +0000 (17:28 -0400)]
oops, didn't mean to commit this debug

10 years agoanalysis
Joey Hess [Tue, 6 Oct 2015 21:11:52 +0000 (17:11 -0400)]
analysis

10 years agocomment
Joey Hess [Tue, 6 Oct 2015 21:05:38 +0000 (17:05 -0400)]
comment

10 years agoforce installing older warp; current fails to build
Joey Hess [Sun, 4 Oct 2015 18:51:23 +0000 (14:51 -0400)]
force installing older warp; current fails to build

10 years agosed out the filename from sha1sum output
Joey Hess [Tue, 6 Oct 2015 20:53:24 +0000 (16:53 -0400)]
sed out the filename from sha1sum output

10 years agohopefuly fix sha1sum calling; also refactor and check downloaded program's sha before...
Joey Hess [Tue, 6 Oct 2015 20:44:12 +0000 (16:44 -0400)]
hopefuly fix sha1sum calling; also refactor and check downloaded program's sha before using it

10 years agoconfirmed
Joey Hess [Tue, 6 Oct 2015 20:33:44 +0000 (16:33 -0400)]
confirmed

10 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 6 Oct 2015 20:29:14 +0000 (16:29 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com