diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-04-05 16:15:59 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-04-05 16:15:59 +0000 |
| commit | a64fb12bf2ec845b71f9518677eebade96e1da43 (patch) | |
| tree | 14c2500276df625dbe8643ecad2fe3e11b6fc6b9 /cpp/src/IcePatch/Client.cpp | |
| parent | Changed to add xs:annotation/xs:appinfo/type element to proxy elements. (diff) | |
| download | ice-a64fb12bf2ec845b71f9518677eebade96e1da43.tar.bz2 ice-a64fb12bf2ec845b71f9518677eebade96e1da43.tar.xz ice-a64fb12bf2ec845b71f9518677eebade96e1da43.zip | |
more IcePatch stuff
Diffstat (limited to 'cpp/src/IcePatch/Client.cpp')
| -rw-r--r-- | cpp/src/IcePatch/Client.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp index ec2a12f6b2d..656722919b1 100644 --- a/cpp/src/IcePatch/Client.cpp +++ b/cpp/src/IcePatch/Client.cpp @@ -182,7 +182,7 @@ IcePatch::Client::printNodeDescSeq(const NodeDescSeq& nodeDescSeq, const string& { newIndent = indent + "| "; } - cout << indent << "+-" << pathToName(path) << "... " << flush; + cout << indent << "+-" << pathToName(path) << ": " << flush; FileInfo info = getFileInfo(path); switch (info) @@ -201,7 +201,7 @@ IcePatch::Client::printNodeDescSeq(const NodeDescSeq& nodeDescSeq, const string& case FileInfoRegular: { - cout << "removing regular file... " << flush; + cout << "removing file... " << flush; removeRecursive(path); cout << "creating directory... " << flush; createDirectory(path); @@ -226,7 +226,7 @@ IcePatch::Client::printNodeDescSeq(const NodeDescSeq& nodeDescSeq, const string& else { assert(fileDesc); - cout << indent << "+-" << pathToName(path) << "... " << flush; + cout << indent << "+-" << pathToName(path) << ": " << flush; MyProgressCB progressCB; @@ -251,7 +251,12 @@ IcePatch::Client::printNodeDescSeq(const NodeDescSeq& nodeDescSeq, const string& case FileInfoRegular: { - ByteSeq md5 = getMD5(path); + ByteSeq md5; + FileInfo infoMD5 = getFileInfo(path + ".md5"); + if (infoMD5 == FileInfoRegular) + { + md5 = getMD5(path); + } if (md5 != fileDesc->md5) { cout << "removing file... " << flush; |