diff options
| author | Matthias Sohn | 2013-12-01 00:25:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-12-16 15:32:39 +0000 |
| commit | 9a81ca39492c04a45d6b8b45794b6347ffb19cd8 (patch) | |
| tree | bbd3663d6112900a30c85abd15dcbfd49816d59e | |
| parent | 94536c9bf80343c8319262e65fc3d16d87ce23ba (diff) | |
| download | egit-9a81ca39492c04a45d6b8b45794b6347ffb19cd8.tar.gz egit-9a81ca39492c04a45d6b8b45794b6347ffb19cd8.tar.xz egit-9a81ca39492c04a45d6b8b45794b6347ffb19cd8.zip | |
Fix displaying effective git configuration in properties view
Bug: 396659
JGit-Dependency: Ie3731b5e877f8686aadad3f1a46b2e583ad3b7c6
Change-Id: I9cea0b556f1b38d8cadf6f836c7c80f489434667
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java index 942434054e..3ccf453050 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java @@ -153,7 +153,7 @@ public class RepositoryPropertySource implements IPropertySource { effectiveConfig = repository.getConfig(); systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); - userHomeConfig = SystemReader.getInstance().openUserConfig(systemConfig, FS.DETECTED); + userHomeConfig = SystemReader.getInstance().openUserConfig(null, FS.DETECTED); if (effectiveConfig instanceof FileBasedConfig) { File configFile = ((FileBasedConfig) effectiveConfig).getFile(); @@ -353,11 +353,13 @@ public class RepositoryPropertySource implements IPropertySource { StoredConfig config; String category; String prefix; + boolean recursive = false; switch (getCurrentMode()) { case EFFECTIVE: prefix = EFFECTIVE_ID_PREFIX; category = UIText.RepositoryPropertySource_EffectiveConfigurationCategory; config = effectiveConfig; + recursive = true; break; case REPO: { prefix = REPO_ID_PREFIX; @@ -395,7 +397,7 @@ public class RepositoryPropertySource implements IPropertySource { return new IPropertyDescriptor[0]; } for (String key : config.getSections()) { - for (String sectionItem : config.getNames(key)) { + for (String sectionItem : config.getNames(key, recursive)) { String sectionId = key + "." + sectionItem; //$NON-NLS-1$ PropertyDescriptor desc = new PropertyDescriptor(prefix + sectionId, sectionId); @@ -403,7 +405,7 @@ public class RepositoryPropertySource implements IPropertySource { resultList.add(desc); } for (String sub : config.getSubsections(key)) { - for (String sectionItem : config.getNames(key, sub)) { + for (String sectionItem : config.getNames(key, sub, recursive)) { String sectionId = key + "." + sub + "." + sectionItem; //$NON-NLS-1$ //$NON-NLS-2$ PropertyDescriptor desc = new PropertyDescriptor(prefix + sectionId, sectionId); |