Feature #881
* Output of URIs (during merge, pull, push) now omits passwords.
This commit is contained in:
@@ -97,7 +97,7 @@ int CmdMerge::execute (std::string& output)
|
||||
if (tmpfile != "")
|
||||
remove (tmpfile.c_str ());
|
||||
|
||||
if (((sAutopush == "ask") && (confirm (format (STRING_CMD_MERGE_CONFIRM, uri._data))))
|
||||
if (((sAutopush == "ask") && (confirm (format (STRING_CMD_MERGE_CONFIRM, uri.ToString ()))))
|
||||
|| (bAutopush))
|
||||
{
|
||||
// Derive autopush uri from merge.default.uri? otherwise: change prompt above
|
||||
|
||||
@@ -112,7 +112,7 @@ int CmdPull::execute (std::string& output)
|
||||
}
|
||||
}
|
||||
|
||||
output += format (STRING_CMD_PULL_TRANSFERRED, uri._data) + "\n";
|
||||
output += format (STRING_CMD_PULL_TRANSFERRED, uri.ToString ()) + "\n";
|
||||
}
|
||||
else
|
||||
throw std::string (STRING_CMD_PULL_NO_URI);
|
||||
|
||||
@@ -96,7 +96,7 @@ int CmdPush::execute (std::string& output)
|
||||
ofile3 << ifile3.rdbuf();
|
||||
}
|
||||
|
||||
output += format (STRING_CMD_PUSH_TRANSFERRED, uri._data) + "\n";
|
||||
output += format (STRING_CMD_PUSH_TRANSFERRED, uri.ToString ()) + "\n";
|
||||
}
|
||||
else
|
||||
throw std::string (STRING_CMD_PUSH_NO_URI);
|
||||
|
||||
Reference in New Issue
Block a user