refactor getCurrentBranch
Both Command.Sync and Annex.Ingest had their own versions of this. The one in Annex.Ingest used Git.Branch.currentUnsafe, but does not seem to need it. That is only checking to see if it's in an adjusted unlocked branch, and when in an adjusted branch, the branch does in fact exist, so the added check that Git.Branch.current does is fine. This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
parent
c94e62cab5
commit
8be5a7269a
15 changed files with 228 additions and 169 deletions
|
@ -32,6 +32,7 @@ import Annex.Link
|
|||
import Annex.CatFile
|
||||
import Annex.InodeSentinal
|
||||
import Annex.Version
|
||||
import Annex.CurrentBranch
|
||||
import qualified Annex
|
||||
import Utility.InodeCache
|
||||
import Annex.Content.Direct
|
||||
|
@ -228,7 +229,7 @@ commitStaged msg = do
|
|||
Right _ -> do
|
||||
ok <- Command.Sync.commitStaged Git.Branch.AutomaticCommit msg
|
||||
when ok $
|
||||
Command.Sync.updateSyncBranch =<< join Command.Sync.getCurrBranch
|
||||
Command.Sync.updateSyncBranch =<< getCurrentBranch
|
||||
return ok
|
||||
|
||||
{- OSX needs a short delay after a file is added before locking it down,
|
||||
|
|
|
@ -12,6 +12,7 @@ import Assistant.Commits
|
|||
import Assistant.Pushes
|
||||
import Assistant.DaemonStatus
|
||||
import Annex.Concurrent
|
||||
import Annex.CurrentBranch
|
||||
import Utility.ThreadScheduler
|
||||
import qualified Annex
|
||||
import qualified Remote
|
||||
|
@ -64,7 +65,7 @@ exportToRemotes rs = do
|
|||
Annex.changeState $ \st -> st { Annex.errcounter = 0 }
|
||||
start <- liftIO getCurrentTime
|
||||
void $ Command.Sync.seekExportContent rs
|
||||
=<< join Command.Sync.getCurrBranch
|
||||
=<< getCurrentBranch
|
||||
-- Look at command error counter to see if the export
|
||||
-- didn't work.
|
||||
failed <- (> 0) <$> Annex.getState Annex.errcounter
|
||||
|
|
|
@ -13,6 +13,7 @@ import Assistant.BranchChange
|
|||
import Assistant.Sync
|
||||
import Utility.DirWatcher
|
||||
import Utility.DirWatcher.Types
|
||||
import Annex.CurrentBranch
|
||||
import qualified Annex.Branch
|
||||
import qualified Git
|
||||
import qualified Git.Branch
|
||||
|
@ -71,7 +72,7 @@ onChange file
|
|||
changedbranch = fileToBranch file
|
||||
|
||||
mergecurrent =
|
||||
mergecurrent' =<< liftAnnex (join Command.Sync.getCurrBranch)
|
||||
mergecurrent' =<< liftAnnex getCurrentBranch
|
||||
mergecurrent' currbranch@(Just b, _)
|
||||
| changedbranch `isRelatedTo` b =
|
||||
whenM (liftAnnex $ inRepo $ Git.Branch.changed b changedbranch) $ do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue