MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

hg: support paths.default:pushurl config syntax

Browse Source 
* IDEA-185209 HG push doesn't use default:pushurl;
* since hg version is around 3.7 new push path syntax is used;
* update tests

GitOrigin-RevId: b0018385b287e0856fb75e391fd9585b96fc4df7
This commit is contained in:
Nadya Zabrodina
2021-12-07 09:47:14 +00:00
committed by intellij-monorepo-bot
parent 749db57fd4
commit 418bacd37b
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgConfig.java
+8 -2
View File
@@ -35,8 +35,14 @@ public final class HgConfig {
@Nullable
public String getDefaultPushPath() {
String path = getNamedConfig("paths", "default-push");
return path != null ? path : getNamedConfig("paths", "default");
String path = getNamedConfig("paths", "default:pushurl");
if (path == null) {
path = getNamedConfig("paths", "default-push");
}
if (path == null) {
path = getNamedConfig("paths", "default");
}
return path;
}
@Nullable
plugins/hg4idea/testSrc/hg4idea/test/config/HgConfigTest.java
+6 -3
View File
@@ -67,12 +67,15 @@ public class HgConfigTest extends HgPlatformTest {
cd(myChildRepo);
String pushPath = "somePath";
appendToHgrc(myChildRepo, "\n[paths]\n" +
"default-push=" + pushPath);
"default-push = " + pushPath);
appendToHgrc(myChildRepo, "\n[paths]\n" +
"default:pushurl = " + pushPath);
updateRepoConfig(myProject, myChildRepo);
final String defaultPushPath = HgUtil.getRepositoryDefaultPushPath(myProject, myChildRepo);
assertNotNull(defaultPushPath);
assertEquals(FileUtil.toSystemIndependentName(myChildRepo.getPath() + "/" + pushPath),
FileUtil.toSystemIndependentName(defaultPushPath));
String absolutePath = FileUtil.toSystemIndependentName(myChildRepo.getPath() + "/" + pushPath);
// after default-push config deprecation around version 3.7 ,hg reports the same value that is contained in hgrc file
assertTrue(absolutePath.contains(FileUtil.toSystemIndependentName(defaultPushPath)));
}
public void testPushPathWithoutAppropriateConfig() {