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

SVN: one-click merge: check repository capabilities - whether it supports merge info

Browse Source 
(cherry picked from commit c289206b5cce2c2b12bbdfb5c27fb12dfb804609)
This commit is contained in:
irengrig
2010-07-14 16:08:42 +04:00
parent ba4d5bceba
commit 8983c381a7
9 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/RootUrlInfo.java
+7 -1
View File
@@ -25,6 +25,7 @@ public class RootUrlInfo implements RootUrlPair {
private final String myRepositoryUrl;
private final SVNURL myAbsoluteUrlAsUrl;
private final WorkingCopyFormat myFormat;
private final boolean myRepoSupportsMergeInfo;
private final File myIoFile;
private final VirtualFile myVfile;
@@ -33,11 +34,12 @@ public class RootUrlInfo implements RootUrlPair {
private NestedCopyType myType;
public RootUrlInfo(final SVNURL repositoryUrl, final SVNURL absoluteUrlAsUrl, final WorkingCopyFormat format, final VirtualFile vfile,
final VirtualFile root) {
final VirtualFile root, boolean repoSupportsMergeInfo) {
myRepositoryUrlUrl = repositoryUrl;
myFormat = format;
myVfile = vfile;
myRoot = root;
myRepoSupportsMergeInfo = repoSupportsMergeInfo;
myIoFile = new File(myVfile.getPath());
final String asString = repositoryUrl.toString();
myRepositoryUrl = asString.endsWith("/") ? asString.substring(0, asString.length() - 1) : asString;
@@ -89,4 +91,8 @@ public class RootUrlInfo implements RootUrlPair {
public void setType(NestedCopyType type) {
myType = type;
}
public boolean isRepoSupportsMergeInfo() {
return myRepoSupportsMergeInfo;
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
+35 -13
View File
@@ -298,7 +298,8 @@ class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentStateCompone
} else {
myRepositoryRoots.register(repoRoot);
myTopRoots.add(new RootUrlInfo(repoRoot, foundRoot.getInfo().getURL(),
SvnFormatSelector.getWorkingCopyFormat(foundRoot.getInfo().getFile()), foundRoot.getFile(), vcsRoot));
SvnFormatSelector.getWorkingCopyFormat(foundRoot.getInfo().getFile()), foundRoot.getFile(), vcsRoot,
SvnUtil.doesRepositorySupportMergeinfo(myVcs, repoRoot)));
}
}
}
@@ -354,9 +355,10 @@ class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentStateCompone
}
for (RootUrlInfo topRoot : myTopRoots) {
if (VfsUtil.isAncestor(topRoot.getVirtualFile(), info.getFile(), true)) {
final SVNURL repoRoot = myRepositoryRoots.ask(info.getUrl());
final RepoInfo repoRoot = myRepositoryRoots.ask(info.getUrl());
if (repoRoot != null) {
final RootUrlInfo rootInfo = new RootUrlInfo(repoRoot, info.getUrl(), info.getFormat(), info.getFile(), topRoot.getRoot());
final RootUrlInfo rootInfo = new RootUrlInfo(repoRoot.getUrl(), info.getUrl(), info.getFormat(), info.getFile(), topRoot.getRoot(),
repoRoot.isRepoSupportsMergeinfo());
rootInfo.setType(info.getType());
nestedRoots.add(rootInfo);
}
@@ -413,28 +415,48 @@ class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentStateCompone
private static class RepositoryRoots {
private final SvnVcs myVcs;
private final Set<SVNURL> myRoots;
private final Set<RepoInfo> myRoots;
private RepositoryRoots(final SvnVcs vcs) {
myVcs = vcs;
myRoots = new HashSet<SVNURL>();
myRoots = new HashSet<RepoInfo>();
}
public void register(final SVNURL url) {
myRoots.add(url);
myRoots.add(new RepoInfo(url, SvnUtil.doesRepositorySupportMergeinfo(myVcs, url)));
}
public SVNURL ask(final SVNURL url) {
for (SVNURL root : myRoots) {
if (root.equals(SVNURLUtil.getCommonURLAncestor(root, url))) {
public RepoInfo ask(final SVNURL url) {
for (RepoInfo root : myRoots) {
if (root.getUrl().equals(SVNURLUtil.getCommonURLAncestor(root.getUrl(), url))) {
return root;
}
}
final SVNURL newRoot = SvnUtil.getRepositoryRoot(myVcs, url);
if (newRoot != null) {
final SVNURL newUrl = SvnUtil.getRepositoryRoot(myVcs, url);
if (newUrl != null) {
final RepoInfo newRoot = new RepoInfo(newUrl, SvnUtil.doesRepositorySupportMergeinfo(myVcs, url));
myRoots.add(newRoot);
return newRoot;
}
return newRoot;
return null;
}
}
private static class RepoInfo {
private final SVNURL myUrl;
private final boolean myRepoSupportsMergeinfo;
private RepoInfo(final SVNURL url, final boolean repoSupportsMergeinfo) {
myRepoSupportsMergeinfo = repoSupportsMergeinfo;
myUrl = url;
}
public boolean isRepoSupportsMergeinfo() {
return myRepoSupportsMergeinfo;
}
public SVNURL getUrl() {
return myUrl;
}
}
@@ -537,7 +559,7 @@ class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentStateCompone
if ((svnInfo == null) || (svnInfo.getRepositoryRootURL() == null)) continue;
mapping.add(new RootUrlInfo(svnInfo.getRepositoryRootURL(), svnInfo.getURL(),
SvnFormatSelector.getWorkingCopyFormat(svnInfo.getFile()), copyRoot, vcsRoot));
SvnFormatSelector.getWorkingCopyFormat(svnInfo.getFile()), copyRoot, vcsRoot, SvnUtil.doesRepositorySupportMergeinfo(vcs, svnInfo.getURL())));
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
+9
View File
@@ -614,4 +614,13 @@ public class SvnUtil {
}
return null;
}
public static boolean doesRepositorySupportMergeinfo(final SvnVcs vcs, final SVNURL url) {
try {
return vcs.createRepository(url).hasCapability(SVNCapability.MERGE_INFO);
}
catch (SVNException e) {
return false;
}
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+1 -1
View File
@@ -896,7 +896,7 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
final File file = info.getIoFile();
infos.add(new WCInfo(file.getAbsolutePath(), info.getAbsoluteUrlAsUrl(),
SvnFormatSelector.getWorkingCopyFormat(file), info.getRepositoryUrl(), SvnUtil.isWorkingCopyRoot(file), info.getType(),
SvnUtil.getDepth(this, file)));
SvnUtil.getDepth(this, file), info.isRepoSupportsMergeInfo()));
}
return infos;
}
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class QuickMerge {
tasks.add(new MyInitChecks());
tasks.add(new SourceUrlCorrection());
final boolean supportsMergeinfo = myWcInfo.getFormat().supportsMergeInfo();
final boolean supportsMergeinfo = myWcInfo.getFormat().supportsMergeInfo() && myWcInfo.isRepoSupportsMergeInfo();
if (! supportsMergeinfo) {
insertMergeAll(tasks);
} else {
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfo.java
+7 -1
View File
@@ -29,9 +29,10 @@ public class WCInfo implements WCPaths {
private final boolean myIsWcRoot;
private final NestedCopyType myType;
private final SVNDepth myStickyDepth;
private final boolean myRepoSupportsMergeInfo;
public WCInfo(final String path, final SVNURL url, final WorkingCopyFormat format, final String repositoryRoot, final boolean isWcRoot,
final NestedCopyType type, SVNDepth stickyDepth) {
final NestedCopyType type, SVNDepth stickyDepth, boolean repoSupportsMergeInfo) {
myPath = path;
myUrl = url;
myFormat = format;
@@ -39,6 +40,7 @@ public class WCInfo implements WCPaths {
myIsWcRoot = isWcRoot;
myType = type;
myStickyDepth = stickyDepth;
myRepoSupportsMergeInfo = repoSupportsMergeInfo;
}
public SVNDepth getStickyDepth() {
@@ -97,4 +99,8 @@ public class WCInfo implements WCPaths {
public NestedCopyType getType() {
return myType;
}
public boolean isRepoSupportsMergeInfo() {
return myRepoSupportsMergeInfo;
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/WCInfoWithBranches.java
+2 -2
View File
@@ -33,8 +33,8 @@ public class WCInfoWithBranches extends WCInfo {
final List<Branch> branches,
final VirtualFile root,
final String trunkToot,
final NestedCopyType type, final SVNDepth depth) {
super(path, url, format, repositoryRoot, isWcRoot, type, depth);
final NestedCopyType type, final SVNDepth depth, boolean repoSupportsMergeinfo) {
super(path, url, format, repositoryRoot, isWcRoot, type, depth, repoSupportsMergeinfo);
myBranches = branches;
myRoot = root;
myTrunkRoot = trunkToot;
plugins/svn4idea/src/org/jetbrains/idea/svn/history/WcInfoLoader.java
+2 -2
View File
@@ -80,7 +80,7 @@ public class WcInfoLoader {
}
final WCInfo wcInfo = new WCInfo(rootInfo.getIoFile().getAbsolutePath(), rootInfo.getAbsoluteUrlAsUrl(),
SvnFormatSelector.getWorkingCopyFormat(file), rootInfo.getRepositoryUrl(), SvnUtil.isWorkingCopyRoot(file),
rootInfo.getType(), SvnUtil.getDepth(vcs, file));
rootInfo.getType(), SvnUtil.getDepth(vcs, file), info.isRepoSupportsMergeInfo());
return createInfo(wcInfo, vcs, urlMapping);
}
@@ -125,7 +125,7 @@ public class WcInfoLoader {
final String branchRoot = createBranchesList(url, configuration, items);
return new WCInfoWithBranches(info.getPath(), info.getUrl(), info.getFormat(),
info.getRepositoryRoot(), info.isIsWcRoot(), items, root,
branchRoot, info.getType(), info.getStickyDepth());
branchRoot, info.getType(), info.getStickyDepth(), info.isRepoSupportsMergeInfo());
}
private static String createBranchesList(final String url, final SvnBranchConfigurationNew configuration,
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class SvnMergeInfoTest extends SvnTestCase {
myProjectLevelVcsManager.setDirectoryMapping(myBranchVcsRoot.getAbsolutePath(), SvnVcs.VCS_NAME);
myWCInfo = new WCInfo(myBranchVcsRoot.getAbsolutePath(), SVNURL.parseURIEncoded(myRepoUrl + "/branch"), WorkingCopyFormat.ONE_DOT_SIX,
myRepoUrl, true, null, SVNDepth.INFINITY);
myRepoUrl, true, null, SVNDepth.INFINITY, true);
myOneShotMergeInfoHelper = new OneShotMergeInfoHelper(myProject, myWCInfo, myRepoUrl + "/trunk");
SvnConfiguration.getInstance(myProject).CHECK_NESTED_FOR_QUICK_MERGE = true;