From 148eaa5e588a99de34e0e174716e4116a9e2ab71 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 2 Oct 2011 17:20:16 -0400
Subject: [PATCH] Task Server

- Added 'taskd.server' and 'taskd.credentials' as supported configuration
  variables.
- Added the 'taskd.server' values to the 'diagnostics' command output.
- Updated taskrc.5.in to mention the new variables.
---
 doc/man/taskrc.5.in             | 10 ++++++++++
 src/commands/CmdDiagnostics.cpp |  4 ++++
 src/commands/CmdShow.cpp        |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index a7a7fb1b0..caeefe65b 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -428,6 +428,16 @@ Taskwarrior supports command aliases.  This alias provides an alternate name
 any of the commands.  Several commands you may use are actually aliases -
 the 'history' report, for example, or 'export'.
 
+.SS SYNCH SERVER
+.TP
+.B taskd.server=<server>:<port>
+The server and port address of the task server with which you synchronize.
+
+.TP
+.B taskd.credentials=<org>:<user>:<key>
+These are your server credentials.  Keep this information private and secure!
+Note that these credentials must match the server account.
+
 .SS EXTENSIONS
 .TP
 .B extensions=on
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 6c943c85a..2b3503185 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -199,6 +199,10 @@ int CmdDiagnostics::execute (std::string& output)
       << location.mode ()
       << "\n";
 
+  out << "    Server: "
+      << context.config.get ("taskd.server")
+      << "\n";
+
   out << "   Locking: "
       << (context.config.getBoolean ("locking")
            ? STRING_CMD_DIAG_ENABLED
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 92da4827f..40bd90db8 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -180,6 +180,8 @@ int CmdShow::execute (std::string& output)
     " shadow.notify"
     " shell.prompt"
     " tag.indicator"
+    " taskd.server"
+    " taskd.credentials"
     " undo.style"
     " urgency.active.coefficient"
     " urgency.annotations.coefficient"