Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

uppsrc/ide/UppHub.cpp

@@ -540,11 +540,23 @@ void UppHubDlg::Update()
 	if(!PromptYesNo("Pull updates for all modules?"))
 		return;
 	UrepoConsole console;
+
+	int errors = 0;
 	for(const UppHubNest& n : upv) {
 		String dir = GetHubDir() + "/" + n.name;
-		if(DirectoryExists(dir))
-			console.Git(dir, "pull --rebase");
+		if(!DirectoryExists(dir))
+			continue;
+
+		if(console.Git(dir, "pull --rebase") != 0)
+			++errors;
 	}
+	if(errors == 0)
+		return;
+
+	ErrorOK(
+		Format("Update failed (%d errors). Review the logs to diagnose and resolve the issues.",
+	           errors));
+	console.Perform();
 }
 
 void UppHubDlg::Install(const Index<String>& ii_)

uppsrc/ide/urepo.h

@@ -2,8 +2,6 @@
 #include <CtrlCore/lay.h>
 
 class UrepoConsole : public WithUrepoConsoleLayout<TopWindow> {
-	typedef UrepoConsole CLASSNAME;
-	
 	Font font;
 	void AddResult(const String& out);
 	bool canceled = false;