diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp index e05da47d4..130cb8f87 100644 --- a/src/commands/CmdLog.cpp +++ b/src/commands/CmdLog.cpp @@ -40,7 +40,7 @@ extern Context context; CmdLog::CmdLog () { _keyword = "log"; - _usage = "task log [tags] [attrs] desc..."; + _usage = "task log "; _description = STRING_CMD_LOG_USAGE; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdMerge.cpp b/src/commands/CmdMerge.cpp index de286557f..80e4b359b 100644 --- a/src/commands/CmdMerge.cpp +++ b/src/commands/CmdMerge.cpp @@ -49,8 +49,11 @@ CmdMerge::CmdMerge () //////////////////////////////////////////////////////////////////////////////// int CmdMerge::execute (std::string& output) { -/* - std::string file = trim (context.task.get ("description")); + Arguments words = context.args.extract_simple_words (); + std::string file; + if (words.size ()) + file = words[0]._first; + std::string pushfile = ""; std::string tmpfile = ""; @@ -91,7 +94,7 @@ int CmdMerge::execute (std::string& output) if ( ((sAutopush == "ask") && (confirm ("Would you like to push the merged changes to \'" + uri.data + "\'?")) ) || (bAutopush) ) { - context.task.set ("description", uri.data); +// context.task.set ("description", uri.data); std::string out; context.commands["push"]->execute (out); @@ -101,7 +104,6 @@ int CmdMerge::execute (std::string& output) throw std::string ("No uri was specified for the merge. Either specify " "the uri of a remote .task directory, or create a " "'merge.default.uri' entry in your .taskrc file."); -*/ return 0; } diff --git a/src/commands/CmdPull.cpp b/src/commands/CmdPull.cpp index c2c5689f5..b1cdb8471 100644 --- a/src/commands/CmdPull.cpp +++ b/src/commands/CmdPull.cpp @@ -48,8 +48,10 @@ CmdPull::CmdPull () //////////////////////////////////////////////////////////////////////////////// int CmdPull::execute (std::string& output) { -/* - std::string file = trim (context.task.get ("description")); + Arguments words = context.args.extract_simple_words (); + std::string file; + if (words.size ()) + file = words[0]._first; Uri uri (file, "pull"); uri.parse (); @@ -112,7 +114,6 @@ int CmdPull::execute (std::string& output) throw std::string ("No uri was specified for the pull. Either specify " "the uri of a remote .task directory, or create a " "'pull.default.uri' entry in your .taskrc file."); -*/ return 0; } diff --git a/src/commands/CmdPush.cpp b/src/commands/CmdPush.cpp index 9d9ec2ae8..f8c3fb2c6 100644 --- a/src/commands/CmdPush.cpp +++ b/src/commands/CmdPush.cpp @@ -50,8 +50,10 @@ CmdPush::CmdPush () // this is potentially on another machine, no checking can be performed. int CmdPush::execute (std::string& output) { -/* - std::string file = trim (context.task.get ("description")); + Arguments words = context.args.extract_simple_words (); + std::string file; + if (words.size ()) + file = words[0]._first; Uri uri (file, "push"); uri.parse (); @@ -96,7 +98,6 @@ int CmdPush::execute (std::string& output) throw std::string ("No uri was specified for the push. Either specify " "the uri of a remote .task directory, or create a " "'push.default.uri' entry in your .taskrc file."); -*/ return 0; }