make sync update --unlock-present branch

diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs
index e8ce0cc49f6a70e1aca97ccb5a89b10c94549543..8e6eb4dc8b5772783397ae203e23e80abc958264 100644 (file)
--- a/Annex/AdjustedBranch.hs
+++ b/Annex/AdjustedBranch.hs
@@ -13,6 +13,7 @@ module Annex.AdjustedBranch (
        PresenceAdjustment(..),
        LinkPresentAdjustment(..),
        adjustmentHidesFiles,
+       adjustmentIsStable,
        OrigBranch,
        AdjBranch(..),
        originalToAdjusted,
@@ -66,9 +67,11 @@ import qualified Data.Map as M
 import qualified Data.ByteString as S
 import qualified System.FilePath.ByteString as P
 
--- How to perform various adjustments to a TreeItem.
 class AdjustTreeItem t where
+       -- How to perform various adjustments to a TreeItem.
        adjustTreeItem :: t -> TreeItem -> Annex (Maybe TreeItem)
+       -- Will adjusting a given tree always yield the same adjusted tree?
+       adjustmentIsStable :: t -> Bool
 
 instance AdjustTreeItem Adjustment where
        adjustTreeItem (LinkAdjustment l) t = adjustTreeItem l t
@@ -79,6 +82,10 @@ instance AdjustTreeItem Adjustment where
                        Just t' -> adjustTreeItem l t'
        adjustTreeItem (LinkPresentAdjustment l) t = adjustTreeItem l t
 
+       adjustmentIsStable (LinkAdjustment l) = adjustmentIsStable l
+       adjustmentIsStable (PresenceAdjustment p _) = adjustmentIsStable p
+       adjustmentIsStable (LinkPresentAdjustment l) = adjustmentIsStable l
+
 instance AdjustTreeItem LinkAdjustment where
        adjustTreeItem UnlockAdjustment =
                ifSymlink adjustToPointer noAdjust
@@ -88,6 +95,8 @@ instance AdjustTreeItem LinkAdjustment where
                ifSymlink adjustToSymlink noAdjust
        adjustTreeItem UnFixAdjustment =
                ifSymlink (adjustToSymlink' gitAnnexLinkCanonical) noAdjust
+       
+       adjustmentIsStable _ = True
 
 instance AdjustTreeItem PresenceAdjustment where
        adjustTreeItem HideMissingAdjustment = 
@@ -95,6 +104,9 @@ instance AdjustTreeItem PresenceAdjustment where
        adjustTreeItem ShowMissingAdjustment =
                noAdjust
 
+       adjustmentIsStable HideMissingAdjustment = False
+       adjustmentIsStable ShowMissingAdjustment = True
+
 instance AdjustTreeItem LinkPresentAdjustment where
        adjustTreeItem UnlockPresentAdjustment = 
                ifPresent adjustToPointer adjustToSymlink
@@ -106,6 +118,9 @@ instance AdjustTreeItem LinkPresentAdjustment where
                -- content is not present.
                ifSymlink noAdjust adjustToSymlink
 
+       adjustmentIsStable UnlockPresentAdjustment = False
+       adjustmentIsStable LockPresentAdjustment = True
+
 ifSymlink
        :: (TreeItem -> Annex a)
        -> (TreeItem -> Annex a)
@@ -222,43 +237,40 @@ checkoutAdjustedBranch (AdjBranch b) checkoutparams = do
                ] ++ checkoutparams
 
 {- Already in a branch with this adjustment, but the user asked to enter it
- - again. This should have the same result as checking out the original branch,
- - deleting and rebuilding the adjusted branch, and then checking it out.
+ - again. This should have the same result as propagating any commits
+ - back to the original branch, checking out the original branch, deleting
+ - and rebuilding the adjusted branch, and then checking it out.
  - But, it can be implemented more efficiently than that.
  -}
 updateAdjustedBranch :: Adjustment -> AdjBranch -> OrigBranch -> Annex Bool
-updateAdjustedBranch adj@(PresenceAdjustment _ _) currbranch origbranch =
-       updateAdjustedBranch' adj currbranch origbranch
-updateAdjustedBranch adj@(LinkPresentAdjustment _) currbranch origbranch =
-       updateAdjustedBranch' adj currbranch origbranch
-updateAdjustedBranch adj@(LinkAdjustment _) _ origbranch =
-       preventCommits $ \commitlck -> do
-               -- Not really needed here, but done for consistency.
-               _ <- propigateAdjustedCommits' origbranch adj commitlck
-               -- No need to do anything else, because link adjustments
-               -- are stable.
-               return True
-
-updateAdjustedBranch' :: Adjustment -> AdjBranch -> OrigBranch -> Annex Bool
-updateAdjustedBranch' adj (AdjBranch currbranch) origbranch = do
-       b <- preventCommits $ \commitlck -> do
-               -- Avoid losing any commits that the adjusted branch has that
-               -- have not yet been propigated back to the origbranch.
-               _ <- propigateAdjustedCommits' origbranch adj commitlck
-
-               -- Git normally won't do anything when asked to check out the
-               -- currently checked out branch, even when its ref has
-               -- changed. Work around this by writing a raw sha to .git/HEAD.
-               inRepo (Git.Ref.sha currbranch) >>= \case
-                       Just headsha -> inRepo $ \r ->
-                               writeFile (Git.Ref.headFile r) (fromRef headsha)
-                       _ -> noop
+updateAdjustedBranch adj (AdjBranch currbranch) origbranch
+       | not (adjustmentIsStable adj) = do
+               b <- preventCommits $ \commitlck -> do
+                       -- Avoid losing any commits that the adjusted branch
+                       -- has that have not yet been propigated back to the
+                       -- origbranch.
+                       _ <- propigateAdjustedCommits' origbranch adj commitlck
+
+                       -- Git normally won't do anything when asked to check
+                       -- out the currently checked out branch, even when its
+                       -- ref has changed. Work around this by writing a raw
+                       -- sha to .git/HEAD.
+                       inRepo (Git.Ref.sha currbranch) >>= \case
+                               Just headsha -> inRepo $ \r ->
+                                       writeFile (Git.Ref.headFile r) (fromRef headsha)
+                               _ -> noop
        
-               adjustBranch adj origbranch
+                       adjustBranch adj origbranch
        
-       -- Make git checkout quiet to avoid warnings about disconnected
-       -- branch tips being lost.
-       checkoutAdjustedBranch b [Param "--quiet"]
+               -- Make git checkout quiet to avoid warnings about
+               -- disconnected branch tips being lost.
+               checkoutAdjustedBranch b [Param "--quiet"]
+       | otherwise = preventCommits $ \commitlck -> do
+               -- Done for consistency.
+               _ <- propigateAdjustedCommits' origbranch adj commitlck
+               -- No need to actually update the branch because the
+               -- adjustment is stable.
+               return True
 
 adjustToCrippledFileSystem :: Annex ()
 adjustToCrippledFileSystem = do

diff --git a/Command/Sync.hs b/Command/Sync.hs
index 6bb16bb6a8d903ce652da06136bd9946d1c887f1..8fa3f497429f7b3b7c84282584d354cf50aeaede 100644 (file)
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -406,13 +406,13 @@ updateBranches (Nothing, _) = noop
 updateBranches (Just branch, madj) = do
        -- When in an adjusted branch, propigate any changes made to it
        -- back to the original branch. The adjusted branch may also need
-       -- to be updated to hide/expose files.
+       -- to be updated, if the adjustment is not stable.
        case madj of
                Nothing -> noop
                Just adj -> do
                        let origbranch = branch
                        propigateAdjustedCommits origbranch adj
-                       when (adjustmentHidesFiles adj) $ do
+                       unless (adjustmentIsStable adj) $ do
                                showSideAction "updating adjusted branch"
                                let adjbranch = originalToAdjusted origbranch adj
                                unlessM (updateAdjustedBranch adj adjbranch origbranch) $

diff --git a/Types/AdjustedBranch.hs b/Types/AdjustedBranch.hs
index b6aedf4df93c7b8c817069cd8628b26e2b05017a..bad81c50dbce3de36c5f9a1c9db91cc28e9a62c1 100644 (file)
--- a/Types/AdjustedBranch.hs
+++ b/Types/AdjustedBranch.hs
@@ -62,4 +62,3 @@ instance ReversableAdjustment LinkPresentAdjustment where
 adjustmentHidesFiles :: Adjustment -> Bool
 adjustmentHidesFiles (PresenceAdjustment HideMissingAdjustment _) = True
 adjustmentHidesFiles _ = False
-