comparison mainwindow.cpp @ 358:ea6f76c0aa76

Make username/password prompts in easyhg.py more helpful; use a distinctive return for cancel in these dialogs, and avoid showing command-failed in the main program when cancelled

         break; // go on to default report
     case ACT_INCOMING:
         if (output.contains("authorization failed")) {
             reportAuthFailed(output);
             return;
+        } else if (output.contains("entry cancelled")) {
+            // ignore this, user cancelled username or password dialog
+            return;
         } else {
             // Incoming returns non-zero code and no output if the
             // check was successful but there are no changes
             // pending. This is the only case where we need to remove
             // warning messages, because it's the only case where a

         break; // go on to default report
     case ACT_PULL:
         if (output.contains("authorization failed")) {
             reportAuthFailed(output);
             return;
+        } else if (output.contains("entry cancelled")) {
+            // ignore this, user cancelled username or password dialog
+            return;
         }
         break; // go on to default report
     case ACT_PUSH:
         if (output.contains("creates new remote heads")) {
             reportNewRemoteHeads(output);
             return;
         } else if (output.contains("authorization failed")) {
             reportAuthFailed(output);
+            return;
+        } else if (output.contains("entry cancelled")) {
+            // ignore this, user cancelled username or password dialog
             return;
         }
         break; // go on to default report
     case ACT_QUERY_HEADS:
         // fails if repo is empty; we don't care (if there's a genuine