GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 13:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.9.3' of tasktools.org:task into 1.9.3

Browse source
This commit is contained in:
Paul Beckingham 2010-10-14 22:03:27 -04:00
commit bb6f456e04
3 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/TDB.cpp
View file

@ -1356,9 +1356,14 @@ void TDB::merge (const std::string& mergeFile)
{
// nothing happend on the remote branch
// local branch is up-to-date
throw std::string ("Database is up to date.");
// nothing happend on the local branch either
if (lit == l.end())
throw std::string ("Database is up to date.");
else
std::cout << "No changes were made on the remote database.\n";
}
else // lit == undo.end ()
else // lit == l.end ()
{
// nothing happend on the local branch
std::cout << "No changes were made on the local database. Adding remote changes...\n";
@ -1541,10 +1546,6 @@ void TDB::merge (const std::string& mergeFile)
if (! File::write (undoFile, undo, false))
throw std::string ("Could not write '") + undoFile + "'.";
}
else // nothing to be done
{
std::cout << "No merge required.\n";
}
// delete objects
lmods.clear ();

67
src/TransportCurl.cpp
View file

@ -38,10 +38,16 @@ TransportCurl::TransportCurl(const Uri& uri) : Transport(uri)
////////////////////////////////////////////////////////////////////////////////
void TransportCurl::send(const std::string& source)
{
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (is_filelist(source))
if (uri.user != "")
{
arguments.push_back("--user");
arguments.push_back(uri.user);
}
if (is_filelist(source))
{
std::string::size_type pos;
pos = source.find("{");
@ -76,25 +82,32 @@ void TransportCurl::send(const std::string& source)
arguments.push_back (source);
}
// cmd line is: curl -T source protocol://host:port/path
if (uri.port != "")
{
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
}
else
{
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
}
// cmd line is: curl -T source protocol://host:port/path
if (uri.port != "")
{
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
}
else
{
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
}
if (execute())
if (execute())
throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
}
////////////////////////////////////////////////////////////////////////////////
void TransportCurl::recv(std::string target)
{
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (uri.user != "")
{
arguments.push_back("--user");
arguments.push_back(uri.user);
}
if (is_filelist(uri.path))
{
@ -127,20 +140,20 @@ void TransportCurl::recv(std::string target)
target = "-o " + target;
}
// cmd line is: curl protocol://host:port/path/to/source/file -o path/to/target/file
if (uri.port != "")
{
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
}
else
{
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
}
// cmd line is: curl protocol://host:port/path/to/source/file -o path/to/target/file
if (uri.port != "")
{
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
}
else
{
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
}
arguments.push_back (target);
arguments.push_back (target);
if (execute())
throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
if (execute())
throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
}
////////////////////////////////////////////////////////////////////////////////