mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update

Browse source
This commit is contained in:
Joey Hess 2019-03-07 13:28:18 -04:00
parent 50797ee2c5
commit 3f449f845e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/Helper/ExportImport.hs
View file

@ -157,7 +157,7 @@ adjustExportImport r = case M.lookup "exporttree" (config r) of
Just newcid -> do Just newcid -> do
liftIO $ ContentIdentifier.recordContentIdentifier db (uuid r') newcid k liftIO $ ContentIdentifier.recordContentIdentifier db (uuid r') newcid k
recordContentIdentifier (uuid r') newcid k recordContentIdentifier (uuid r') newcid k
return True return True
, removeExport = \k loc -> do , removeExport = \k loc -> do
db <- getciddb ciddbv db <- getciddb ciddbv
removeExportWithContentIdentifier (importActions r') k loc removeExportWithContentIdentifier (importActions r') k loc

10
doc/todo/import_tree.mdwn
View file

@ -10,9 +10,13 @@ this.
## implementation notes ## implementation notes
* getknowncids should run "updateexportdb exportdb exportdbv" * getknowncids needs to update the export db when the git-annex branch is
to make sure it sees the most current data, newer, otherwise it can miss the most recent information
but that leads to a STM deadlock for some reason?
Note that updating the db needs to write lock it.
* Remote.Helper.ExportImport calls recordContentIdentifier on a database
that is not write locked.
* Need to support annex-tracking-branch configuration, which documentation * Need to support annex-tracking-branch configuration, which documentation
says makes git-annex sync and assistant do imports. says makes git-annex sync and assistant do imports.