Examples of SVNMergeInfo

org.tmatesoft.svn.core.SVNMergeInfo
The SVNMergeInfo represents information about merges to a certain repository path. @version 1.3 @author TMate Software Ltd. @since 1.2

Examples of org.tmatesoft.svn.core.SVNMergeInfo

    private Map removeIrrelevantRanges(Map mergeInfoByPath, Collection segments, String sourceReposPath) {
        Map historyAsMergeInfo = getMergeInfoFromSegments(segments);
        Map newCatalog = new TreeMap();
        for (Iterator pathsIter = mergeInfoByPath.keySet().iterator(); pathsIter.hasNext();) {
            String path = (String) pathsIter.next();
            SVNMergeInfo mergeInfo = (SVNMergeInfo) mergeInfoByPath.get(path);  
            Map filteredMergeInfo = SVNMergeInfoUtil.intersectMergeInfo(mergeInfo.getMergeSourcesToMergeLists(), 
                    historyAsMergeInfo);
            if (!filteredMergeInfo.isEmpty() || !path.equals(sourceReposPath)) {
                newCatalog.put(path, filteredMergeInfo);
            }
        }

View Full Code Here

Examples of org.tmatesoft.svn.core.SVNMergeInfo

          }
      }
      
      Map targetMergeInfo = null;
      if (reposMergeInfo != null) {
        SVNMergeInfo mergeInfo = (SVNMergeInfo) reposMergeInfo.get(path);
        if (mergeInfo != null) {
          targetMergeInfo = mergeInfo.getMergeSourcesToMergeLists();
        }
      }
      return targetMergeInfo;
    }

View Full Code Here

Examples of org.tmatesoft.svn.core.SVNMergeInfo

                srcPath = "/" + srcPath;
            }
            
            Map targetHistoryAsMergeInfo = getMergeInfoFromSegments(segments);
            
            SVNMergeInfo sourceMergeInfoObject = (SVNMergeInfo) srcCatalog.get(srcPath);
            
            Map srcMergeInfo = sourceMergeInfoObject != null ? sourceMergeInfoObject.getMergeSourcesToMergeLists() : null;
            if (srcMergeInfo != null) {
                srcCatalog.remove(srcPath);
                Map explicitSrcTgtHistoryIntersection = SVNMergeInfoUtil.intersectMergeInfo(srcMergeInfo, targetHistoryAsMergeInfo);
                if (!explicitSrcTgtHistoryIntersection.isEmpty()) {
                    neverSynched[0] = false;
                    long[] endPoints = SVNMergeInfoUtil.getRangeEndPoints(explicitSrcTgtHistoryIntersection);
                    long youngRev = endPoints[0];


                    if (!SVNRevision.isValidRevisionNumber(youngestMergedRev[0]) || (youngRev > youngestMergedRev[0])) {
                        youngestMergedRev[0] = youngRev;
                    }
                }
            } else {
                SVNNodeKind kind = repos.checkPath(srcPath, srcRev);
                if (kind == SVNNodeKind.NONE) {
                    continue;
                }
                
                Map subTreeCatalog = repos.getMergeInfo(new String[] { srcPath }, srcRev, SVNMergeInfoInheritance.INHERITED, false);
                if (subTreeCatalog != null) {
                    SVNMergeInfo sourceMergeInfo = (SVNMergeInfo) subTreeCatalog.get(srcPath);
                    srcMergeInfo = sourceMergeInfo != null ? sourceMergeInfo.getMergeSourcesToMergeLists() : null;
                }
                if (srcMergeInfo == null) {
                    srcMergeInfo = new TreeMap();
                }
            }
            
            segments = repos.getLocationSegments(srcPath, srcRev, srcRev, SVNRepository.INVALID_REVISION);
            Map srcHistoryAsMergeInfo = getMergeInfoFromSegments(segments);
            srcMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(srcMergeInfo, srcHistoryAsMergeInfo);
            Map commonMergeInfo = SVNMergeInfoUtil.intersectMergeInfo(srcMergeInfo, targetHistoryAsMergeInfo);
            Map filteredMergeInfo = SVNMergeInfoUtil.removeMergeInfo(commonMergeInfo, targetHistoryAsMergeInfo);
            newCatalog.put(srcPath, filteredMergeInfo);
        }
        
        if (!srcCatalog.isEmpty()) {
            for (Iterator srcCatalogIter = srcCatalog.keySet().iterator(); srcCatalogIter.hasNext();) {
                String srcPath = (String) srcCatalogIter.next();
                SVNMergeInfo sourceMergeInfoObject = (SVNMergeInfo) srcCatalog.get(srcPath);
                Map srcMergeInfo = sourceMergeInfoObject.getMergeSourcesToMergeLists();
                String targetPath = srcPath.substring(sourceReposPath.length());
                if (targetPath.startsWith("/")) {
                    targetPath = targetPath.substring(1);
                }
                targetPath = SVNPathUtil.append(targetReposPath, targetPath);

View Full Code Here

Examples of org.tmatesoft.svn.core.SVNMergeInfo

          }
      }
      
      Map targetMergeInfo = null;
      if (reposMergeInfo != null) {
        SVNMergeInfo mergeInfo = (SVNMergeInfo) reposMergeInfo.get(path);
        if (mergeInfo != null) {
          targetMergeInfo = mergeInfo.getMergeSourcesToMergeLists();
        }
      }
      return targetMergeInfo;
    }

View Full Code Here

Examples of org.tmatesoft.svn.core.SVNMergeInfo

                getMergeInfoRequest().getRevision(), getMergeInfoRequest().getInherit(), false);
        if (mergeInfoMap != null && !mergeInfoMap.isEmpty()) {
            for (Iterator iterator = mergeInfoMap.entrySet().iterator(); iterator.hasNext();) {
                Map.Entry entry = (Map.Entry) iterator.next();
                String path = (String) entry.getKey();
                SVNMergeInfo mergeInfo = (SVNMergeInfo) entry.getValue();
                addMergeInfo(path, mergeInfo, xmlBuffer);
            }
        }


        addXMLFooter(xmlBuffer, MERGEINFO_REPORT);

View Full Code Here

0 1 2

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.