GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Push/Pull/Merge

Browse source 
- Re-enabled the commands.
This commit is contained in:
Paul Beckingham 2011-07-10 14:59:30 -04:00
parent 254bce5dc2
commit 2d30275889
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdLog.cpp
View file

@ -40,7 +40,7 @@ extern Context context;
CmdLog::CmdLog () CmdLog::CmdLog ()
{ {
_keyword = "log"; _keyword = "log";
_usage = "task log [tags] [attrs] desc..."; _usage = "task log <modifications>";
_description = STRING_CMD_LOG_USAGE; _description = STRING_CMD_LOG_USAGE;
_read_only = false; _read_only = false;
_displays_id = false; _displays_id = false;

10
src/commands/CmdMerge.cpp
View file

@ -49,8 +49,11 @@ CmdMerge::CmdMerge ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdMerge::execute (std::string& output) int CmdMerge::execute (std::string& output)
{ {
/* Arguments words = context.args.extract_simple_words ();
std::string file = trim (context.task.get ("description")); std::string file;
if (words.size ())
file = words[0]._first;
std::string pushfile = ""; std::string pushfile = "";
std::string tmpfile = ""; 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 + "\'?")) ) if ( ((sAutopush == "ask") && (confirm ("Would you like to push the merged changes to \'" + uri.data + "\'?")) )
|| (bAutopush) ) || (bAutopush) )
{ {
context.task.set ("description", uri.data); // context.task.set ("description", uri.data);
std::string out; std::string out;
context.commands["push"]->execute (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 " throw std::string ("No uri was specified for the merge. Either specify "
"the uri of a remote .task directory, or create a " "the uri of a remote .task directory, or create a "
"'merge.default.uri' entry in your .taskrc file."); "'merge.default.uri' entry in your .taskrc file.");
*/
return 0; return 0;
} }

7
src/commands/CmdPull.cpp
View file

@ -48,8 +48,10 @@ CmdPull::CmdPull ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdPull::execute (std::string& output) int CmdPull::execute (std::string& output)
{ {
/* Arguments words = context.args.extract_simple_words ();
std::string file = trim (context.task.get ("description")); std::string file;
if (words.size ())
file = words[0]._first;
Uri uri (file, "pull"); Uri uri (file, "pull");
uri.parse (); uri.parse ();
@ -112,7 +114,6 @@ int CmdPull::execute (std::string& output)
throw std::string ("No uri was specified for the pull. Either specify " throw std::string ("No uri was specified for the pull. Either specify "
"the uri of a remote .task directory, or create a " "the uri of a remote .task directory, or create a "
"'pull.default.uri' entry in your .taskrc file."); "'pull.default.uri' entry in your .taskrc file.");
*/
return 0; return 0;
} }

7
src/commands/CmdPush.cpp
View file

@ -50,8 +50,10 @@ CmdPush::CmdPush ()
// this is potentially on another machine, no checking can be performed. // this is potentially on another machine, no checking can be performed.
int CmdPush::execute (std::string& output) int CmdPush::execute (std::string& output)
{ {
/* Arguments words = context.args.extract_simple_words ();
std::string file = trim (context.task.get ("description")); std::string file;
if (words.size ())
file = words[0]._first;
Uri uri (file, "push"); Uri uri (file, "push");
uri.parse (); uri.parse ();
@ -96,7 +98,6 @@ int CmdPush::execute (std::string& output)
throw std::string ("No uri was specified for the push. Either specify " throw std::string ("No uri was specified for the push. Either specify "
"the uri of a remote .task directory, or create a " "the uri of a remote .task directory, or create a "
"'push.default.uri' entry in your .taskrc file."); "'push.default.uri' entry in your .taskrc file.");
*/
return 0; return 0;
} }