doh't use "def" for command definitions, it conflicts with Data.Default.def

2 files changed, 85 insertions, 85 deletions

diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs
index d27866030..5f5d4a151 100644
--- a/CmdLine/GitAnnex.hs
+++ b/CmdLine/GitAnnex.hs
@@ -107,91 +107,91 @@ import System.Remote.Monitoring
 
 cmds :: [Command]
 cmds = concat
-	[ Command.Add.def
-	, Command.Get.def
-	, Command.Drop.def
-	, Command.Move.def
-	, Command.Copy.def
-	, Command.Unlock.def
-	, Command.Lock.def
-	, Command.Sync.def
-	, Command.Mirror.def
-	, Command.AddUrl.def
+	[ Command.Add.cmd
+	, Command.Get.cmd
+	, Command.Drop.cmd
+	, Command.Move.cmd
+	, Command.Copy.cmd
+	, Command.Unlock.cmd
+	, Command.Lock.cmd
+	, Command.Sync.cmd
+	, Command.Mirror.cmd
+	, Command.AddUrl.cmd
 #ifdef WITH_FEED
-	, Command.ImportFeed.def
+	, Command.ImportFeed.cmd
 #endif
-	, Command.RmUrl.def
-	, Command.Import.def
-	, Command.Init.def
-	, Command.Describe.def
-	, Command.InitRemote.def
-	, Command.EnableRemote.def
-	, Command.Reinject.def
-	, Command.Unannex.def
-	, Command.Uninit.def
-	, Command.Reinit.def
-	, Command.PreCommit.def
-	, Command.NumCopies.def
-	, Command.Trust.def
-	, Command.Untrust.def
-	, Command.Semitrust.def
-	, Command.Dead.def
-	, Command.Group.def
-	, Command.Wanted.def
-	, Command.Schedule.def
-	, Command.Ungroup.def
-	, Command.Vicfg.def
-	, Command.LookupKey.def
-	, Command.ExamineKey.def
-	, Command.FromKey.def
-	, Command.DropKey.def
-	, Command.TransferKey.def
-	, Command.TransferKeys.def
-	, Command.ReKey.def
-	, Command.MetaData.def
-	, Command.View.def
-	, Command.VAdd.def
-	, Command.VFilter.def
-	, Command.VPop.def
-	, Command.VCycle.def
-	, Command.Fix.def
-	, Command.Fsck.def
-	, Command.Repair.def
-	, Command.Unused.def
-	, Command.DropUnused.def
-	, Command.AddUnused.def
-	, Command.Find.def
-	, Command.FindRef.def
-	, Command.Whereis.def
-	, Command.List.def
-	, Command.Log.def
-	, Command.Merge.def
-	, Command.ResolveMerge.def
-	, Command.Info.def
-	, Command.Status.def
-	, Command.Migrate.def
-	, Command.Map.def
-	, Command.Direct.def
-	, Command.Indirect.def
-	, Command.Upgrade.def
-	, Command.Forget.def
-	, Command.Version.def
-	, Command.Help.def
+	, Command.RmUrl.cmd
+	, Command.Import.cmd
+	, Command.Init.cmd
+	, Command.Describe.cmd
+	, Command.InitRemote.cmd
+	, Command.EnableRemote.cmd
+	, Command.Reinject.cmd
+	, Command.Unannex.cmd
+	, Command.Uninit.cmd
+	, Command.Reinit.cmd
+	, Command.PreCommit.cmd
+	, Command.NumCopies.cmd
+	, Command.Trust.cmd
+	, Command.Untrust.cmd
+	, Command.Semitrust.cmd
+	, Command.Dead.cmd
+	, Command.Group.cmd
+	, Command.Wanted.cmd
+	, Command.Schedule.cmd
+	, Command.Ungroup.cmd
+	, Command.Vicfg.cmd
+	, Command.LookupKey.cmd
+	, Command.ExamineKey.cmd
+	, Command.FromKey.cmd
+	, Command.DropKey.cmd
+	, Command.TransferKey.cmd
+	, Command.TransferKeys.cmd
+	, Command.ReKey.cmd
+	, Command.MetaData.cmd
+	, Command.View.cmd
+	, Command.VAdd.cmd
+	, Command.VFilter.cmd
+	, Command.VPop.cmd
+	, Command.VCycle.cmd
+	, Command.Fix.cmd
+	, Command.Fsck.cmd
+	, Command.Repair.cmd
+	, Command.Unused.cmd
+	, Command.DropUnused.cmd
+	, Command.AddUnused.cmd
+	, Command.Find.cmd
+	, Command.FindRef.cmd
+	, Command.Whereis.cmd
+	, Command.List.cmd
+	, Command.Log.cmd
+	, Command.Merge.cmd
+	, Command.ResolveMerge.cmd
+	, Command.Info.cmd
+	, Command.Status.cmd
+	, Command.Migrate.cmd
+	, Command.Map.cmd
+	, Command.Direct.cmd
+	, Command.Indirect.cmd
+	, Command.Upgrade.cmd
+	, Command.Forget.cmd
+	, Command.Version.cmd
+	, Command.Help.cmd
 #ifdef WITH_ASSISTANT
-	, Command.Watch.def
-	, Command.Assistant.def
+	, Command.Watch.cmd
+	, Command.Assistant.cmd
 #ifdef WITH_WEBAPP
-	, Command.WebApp.def
+	, Command.WebApp.cmd
 #endif
 #ifdef WITH_XMPP
-	, Command.XMPPGit.def
+	, Command.XMPPGit.cmd
 #endif
-	, Command.RemoteDaemon.def
+	, Command.RemoteDaemon.cmd
 #endif
-	, Command.Test.def
+	, Command.Test.cmd
 #ifdef WITH_TESTSUITE
-	, Command.FuzzTest.def
-	, Command.TestRemote.def
+	, Command.FuzzTest.cmd
+	, Command.TestRemote.cmd
 #endif
 	]
 
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index 91cfd3ede..21284f400 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/CmdLine/GitAnnexShell.hs
@@ -34,19 +34,19 @@ import qualified Command.GCryptSetup
 
 cmds_readonly :: [Command]
 cmds_readonly = concat
-	[ gitAnnexShellCheck Command.ConfigList.def
-	, gitAnnexShellCheck Command.InAnnex.def
-	, gitAnnexShellCheck Command.SendKey.def
-	, gitAnnexShellCheck Command.TransferInfo.def
-	, gitAnnexShellCheck Command.NotifyChanges.def
+	[ gitAnnexShellCheck Command.ConfigList.cmd
+	, gitAnnexShellCheck Command.InAnnex.cmd
+	, gitAnnexShellCheck Command.SendKey.cmd
+	, gitAnnexShellCheck Command.TransferInfo.cmd
+	, gitAnnexShellCheck Command.NotifyChanges.cmd
 	]
 
 cmds_notreadonly :: [Command]
 cmds_notreadonly = concat
-	[ gitAnnexShellCheck Command.RecvKey.def
-	, gitAnnexShellCheck Command.DropKey.def
-	, gitAnnexShellCheck Command.Commit.def
-	, Command.GCryptSetup.def
+	[ gitAnnexShellCheck Command.RecvKey.cmd
+	, gitAnnexShellCheck Command.DropKey.cmd
+	, gitAnnexShellCheck Command.Commit.cmd
+	, Command.GCryptSetup.cmd
 	]
 
 cmds :: [Command]