GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-02 21:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

10
src/commands/CmdMerge.cpp
View file

@ -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;
}