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

org.tmatesoft.svn.core.wc.SVNRevisionRange
The SVNRevisionRange class represents a revision range between a start revision and an end revision. Revision range objects are passed to the pegged versions of the {@link SVNDiffClient}'s doMerge() method to specify ranges of the source which must be merged into the target. Read more, for example, in the description for {@link SVNDiffClient#doMerge(java.io.File,SVNRevision,java.util.Collection,java.io.File,org.tmatesoft.svn.core.SVNDepth,boolean,boolean,boolean,boolean)}. @version 1.3 @author TMate Software Ltd. @since 1.2


            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

    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

        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

        }
        return result;
    }


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

View Full Code Here

                false);
        logger.info("Checked out working copy to " + wcRoot);        
        
        File targetOfMerge = (mergeToDMO? demoDir: customDir); 
        SVNURL sourceOfMerge = (mergeToDMO? customURL : demoURL);
        SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(revAfterCopyToCustom), SVNRevision.HEAD);        
        wcFilesNotMerged.clear();
                
        diffClient.doMerge(sourceOfMerge, SVNRevision.create(revAfterCopyToCustom), Collections.singleton(rangeToMerge), 
                targetOfMerge, SVNDepth.INFINITY, true, false, false, false);

View Full Code Here

                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION, "-c and -r are mutually exclusive");
                SVNErrorManager.error(err, SVNLogType.CLIENT);
            }
            
            for (Iterator revisionsIter = revisionRanges.iterator(); revisionsIter.hasNext();) {
                SVNRevisionRange revRange = (SVNRevisionRange) revisionsIter.next();
                SVNRevision startRev = revRange.getStartRevision();
                SVNRevision endRev = revRange.getEndRevision();
                if (startRev.getNumber() < endRev.getNumber()) {
                    revRange = new SVNRevisionRange(endRev, endRev);
                } else {
                    revRange = new SVNRevisionRange(startRev, startRev);
                }
                editedRevisionRangesList.add(revRange);
            }


            if (start.getNumber() < end.getNumber()) {

View Full Code Here

                    "-r and -c can't be used with --reintegrate");
            SVNErrorManager.error(err, SVNLogType.CLIENT);
        }


      if (myRevisionRanges.isEmpty()) {
          SVNRevisionRange range = new SVNRevisionRange(SVNRevision.UNDEFINED, SVNRevision.UNDEFINED);
          myRevisionRanges.add(range);
        }
        
        SVNRevisionRange range = (SVNRevisionRange) myRevisionRanges.get(0);
        myStartRevision = range.getStartRevision();
        myEndRevision = range.getEndRevision();
        
        if (myIsReIntegrate) {
            if (myIsIgnoreAncestry) {
                if (myIsRecordOnly) {
                    SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_MUTUALLY_EXCLUSIVE_ARGS,

View Full Code Here

                } catch (NumberFormatException nfe) {
                    SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR, 
                            "Non-numeric change argument ({0}) given to -c", token);
                    SVNErrorManager.error(err, SVNLogType.CLIENT);
                }
                SVNRevisionRange range = null;
                if (change == 0) {
                    SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR, 
                            "There is no change 0");
                    SVNErrorManager.error(err, SVNLogType.CLIENT);
                } else if (change > 0) {
                    range = new SVNRevisionRange(SVNRevision.create(change - 1), SVNRevision.create(change));
                } else {
                    change = -change;
                    range = new SVNRevisionRange(SVNRevision.create(change), SVNRevision.create(change - 1));
                }
                myRevisionRanges.add(range);
                myIsChangeOptionUsed = true;
            }
        } else if (option == SVNOption.REVISION) {
            String revStr = optionValue.getValue();
            SVNRevision[] revisions = parseRevision(revStr);
            if (revisions == null) {
                SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR, 
                    "Syntax error in revision argument ''{0}''", revStr);
                SVNErrorManager.error(err, SVNLogType.CLIENT);
            }
            SVNRevisionRange range = new SVNRevisionRange(revisions[0], revisions[1]);
            myRevisionRanges.add(range);
            myIsRevisionOptionUsed = true;
        } else if (option == SVNOption.VERBOSE) {
            myIsVerbose = true;
        } else if (option == SVNOption.UPDATE) {

View Full Code Here

        }
        return result;
    }


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

View Full Code Here


            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

0 1 2 3

TOP

Related Classes of org.tmatesoft.svn.core.wc.SVNRevisionRange

decodepcode.svn.MergePeopleCodeTrees

net.sf.maven.plugins.svnupmergetool.UpmergeMojo

org.exist.versioning.svn.ConflictedMerge

org.exist.versioning.svn.internal.wc.SVNMergeDriver

org.exist.versioning.svn.Merge

org.exist.versioning.svn.wc.SVNDiffClient

org.exist.versioning.svn.wc.SVNLogClient

org.tigris.subversion.javahl.JavaHLObjectFactory

org.tmatesoft.svn.cli.svn.SVNCommandEnvironment

org.tmatesoft.svn.cli.svn.SVNLogCommand

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.