From 85e78e454171812d8c8315c7d20d472b1d5ab946 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 May 2016 12:26:38 -0400 Subject: nub transitionList to avoid ugly message after repeated transitions, and avoid redundant work for repeated ForgetDeadRemotes transitions --- Annex/Branch.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Annex') diff --git a/Annex/Branch.hs b/Annex/Branch.hs index e43c07f8e..0993eaaff 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -522,7 +522,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do Annex.Queue.flush withIndex $ do prepareModifyIndex jl - run $ mapMaybe getTransitionCalculator $ transitionList ts + run $ mapMaybe getTransitionCalculator tlist Annex.Queue.flush if neednewlocalbranch then do @@ -535,7 +535,8 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do message | neednewlocalbranch && null transitionedrefs = "new branch for transition " ++ tdesc | otherwise = "continuing transition " ++ tdesc - tdesc = show $ map describeTransition $ transitionList ts + tdesc = show $ map describeTransition tlist + tlist = transitionList ts {- The changes to make to the branch are calculated and applied to - the branch directly, rather than going through the journal, -- cgit v1.2.3