Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2019-06-19 18:45:17 -04:00
commit 0e1140ac47
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 72 additions and 0 deletions

View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="kyle"
avatar="http://cdn.libravatar.org/avatar/7d6e85cde1422ad60607c87fa87c63f3"
subject="Issue with description cache?"
date="2019-06-17T21:11:14Z"
content="""
I took another look at this thinking that maybe I could spot something obvious in the condition added in a14f6ce75
```
{- Avoid overwriting existing description with a default
- description. -}
whenM (pure (isJust mdescription) <||> not . M.member u <$> uuidDescMap) $
describeUUID u =<< genDescription mdescription
```
but that looks fine. Grepping around for uuidDescMap, I spotted a couple of places where the cache needed to be invalidated. Blindly applying that same approach I did
```
diff --git a/Annex/Init.hs b/Annex/Init.hs
index cb7f8905e..6303103df 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -76,6 +76,7 @@ genDescription Nothing = do
initialize :: Maybe String -> Maybe RepoVersion -> Annex ()
initialize mdescription mversion = checkCanInitialize $ do
+ uuidDescMapLoad
{- Has to come before any commits are made as the shared
- clone heuristic expects no local objects. -}
sharedclone <- checkSharedClone
```
That fixes the problem on my end (i.e., `git annex init` sets the description to the default user@host:dir description) while still addressing the original issue fixed by a14f6ce75.
So it seems like it has something to do with the uuidDescMap cache, but I haven't been able to figure out what in particular.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="anarcat"
avatar="http://cdn.libravatar.org/avatar/4ad594c1e13211c1ad9edb81ce5110b7"
subject="thanks!"
date="2019-06-17T20:17:26Z"
content="""
thanks so much for this work! it's something I had identified as an annoyance in the conversation around [[forum/does_git-annex_parallelize_different_remotes__63__]] and I'm really happy to see you're working on this! so yeah, thanks again! :)
"""]]

View file

@ -0,0 +1,11 @@
When doing `git-annex-sync` with a [Bitbucket](https://bitbucket.org) repository, I get the errors:
>(master_env_v17) /web/personal/ilya > git annex sync
>
>Failed to get annex.uuid configuration of repository origin
>
>Instead, got: "logged in as notestaff\n\nYou can use git or hg to connect to Bitbucket. Shell access is disabled\n"
>
>This is unexpected; please check the network transport!
What is the right way to fix this? Thanks!

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="kyle"
avatar="http://cdn.libravatar.org/avatar/7d6e85cde1422ad60607c87fa87c63f3"
subject="Set remote.<name>.annex-ignore"
date="2019-06-19T14:18:19Z"
content="""
I think in this case you should set remote.origin.annex-ignore to true.
"""]]

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="comment 2"
date="2019-06-19T16:51:31Z"
content="""
But I do want git-annex-sync to sync the git-annex branch with that remote.
Normally, git-annex deals with the case of git remotes that don't support git-annex-shell without giving an error.
"""]]