Feature #881

* Output of URIs (during merge, pull, push) now omits passwords.
2011-11-28 22:45:31 +01:00
parent 93337f499e
commit ea44eaac1c
5 changed files with 28 additions and 3 deletions
--- a/src/commands/CmdMerge.cpp
+++ b/src/commands/CmdMerge.cpp
@@ -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