git-annex/Command/Merge.hs

{- git-annex command
 -
 - Copyright 2011 Joey Hess <joey@kitenet.net>
 -
 - Licensed under the GNU GPL version 3 or higher.
 -}

module Command.Merge where

import Common.Annex
import Command
import qualified Annex.Branch

def :: [Command]
def = [command "merge" paramNothing seek
		"auto-merge remote changes into git-annex branch"]

seek :: [CommandSeek]
seek = [withNothing start]

start :: CommandStart
start = do
	showStart "merge" "."
	next perform

perform :: CommandPerform
perform = do
	Annex.Branch.update
	-- commit explicitly, in case no remote branches were merged
	Annex.Branch.commit "update"
	next $ return True
add merge subcommand 2011-06-22 18:46:45 -04:00			`{- git-annex command`
			`-`
			`- Copyright 2011 Joey Hess <joey@kitenet.net>`
			`-`
			`- Licensed under the GNU GPL version 3 or higher.`
			`-}`

			`module Command.Merge where`

rename 2011-10-05 16:02:51 -04:00			`import Common.Annex`
add merge subcommand 2011-06-22 18:46:45 -04:00			`import Command`
rename 2011-10-04 00:40:47 -04:00			`import qualified Annex.Branch`
add merge subcommand 2011-06-22 18:46:45 -04:00
clean up check selection code This new approach allows filtering out checks from the default set that are not appropriate for a command, rather than having to list every check that is appropriate. It also reduces some boilerplate. Haskell does not define Eq for functions, so I had to go a long way around with each check having a unique id. Meh. 2011-10-29 15:19:05 -04:00			`def :: [Command]`
			`def = [command "merge" paramNothing seek`
shorten synopsis 2011-09-14 13:32:46 -04:00			`"auto-merge remote changes into git-annex branch"]`
add merge subcommand 2011-06-22 18:46:45 -04:00
			`seek :: [CommandSeek]`
			`seek = [withNothing start]`

remove command type definitions These were a mistake, they make the type signatures harder to read and less flexible. The CommandSeek, CommandStart, CommandPerform, and CommandCleanup types were a good idea, but composing them with the parameters expected is going too far. 2011-09-15 16:50:49 -04:00			`start :: CommandStart`
add merge subcommand 2011-06-22 18:46:45 -04:00			`start = do`
			`showStart "merge" "."`
			`next perform`

			`perform :: CommandPerform`
			`perform = do`
rename 2011-10-04 00:40:47 -04:00			`Annex.Branch.update`
improve alwayscommit=false mode Now changes are staged into the branch's index, but not committed, which avoids growing a large journal. And sync and merge always explicitly commit, ensuring that even when they do nothing else, they commit the staged changes. Added a flag file to indicate that the branch's journal contains uncommitted changes. (Could use git ls-files, but don't want to run that every time.) In the future, this ability to have uncommitted changes staged in the journal might be used on remotes after a series of oneshot commands. 2012-02-25 16:11:47 -04:00			`-- commit explicitly, in case no remote branches were merged`
			`Annex.Branch.commit "update"`
add merge subcommand 2011-06-22 18:46:45 -04:00			`next $ return True`