Examples of SVNRevisionRange


Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

        }
        return result;
    }

    public static SVNRevisionRange getSVNRevisionRange(RevisionRange revisionRange) {
        return new SVNRevisionRange(getSVNRevision(revisionRange.getFromRevision()), getSVNRevision(revisionRange.getToRevision()));
    }
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

            boolean related = false;
            boolean ancestral = false;
            List mergeSources = null;
            if (youngestCommonPath != null && SVNRevision.isValidRevisionNumber(youngestCommonRevision)) {
              SVNRevisionRange range = null;
              List ranges = new LinkedList();
              related = true;
              SVNURL youngestCommonURL = sourceReposRoot.appendPath(youngestCommonPath, false);

              if (youngestCommonURL.equals(url2) && youngestCommonRevision == rev2) {
                ancestral = true;
                SVNRevision sRev = SVNRevision.create(rev1);
                SVNRevision eRev = SVNRevision.create(youngestCommonRevision);
                range = new SVNRevisionRange(sRev, eRev);
                ranges.add(range);
                mergeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev,
                    ranges, repository1);
              } else if (youngestCommonURL.equals(url1) && youngestCommonRevision == rev1) {
                ancestral = true;
                SVNRevision sRev = SVNRevision.create(youngestCommonRevision);
                SVNRevision eRev = SVNRevision.create(rev2);
                range = new SVNRevisionRange(sRev, eRev);
                ranges.add(range);
                mergeSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev,
                    ranges, repository2);
              } else {
                mergeCousinsAndSupplementMergeInfo(targetWCPath, entry, adminArea, repository1, url1,
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

    List addSources = null;
    List removeSources = null;
    try {
      SVNRevision sRev = SVNRevision.create(rev1);
      SVNRevision eRev = SVNRevision.create(youngestCommonRev);
      SVNRevisionRange range = new SVNRevisionRange(sRev, eRev);
        List ranges = new LinkedList();
      ranges.add(range);
      repository.setLocation(url1, false);
      removeSources = normalizeMergeSources(null, url1, sourceReposRoot, sRev, ranges, repository);
      sRev = eRev;
      eRev = SVNRevision.create(rev2);
      range = new SVNRevisionRange(sRev, eRev);
      ranges.clear();
      ranges.add(range);
      repository.setLocation(url2, false);
      addSources = normalizeMergeSources(null, url2, sourceReposRoot, eRev,
          ranges, repository);
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

        SVNErrorManager.error(err, SVNLogType.DEFAULT);
      }
     
      List mergeRanges = new ArrayList(rangesToMerge.size());
      for (Iterator rangesIter = rangesToMerge.iterator(); rangesIter.hasNext();) {
      SVNRevisionRange revRange = (SVNRevisionRange) rangesIter.next();
      SVNRevision rangeStart = revRange.getStartRevision();
      SVNRevision rangeEnd = revRange.getEndRevision();
     
      if (!rangeStart.isValid() || !rangeEnd.isValid()) {
        SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION,
            "Not all required revisions are specified");
        SVNErrorManager.error(err, SVNLogType.DEFAULT);
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

                    handler);

            start = handler.getStart();
        }

        SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(start), status.getRevision());
        String command = "svn merge -r " + range.getStartRevision() + ":" + range.getEndRevision() + " " + trunk;

        getLog().info(command);

        diffClient.setEventHandler(new ISVNEventHandler() {
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

            SVNCommitClient commitClient = clientManager.getCommitClient();
            commitClient.doCommit(new File[] { wcRoot }, false, "committing changes", null, null, false, false, SVNDepth.INFINITY);
           
            //now diff the base revision of the working copy against the repository
            SVNDiffClient diffClient = clientManager.getDiffClient();
            SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
           
            diffClient.doMerge(A_URL, SVNRevision.HEAD, Collections.singleton(rangeToMerge),
                    new File(wcRoot, "A_copy"), SVNDepth.UNKNOWN, true, false, false, false);
           
            //now make some changes to the A tree again
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

            options.setConflictHandler(new ConflictResolverHandler());
           
            /* do the same merge call, merge-tracking feature will merge only those revisions
             * which were not still merged.
             */
            SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
            diffClient.doMerge(A_URL, SVNRevision.HEAD, Collections.singleton(rangeToMerge),
                    new File(wcRoot, "A_copy"), SVNDepth.UNKNOWN, true, false, false, false);
           
        } catch (SVNException svne) {
            System.out.println(svne.getErrorMessage());
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

     * @since                         1.2, SVN 1.5
     */
    public void doLog(File[] paths, SVNRevision startRevision, SVNRevision endRevision, SVNRevision pegRevision, boolean stopOnCopy,
            boolean discoverChangedPaths, boolean includeMergedRevisions, long limit, String[] revisionProperties, final ISVNLogEntryHandler handler) throws SVNException {
        Collection revisionRanges = new ArrayList(1);
        revisionRanges.add(new SVNRevisionRange(startRevision, endRevision));
        doLog(paths, revisionRanges, pegRevision, stopOnCopy, discoverChangedPaths, includeMergedRevisions, limit, revisionProperties, handler);
    }
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

        }
       
        SVNRevision sessionRevision = SVNRevision.UNDEFINED;
        List editedRevisionRanges = new LinkedList();
        for (Iterator revRangesIter = revisionRanges.iterator(); revRangesIter.hasNext();) {
            SVNRevisionRange revRange = (SVNRevisionRange) revRangesIter.next();
            if (revRange.getStartRevision().isValid() && !revRange.getEndRevision().isValid()) {
                revRange = new SVNRevisionRange(revRange.getStartRevision(), revRange.getStartRevision());  
            } else if (!revRange.getStartRevision().isValid()) {
                SVNRevision start = SVNRevision.UNDEFINED;
                SVNRevision end = SVNRevision.UNDEFINED;
                if (!pegRevision.isValid()) {
                    start = SVNRevision.BASE;
                } else {
                    start = pegRevision;
                }
               
                if (!revRange.getEndRevision().isValid()) {
                    end = SVNRevision.create(0);
                }
                revRange = new SVNRevisionRange(start, end);
            }
           
            if (!revRange.getStartRevision().isValid() || !revRange.getEndRevision().isValid()) {
                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION, "Missing required revision specification");
                SVNErrorManager.error(err, SVNLogType.WC);
            }
           
            editedRevisionRanges.add(revRange);
            if (!sessionRevision.isValid()) {
                SVNRevision start = revRange.getStartRevision();
                SVNRevision end = revRange.getEndRevision();
                if (SVNRevision.isValidRevisionNumber(start.getNumber()) && SVNRevision.isValidRevisionNumber(end.getNumber())) {
                    sessionRevision = start.getNumber() > end.getNumber() ? start : end;
                } else if (start.getDate() != null && end.getDate() != null) {
                    sessionRevision = start.getDate().compareTo(end.getDate()) > 0 ? start : end;
                }
            }
        }
       
        if (limit > Integer.MAX_VALUE) {
            limit = Integer.MAX_VALUE;
        }
       
        ISVNLogEntryHandler wrappingHandler = new ISVNLogEntryHandler() {
            public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
                checkCancelled();
                handler.handleLogEntry(logEntry);
            }
        };
       
        SVNURL[] urls = new SVNURL[paths.length];
        SVNWCAccess wcAccess = createWCAccess();
        Collection wcPaths = new ArrayList();
        for (int i = 0; i < paths.length; i++) {
            checkCancelled();
            File path = paths[i];
            wcPaths.add(path.getAbsolutePath().replace(File.separatorChar, '/'));
            SVNAdminArea area = wcAccess.probeOpen(path, false, 0);
            SVNEntry entry = wcAccess.getVersionedEntry(path, false);
            if (entry.getURL() == null) {
                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.ENTRY_MISSING_URL,
                        "Entry ''{0}'' has no URL", path);
                SVNErrorManager.error(err, SVNLogType.WC);
            }
            urls[i] = entry.getSVNURL();
            if (area != null) {
                wcAccess.closeAdminArea(area.getRoot());
            }
        }
       
        if (urls.length == 0) {
            return;
        }
       
        String[] wcPathsArray = (String[]) wcPaths.toArray(new String[wcPaths.size()]);
        String rootWCPath = SVNPathUtil.condencePaths(wcPathsArray, null, true);
        Collection targets = new TreeSet();
        SVNURL baseURL = SVNURLUtil.condenceURLs(urls, targets, true);
        if (baseURL == null) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.ILLEGAL_TARGET,
                    "target log paths belong to different repositories");
            SVNErrorManager.error(err, SVNLogType.WC);
        }
        if (targets.isEmpty()) {
            targets.add("");
        }
        if (!pegRevision.isValid()) {
            pegRevision = SVNRevision.WORKING;
        }
       
        SVNRepository repos = null;
        if (rootWCPath != null && needsWC(pegRevision)) {           
            // open and use wc to create repository.
            File root = new Resource(rootWCPath);
            SVNAdminArea area = wcAccess.probeOpen(root, false, 0);
            repos = createRepository(null, root, area, pegRevision, sessionRevision, null);
            if (area != null) {
                wcAccess.closeAdminArea(area.getRoot());
            }
        } else {
            repos = createRepository(baseURL, null, null, pegRevision, sessionRevision, null);
        }
       
        String[] targetPaths = (String[]) targets.toArray(new String[targets.size()]);
       
        for (int i = 0; i < targetPaths.length; i++) {
            targetPaths[i] = SVNEncodingUtil.uriDecode(targetPaths[i]);
        }

        for (Iterator revRangesIter = editedRevisionRanges.iterator(); revRangesIter.hasNext();) {
            checkCancelled();
           
            SVNRevisionRange revRange = (SVNRevisionRange) revRangesIter.next();
            SVNRevision startRevision = revRange.getStartRevision();
            SVNRevision endRevision = revRange.getEndRevision();
           
            if (startRevision.isLocal() || endRevision.isLocal()) {
                for (int i = 0; i < paths.length; i++) {
                    checkCancelled();
                    long startRev = getRevisionNumber(startRevision, repos, paths[i]);
View Full Code Here

Examples of org.tmatesoft.svn.core.wc.SVNRevisionRange

     */
    public void doLog(SVNURL url, String[] paths, SVNRevision pegRevision, SVNRevision startRevision,
            SVNRevision endRevision, boolean stopOnCopy, boolean discoverChangedPaths, boolean includeMergedRevisions,
            long limit, String[] revisionProperties, final ISVNLogEntryHandler handler) throws SVNException {
        Collection revisionRanges = new ArrayList(1);
        revisionRanges.add(new SVNRevisionRange(startRevision, endRevision));
        doLog(url, paths, pegRevision, revisionRanges, stopOnCopy, discoverChangedPaths, includeMergedRevisions, limit, revisionProperties,
                handler);
    }
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
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.