Package org.tmatesoft.svn.core.wc

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

1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
    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
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
        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
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
       
        List rangesToMerge = getSVNEnvironment().getRevisionRanges();
        SVNRevision firstRangeStart = SVNRevision.UNDEFINED;
        SVNRevision firstRangeEnd = SVNRevision.UNDEFINED;
        if (!rangesToMerge.isEmpty()) {
          SVNRevisionRange range = (SVNRevisionRange) rangesToMerge.get(0);
          firstRangeStart = range.getStartRevision();
          firstRangeEnd = range.getEndRevision();
        }
        if (firstRangeStart != SVNRevision.UNDEFINED) {
          if (firstRangeEnd == SVNRevision.UNDEFINED) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_INSUFFICIENT_ARGS,
                "Second revision required");
            SVNErrorManager.error(err, SVNLogType.CLIENT);
          }
          twoSourcesSpecified = false;
        }
       
        if (!twoSourcesSpecified) {
            if (targets.size() > 2) {
                SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR,
                    "Too many arguments given"), SVNLogType.CLIENT);
            }
            if (targets.isEmpty()) {
                pegRevision1 = SVNRevision.HEAD;
            } else {
                source2 = source1;
                if (pegRevision1 == null || pegRevision1 == SVNRevision.UNDEFINED) {
                    pegRevision1 = source1.isURL() ? SVNRevision.HEAD : SVNRevision.WORKING;
                }
                if (targets.size() == 2) {
                    target = new SVNPath((String) targets.get(1));
                    if (target.isURL()) {
                      SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR,
                          "Cannot specifify a revision range with two URLs");
                      SVNErrorManager.error(err, SVNLogType.CLIENT);
                    }
                }
            }
        } else {
            if (targets.size() < 2) {
                SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CL_INSUFFICIENT_ARGS), SVNLogType.CLIENT);
            } else if (targets.size() > 3) {
                SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CL_ARG_PARSING_ERROR,
                    "Too many arguments given"), SVNLogType.CLIENT);
            }
           
            firstRangeStart = pegRevision1;
            firstRangeEnd = pegRevision2;
           
            if (((firstRangeStart == null || firstRangeStart == SVNRevision.UNDEFINED) && !source1.isURL()) ||
                    ((pegRevision2 == null || pegRevision2 == SVNRevision.UNDEFINED) && !source2.isURL())) {
                SVNErrorManager.error(SVNErrorMessage.create(SVNErrorCode.CLIENT_BAD_REVISION,
                    "A working copy merge source needs an explicit revision"), SVNLogType.CLIENT);
            }
            if (firstRangeStart == null || firstRangeStart == SVNRevision.UNDEFINED) {
                firstRangeStart = SVNRevision.HEAD;
            }
            if (firstRangeEnd == null || firstRangeEnd == SVNRevision.UNDEFINED) {
                firstRangeEnd = SVNRevision.HEAD;
            }
            if (targets.size() >= 3) {
                target = new SVNPath((String) targets.get(2));
            }
        }
       
        if (source1 != null && source2 != null && target == null) {
            if (source1.isURL()) {
                String name1 = SVNPathUtil.tail(source1.getTarget());
                String name2 = SVNPathUtil.tail(source2.getTarget());
                if (name1.equals(name2)) {
                    String decodedPath = SVNEncodingUtil.uriDecode(name1);
                    SVNPath decodedPathTarget = new SVNPath(decodedPath);
                    if (SVNFileType.getType(decodedPathTarget.getFile()) == SVNFileType.FILE) {
                        target = decodedPathTarget;
                    }
                }
            } else if (source1.equals(source2)) {
                String decodedPath = SVNEncodingUtil.uriDecode(source1.getTarget());
                SVNPath decodedPathTarget = new SVNPath(decodedPath);
                if (SVNFileType.getType(decodedPathTarget.getFile()) == SVNFileType.FILE) {
                    target = decodedPathTarget;
                }
            }
        }
        if (target == null) {
            target = new SVNPath("");
        }
        SVNDiffClient client = getSVNEnvironment().getClientManager().getDiffClient();
        if (!getSVNEnvironment().isQuiet()) {
            client.setEventHandler(new SVNNotifyPrinter(getSVNEnvironment()));
        }
        try {
            client.setMergeOptions(getSVNEnvironment().getDiffOptions());
            if (!twoSourcesSpecified) {
                if (firstRangeStart == SVNRevision.UNDEFINED && firstRangeEnd == SVNRevision.UNDEFINED) {
                  SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(1), pegRevision1);
                  rangesToMerge = new LinkedList();
                  rangesToMerge.add(range);
                }
               
                if (source1 == null) {
View Full Code Here
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
    • Copyright © 2018 www.massapicom. 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.