ide: Get repository URL from the git config

Author: CoolmanCZ

uppsrc/ide/About.cpp

@@ -18,6 +18,39 @@ extern const char *bm_USER;
 extern const char *bm_GIT_REVCOUNT;
 extern const char *bm_GIT_BRANCH;
 extern const char *bm_GIT_HASH;
+extern const char *bm_GIT_URL;
+
+String GetCommitUrl(const String &url, const String &rev) {
+    String https = "https://";
+    String s = url;
+
+    if (url.Find(https) == -1) {
+        int pos = url.Find('@');
+        if (pos > -1) {
+            s = https + url.Mid(pos + 1);
+            pos = s.Find(':', https.GetLength());
+            if (pos > -1) {
+                int i;
+                for (i = pos + 1; i < s.GetLength(); ++i) {
+                    if (!IsNumberValueTypeNo(s[i]))
+                        break;
+                }
+                s.Remove(pos, i - pos);
+                s.Insert(pos, '/');
+            }
+        }
+    }
+
+    int pos = s.ReverseFind(".git");
+    if (pos > -1) {
+        s = s.Left(pos);
+    }
+
+    String commit = "\1[^";
+    commit << s << "/commit/" << rev << "^ ";
+
+    return commit;
+}
 
 String SplashCtrl::GenerateVersionInfo(bool qtf, bool about)
 {
@@ -32,7 +65,7 @@ String SplashCtrl::GenerateVersionInfo(bool qtf, bool about)
 			dr.Trim(8);
 		h << "Revision: ";
 		if(qtf && about)
-			h << "\1[^https://github.com/ultimatepp/ultimatepp/commit/" << rev << "^ ";
+			h << GetCommitUrl(bm_GIT_URL, rev);
 		h << dr;
 		if(qtf && about)
 			h << "]\1";

uppsrc/ide/BuildInfo.cpp

@@ -20,7 +20,7 @@ const char *bm_GIT_BRANCH =
 #endif
 ;
 const char *bm_GIT_REVCOUNT =
-#ifdef bmGIT_HASH
+#ifdef bmGIT_REVCOUNT
 	bmGIT_REVCOUNT
 #else
 	""
@@ -33,3 +33,10 @@ const char *bm_GIT_HASH =
 	""
 #endif
 ;
+const char *bm_GIT_URL =
+#ifdef bmGIT_URL
+	bmGIT_URL
+#else
+	"https://github.com/ultimatepp/ultimatepp"
+#endif
+;

uppsrc/ide/Builders/CppBuilder.cpp

@@ -501,41 +501,23 @@ Vector<String> GitInfo(const String& package)
 	Vector<String> info;
 	String d = GetFileFolder(PackagePath(package));
 	if(IsGitDir2(d)) {
-		String command = "git -C " << d << " log -n 1 --pretty=format:\"\%h\"";
+		String gitpath = GetGitPath();
+		String command = gitpath << " -C " << d << " log -n 1 --pretty=format:\"\%h\"";
 		String v = Sys(command);
 		if(!v.IsEmpty())
 			info.Add("#define bmGIT_REVISION " + AsCString(TrimBoth(v)));
-		command = "git -C " << d << " rev-parse --abbrev-ref HEAD";
+		command = gitpath << " -C " << d << " rev-parse --abbrev-ref HEAD";
 		v = Sys(command);
-		if(!v.IsEmpty())
-			info.Add("#define bmGIT_BRANCH " + AsCString(TrimBoth(v)));
-		command = "git -C " << d << " config --local branch." << TrimBoth(v) << ".remote";
+		command = gitpath << " -C " << d << " config --local branch." << TrimBoth(v) << ".remote";
 		v = Sys(command);
-		command = "git -C " << d << " config --local remote." << TrimBoth(v) << ".url";
+		command = gitpath << " -C " << d << " config --local remote." << TrimBoth(v) << ".url";
 		v = Sys(command);
 		if(!v.IsEmpty())
 			info.Add("#define bmGIT_URL " + AsCString(TrimBoth(v)));
 	}
 	return info;
 }
 
-bool IsSvnDir2(const String& p)
-{ // this is a cope of usvn/IsSvnDir to avoid modular issues
-	if(IsNull(p))
-		return false;
-	if(DirectoryExists(AppendFileName(p, ".svn")) || DirectoryExists(AppendFileName(p, "_svn")))
-		return true;
-	String path = p;
-	String path0;
-	while(path != path0) {
-		path0 = path;
-		path = GetFileFolder(path);
-		if(DirectoryExists(AppendFileName(path, ".svn")))
-			return true;
-	}
-	return false;
-}
-
 bool IsWin32Manifest(const String& s)
 {
 	return s == "manifest.xml";