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

remove some monkey faces

Browse source
This commit is contained in:
Joey Hess 2014-02-01 17:14:38 -04:00
parent c87ecaa543
commit a542781f6a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Drop.hs
View file

@ -48,10 +48,10 @@ handleDropsFrom locs rs reason fromhere key afile knownpresentremote runner = do
fs <- ifM isDirect fs <- ifM isDirect
( do ( do
l <- associatedFilesRelative key l <- associatedFilesRelative key
if null l return $ if null l
then return $ maybe [] (:[]) afile then maybeToList afile
else return l else l
, return $ maybe [] (:[]) afile , return $ maybeToList afile
) )
n <- getcopies fs n <- getcopies fs
if fromhere && checkcopies n Nothing if fromhere && checkcopies n Nothing

4
Assistant/Alert.hs
View file

@ -253,7 +253,7 @@ upgradingAlert = activityAlert Nothing [ fromString "Upgrading git-annex" ]
upgradeFinishedAlert :: Maybe AlertButton -> GitAnnexVersion -> Alert upgradeFinishedAlert :: Maybe AlertButton -> GitAnnexVersion -> Alert
upgradeFinishedAlert button version = upgradeFinishedAlert button version =
baseUpgradeAlert (maybe [] (:[]) button) $ fromString $ baseUpgradeAlert (maybeToList button) $ fromString $
"Finished upgrading git-annex to version " ++ version "Finished upgrading git-annex to version " ++ version
upgradeFailedAlert :: String -> Alert upgradeFailedAlert :: String -> Alert
@ -317,7 +317,7 @@ pairRequestAcknowledgedAlert who button = baseActivityAlert
, alertPriority = High , alertPriority = High
, alertName = Just $ PairAlert who , alertName = Just $ PairAlert who
, alertCombiner = Just $ dataCombiner $ \_old new -> new , alertCombiner = Just $ dataCombiner $ \_old new -> new
, alertButtons = maybe [] (:[]) button , alertButtons = maybeToList button
} }
xmppNeededAlert :: AlertButton -> Alert xmppNeededAlert :: AlertButton -> Alert

2
Command/Sync.hs
View file

@ -158,7 +158,7 @@ commitStaged commitmessage = go =<< inRepo Git.Branch.currentUnsafe
go (Just branch) = do go (Just branch) = do
parent <- inRepo $ Git.Ref.sha branch parent <- inRepo $ Git.Ref.sha branch
void $ inRepo $ Git.Branch.commit False commitmessage branch void $ inRepo $ Git.Branch.commit False commitmessage branch
(maybe [] (:[]) parent) (maybeToList parent)
return True return True
mergeLocal :: Maybe Git.Ref -> CommandStart mergeLocal :: Maybe Git.Ref -> CommandStart