| 1 | |
|
| 2 | |
|
| 3 | |
|
| 4 | |
|
| 5 | |
|
| 6 | |
|
| 7 | |
|
| 8 | |
|
| 9 | |
|
| 10 | |
|
| 11 | |
|
| 12 | |
|
| 13 | |
|
| 14 | |
|
| 15 | |
|
| 16 | |
|
| 17 | |
|
| 18 | |
|
| 19 | |
|
| 20 | |
|
| 21 | |
|
| 22 | |
|
| 23 | |
|
| 24 | |
package net.sf.statsvn.input; |
| 25 | |
|
| 26 | |
import java.io.FileInputStream; |
| 27 | |
import java.io.FileNotFoundException; |
| 28 | |
import java.io.IOException; |
| 29 | |
import java.io.InputStream; |
| 30 | |
import java.util.ArrayList; |
| 31 | |
import java.util.Collection; |
| 32 | |
import java.util.Collections; |
| 33 | |
import java.util.Date; |
| 34 | |
import java.util.HashMap; |
| 35 | |
import java.util.HashSet; |
| 36 | |
import java.util.Iterator; |
| 37 | |
import java.util.List; |
| 38 | |
import java.util.Map; |
| 39 | |
import java.util.Vector; |
| 40 | |
|
| 41 | |
import javax.xml.parsers.ParserConfigurationException; |
| 42 | |
import javax.xml.parsers.SAXParser; |
| 43 | |
import javax.xml.parsers.SAXParserFactory; |
| 44 | |
|
| 45 | |
import net.sf.statcvs.input.LogSyntaxException; |
| 46 | |
import net.sf.statsvn.output.SvnConfigurationOptions; |
| 47 | |
import net.sf.statsvn.util.BinaryDiffException; |
| 48 | |
import net.sf.statsvn.util.FilenameComparator; |
| 49 | |
import net.sf.statsvn.util.SvnDiffUtils; |
| 50 | |
import net.sf.statsvn.util.XMLUtil; |
| 51 | |
|
| 52 | |
import org.xml.sax.SAXException; |
| 53 | |
|
| 54 | |
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; |
| 55 | |
import edu.emory.mathcs.backport.java.util.concurrent.Executors; |
| 56 | |
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; |
| 57 | |
|
| 58 | |
|
| 59 | |
|
| 60 | |
|
| 61 | |
|
| 62 | |
|
| 63 | |
|
| 64 | |
|
| 65 | |
|
| 66 | 0 | |
| 67 | 0 | public class SvnLogfileParser { |
| 68 | |
private static final int INTERMEDIARY_SAVE_INTERVAL_MS = 120000; |
| 69 | |
|
| 70 | |
private static final String REPOSITORIES_XML = "repositories.xml"; |
| 71 | |
|
| 72 | |
private final SvnLogBuilder builder; |
| 73 | |
|
| 74 | |
private final InputStream logFile; |
| 75 | |
|
| 76 | |
private final RepositoryFileManager repositoryFileManager; |
| 77 | |
|
| 78 | |
private CacheBuilder cacheBuilder; |
| 79 | 3 | |
| 80 | 1 | private HashSet revsForNewDiff = null; |
| 81 | |
|
| 82 | |
|
| 83 | |
|
| 84 | |
|
| 85 | |
|
| 86 | |
|
| 87 | |
|
| 88 | |
|
| 89 | |
|
| 90 | |
|
| 91 | 3 | |
| 92 | 4 | public SvnLogfileParser(final RepositoryFileManager repositoryFileManager, final InputStream logFile, final SvnLogBuilder builder) { |
| 93 | 4 | this.logFile = logFile; |
| 94 | 4 | this.builder = builder; |
| 95 | 4 | this.repositoryFileManager = repositoryFileManager; |
| 96 | 1 | } |
| 97 | |
|
| 98 | |
|
| 99 | |
|
| 100 | |
|
| 101 | |
|
| 102 | |
|
| 103 | |
|
| 104 | |
|
| 105 | |
|
| 106 | |
|
| 107 | |
|
| 108 | |
|
| 109 | 3 | protected void handleLineCounts(final SAXParserFactory factory) throws IOException { |
| 110 | 4 | long startTime = System.currentTimeMillis(); |
| 111 | 1 | final String xmlFile = SvnConfigurationOptions.getCacheDir() + REPOSITORIES_XML; |
| 112 | 3 | |
| 113 | 4 | final RepositoriesBuilder repositoriesBuilder = readAndParseXmlFile(factory, xmlFile); |
| 114 | 4 | cacheFileName = SvnConfigurationOptions.getCacheDir() + repositoriesBuilder.getFileName(repositoryFileManager.getRepositoryUuid()); |
| 115 | 4 | XMLUtil.writeXmlFile(repositoriesBuilder.getDocument(), xmlFile); |
| 116 | 4 | SvnConfigurationOptions.getTaskLogger().log("parsing repositories finished in " + (System.currentTimeMillis() - startTime) + " ms."); |
| 117 | 1 | startTime = System.currentTimeMillis(); |
| 118 | 3 | |
| 119 | 4 | readCache(factory); |
| 120 | 4 | SvnConfigurationOptions.getTaskLogger().log("parsing line counts finished in " + (System.currentTimeMillis() - startTime) + " ms."); |
| 121 | 1 | startTime = System.currentTimeMillis(); |
| 122 | |
|
| 123 | |
|
| 124 | 3 | |
| 125 | 1 | cacheBuilder.updateBinaryStatus(builder.getFileBuilders().values(), repositoryFileManager.getRootRevisionNumber()); |
| 126 | 3 | |
| 127 | 1 | final Collection fileBuilders = builder.getFileBuilders().values(); |
| 128 | 3 | |
| 129 | 1 | calculateNumberRequiredCalls(fileBuilders); |
| 130 | |
|
| 131 | 3 | |
| 132 | 4 | ExecutorService poolService = null; |
| 133 | 4 | if (SvnConfigurationOptions.getNumberSvnDiffThreads() > 1) { |
| 134 | 1 | poolService = Executors.newFixedThreadPool(SvnConfigurationOptions.getNumberSvnDiffThreads()); |
| 135 | |
} |
| 136 | 3 | |
| 137 | 4 | boolean isFirstDiff = true; |
| 138 | 4 | calls = 0; |
| 139 | 4 | groupStart = System.currentTimeMillis(); |
| 140 | 1 | boolean poolUseRequired = false; |
| 141 | 3 | |
| 142 | 1 | if (SvnConfigurationOptions.isLegacyDiff()) { |
| 143 | 0 | for (final Iterator iter = fileBuilders.iterator(); iter.hasNext();) { |
| 144 | 0 | final FileBuilder fileBuilder = (FileBuilder) iter.next(); |
| 145 | 0 | final String fileName = fileBuilder.getName(); |
| 146 | 0 | if (fileBuilder.isBinary() || !builder.matchesPatterns(fileName)) { |
| 147 | 0 | continue; |
| 148 | 0 | } |
| 149 | 0 | final List revisions = fileBuilder.getRevisions(); |
| 150 | 0 | for (int i = 0; i < revisions.size(); i++) { |
| 151 | |
|
| 152 | |
|
| 153 | |
|
| 154 | |
|
| 155 | |
|
| 156 | |
|
| 157 | |
|
| 158 | |
|
| 159 | |
|
| 160 | |
|
| 161 | |
|
| 162 | 0 | |
| 163 | 0 | if (i + 1 < revisions.size() && ((RevisionData) revisions.get(i)).hasNoLines() && !((RevisionData) revisions.get(i)).isDeletion()) { |
| 164 | 0 | if (((RevisionData) revisions.get(i + 1)).isDeletion()) { |
| 165 | 0 | continue; |
| 166 | 0 | } |
| 167 | 0 | final String revNrNew = ((RevisionData) revisions.get(i)).getRevisionNumber(); |
| 168 | 0 | if (cacheBuilder.isBinary(fileName, revNrNew)) { |
| 169 | 0 | continue; |
| 170 | 0 | } |
| 171 | 0 | final String revNrOld = ((RevisionData) revisions.get(i + 1)).getRevisionNumber(); |
| 172 | 0 | |
| 173 | 0 | if (isFirstDiff) { |
| 174 | 0 | SvnConfigurationOptions.getTaskLogger().info("Contacting server to obtain line count information."); |
| 175 | 0 | SvnConfigurationOptions.getTaskLogger().info( |
| 176 | |
"This information will be cached so that the next time you run StatSVN, results will be returned more quickly."); |
| 177 | 0 | |
| 178 | 0 | if (SvnConfigurationOptions.isLegacyDiff()) { |
| 179 | 0 | SvnConfigurationOptions.getTaskLogger().info("Using the legacy Subversion 1.3 diff mechanism: one diff per file per revision."); |
| 180 | 0 | } else { |
| 181 | 0 | SvnConfigurationOptions.getTaskLogger().info("Using the Subversion 1.4 diff mechanism: one diff per revision."); |
| 182 | |
} |
| 183 | 0 | |
| 184 | 0 | isFirstDiff = false; |
| 185 | |
} |
| 186 | 0 | |
| 187 | 0 | final DiffTask diff = new DiffTask(fileName, revNrNew, revNrOld, fileBuilder); |
| 188 | |
|
| 189 | |
|
| 190 | |
|
| 191 | |
|
| 192 | 0 | |
| 193 | 0 | poolUseRequired = executeTask(poolService, poolUseRequired, diff); |
| 194 | |
} |
| 195 | 0 | } |
| 196 | 0 | } |
| 197 | 3 | } else { |
| 198 | 1 | for (final Iterator iter = revsForNewDiff.iterator(); iter.hasNext();) { |
| 199 | 0 | final String revNrNew = (String) iter.next(); |
| 200 | 0 | final PerRevDiffTask diff = new PerRevDiffTask(revNrNew, builder.getFileBuilders()); |
| 201 | 0 | |
| 202 | 0 | poolUseRequired = executeTask(poolService, poolUseRequired, diff); |
| 203 | 0 | } |
| 204 | |
|
| 205 | 3 | } |
| 206 | 4 | waitForPoolIfRequired(poolService); |
| 207 | 4 | SvnConfigurationOptions.getTaskLogger().log("parsing svn diff"); |
| 208 | 4 | XMLUtil.writeXmlFile(cacheBuilder.getDocument(), cacheFileName); |
| 209 | 4 | SvnConfigurationOptions.getTaskLogger().log("parsing svn diff finished in " + (System.currentTimeMillis() - startTime) + " ms."); |
| 210 | 1 | } |
| 211 | |
|
| 212 | 0 | private boolean executeTask(final ExecutorService poolService, boolean poolUseRequired, final DiffTask diff) { |
| 213 | 0 | if (poolUseRequired && SvnConfigurationOptions.getNumberSvnDiffThreads() > 1) { |
| 214 | 0 | poolService.execute(diff); |
| 215 | 0 | } else { |
| 216 | 0 | final long start = System.currentTimeMillis(); |
| 217 | 0 | diff.run(); |
| 218 | 0 | final long end = System.currentTimeMillis(); |
| 219 | 0 | poolUseRequired = (end - start) > SvnConfigurationOptions.getThresholdInMsToUseConcurrency(); |
| 220 | 0 | } |
| 221 | 0 | return poolUseRequired; |
| 222 | |
} |
| 223 | |
|
| 224 | 3 | private void waitForPoolIfRequired(final ExecutorService poolService) { |
| 225 | 4 | if (SvnConfigurationOptions.getNumberSvnDiffThreads() > 1 && poolService != null) { |
| 226 | 1 | SvnConfigurationOptions.getTaskLogger().info( |
| 227 | |
"Scheduled " + requiredDiffCalls + " svn diff calls on " + Math.min(requiredDiffCalls, SvnConfigurationOptions.getNumberSvnDiffThreads()) |
| 228 | 3 | + " threads."); |
| 229 | 1 | poolService.shutdown(); |
| 230 | 3 | try { |
| 231 | 4 | SvnConfigurationOptions.getTaskLogger().log("================ Wait for completion ========================="); |
| 232 | 1 | if (!poolService.awaitTermination(2, TimeUnit.DAYS)) { |
| 233 | 0 | SvnConfigurationOptions.getTaskLogger().log("================ TIME OUT!!! ========================="); |
| 234 | 0 | } |
| 235 | 0 | } catch (final InterruptedException e) { |
| 236 | 3 | SvnConfigurationOptions.getTaskLogger().error(e.toString()); |
| 237 | 1 | } |
| 238 | 3 | } |
| 239 | 1 | } |
| 240 | |
|
| 241 | |
private void calculateNumberRequiredCalls(final Collection fileBuilders) { |
| 242 | 3 | |
| 243 | 1 | requiredDiffCalls = 0; |
| 244 | 3 | |
| 245 | 4 | if (!SvnConfigurationOptions.isLegacyDiff()) { |
| 246 | 1 | revsForNewDiff = new HashSet(); |
| 247 | |
} |
| 248 | 3 | |
| 249 | 3154 | for (final Iterator iter = fileBuilders.iterator(); iter.hasNext();) { |
| 250 | 4204 | final FileBuilder fileBuilder = (FileBuilder) iter.next(); |
| 251 | 4204 | final String fileName = fileBuilder.getName(); |
| 252 | 3766 | if (!fileBuilder.isBinary() && builder.matchesPatterns(fileName)) { |
| 253 | 19442 | final List revisions = fileBuilder.getRevisions(); |
| 254 | 22001 | for (int i = 0; i < revisions.size(); i++) { |
| 255 | 5817 | if (i + 1 < revisions.size() && ((RevisionData) revisions.get(i)).hasNoLines() && !((RevisionData) revisions.get(i)).isDeletion()) { |
| 256 | 724 | if (((RevisionData) revisions.get(i + 1)).isDeletion()) { |
| 257 | 181 | continue; |
| 258 | 0 | } |
| 259 | 0 | final String revNrNew = ((RevisionData) revisions.get(i)).getRevisionNumber(); |
| 260 | 0 | if (cacheBuilder.isBinary(fileName, revNrNew)) { |
| 261 | 0 | continue; |
| 262 | |
} |
| 263 | |
|
| 264 | 0 | |
| 265 | 0 | if (revsForNewDiff == null || !revsForNewDiff.contains(revNrNew)) { |
| 266 | 0 | requiredDiffCalls++; |
| 267 | 0 | |
| 268 | 0 | if (revsForNewDiff != null) { |
| 269 | 0 | revsForNewDiff.add(revNrNew); |
| 270 | |
} |
| 271 | |
} |
| 272 | |
} |
| 273 | |
} |
| 274 | 3153 | } |
| 275 | 1051 | } |
| 276 | 3 | |
| 277 | 1 | } |
| 278 | |
|
| 279 | 3 | private void readCache(final SAXParserFactory factory) throws IOException { |
| 280 | 4 | cacheBuilder = new CacheBuilder(builder, repositoryFileManager); |
| 281 | 1 | FileInputStream cacheFile = null; |
| 282 | 3 | try { |
| 283 | 4 | cacheFile = new FileInputStream(cacheFileName); |
| 284 | 4 | final SAXParser parser = factory.newSAXParser(); |
| 285 | 4 | parser.parse(cacheFile, new SvnXmlCacheFileHandler(cacheBuilder)); |
| 286 | 1 | cacheFile.close(); |
| 287 | 0 | } catch (final ParserConfigurationException e) { |
| 288 | 0 | SvnConfigurationOptions.getTaskLogger().error("Cache: " + e.toString()); |
| 289 | 0 | } catch (final SAXException e) { |
| 290 | 0 | SvnConfigurationOptions.getTaskLogger().error("Cache: " + e.toString()); |
| 291 | 0 | } catch (final FileNotFoundException e) { |
| 292 | 0 | SvnConfigurationOptions.getTaskLogger().log("Cache: " + e.toString()); |
| 293 | 0 | } catch (final IOException e) { |
| 294 | 0 | SvnConfigurationOptions.getTaskLogger().error("Cache: " + e.toString()); |
| 295 | 3 | } finally { |
| 296 | 4 | if (cacheFile != null) { |
| 297 | 1 | cacheFile.close(); |
| 298 | |
} |
| 299 | 3 | } |
| 300 | 1 | } |
| 301 | |
|
| 302 | 3 | private RepositoriesBuilder readAndParseXmlFile(final SAXParserFactory factory, final String xmlFile) throws IOException { |
| 303 | 4 | final RepositoriesBuilder repositoriesBuilder = new RepositoriesBuilder(); |
| 304 | 1 | FileInputStream repositoriesFile = null; |
| 305 | 3 | try { |
| 306 | 4 | repositoriesFile = new FileInputStream(xmlFile); |
| 307 | 4 | final SAXParser parser = factory.newSAXParser(); |
| 308 | 4 | parser.parse(repositoriesFile, new SvnXmlRepositoriesFileHandler(repositoriesBuilder)); |
| 309 | 1 | repositoriesFile.close(); |
| 310 | 0 | } catch (final ParserConfigurationException e) { |
| 311 | 0 | SvnConfigurationOptions.getTaskLogger().error("Repositories: " + e.toString()); |
| 312 | 0 | } catch (final SAXException e) { |
| 313 | 0 | SvnConfigurationOptions.getTaskLogger().error("Repositories: " + e.toString()); |
| 314 | 0 | } catch (final FileNotFoundException e) { |
| 315 | 0 | SvnConfigurationOptions.getTaskLogger().log("Repositories: " + e.toString()); |
| 316 | 0 | } catch (final IOException e) { |
| 317 | 0 | SvnConfigurationOptions.getTaskLogger().error("Repositories: " + e.toString()); |
| 318 | 3 | } finally { |
| 319 | 4 | if (repositoriesFile != null) { |
| 320 | 1 | repositoriesFile.close(); |
| 321 | |
} |
| 322 | 3 | } |
| 323 | 1 | return repositoriesBuilder; |
| 324 | |
} |
| 325 | |
|
| 326 | |
|
| 327 | |
|
| 328 | |
|
| 329 | |
|
| 330 | |
|
| 331 | |
|
| 332 | |
|
| 333 | |
|
| 334 | |
|
| 335 | |
public void parse() throws LogSyntaxException, IOException { |
| 336 | 3 | |
| 337 | 1 | final SAXParserFactory factory = parseSvnLog(); |
| 338 | 3 | |
| 339 | 1 | verifyImplicitActions(); |
| 340 | |
|
| 341 | 3 | |
| 342 | 1 | removeDirectories(); |
| 343 | 3 | |
| 344 | 1 | handleLineCounts(factory); |
| 345 | 3 | |
| 346 | 1 | } |
| 347 | |
|
| 348 | |
|
| 349 | |
|
| 350 | |
|
| 351 | |
|
| 352 | |
|
| 353 | |
|
| 354 | |
|
| 355 | |
|
| 356 | |
|
| 357 | |
|
| 358 | |
|
| 359 | |
|
| 360 | |
protected void verifyImplicitActions() { |
| 361 | |
|
| 362 | |
|
| 363 | 3 | |
| 364 | 4 | final long startTime = System.currentTimeMillis(); |
| 365 | 1 | SvnConfigurationOptions.getTaskLogger().log("verifying implicit actions ..."); |
| 366 | 3 | |
| 367 | 1 | final HashSet implicitActions = new HashSet(); |
| 368 | |
|
| 369 | 3 | |
| 370 | 4 | final ArrayList files = new ArrayList(); |
| 371 | 1 | final Collection fileBuilders = fetchAllFileNames(files); |
| 372 | |
|
| 373 | |
|
| 374 | |
|
| 375 | 3 | |
| 376 | 1 | Collections.sort(files, new FilenameComparator()); |
| 377 | |
|
| 378 | 3444 | |
| 379 | 4589 | for (int i = 0; i < files.size(); i++) { |
| 380 | 4588 | final String parent = files.get(i).toString(); |
| 381 | 1147 | final FileBuilder parentBuilder = (FileBuilder) builder.getFileBuilders().get(parent); |
| 382 | |
|
| 383 | 17682 | |
| 384 | 5894 | for (int j = i + 1; j < files.size() && files.get(j).toString().indexOf(parent + "/") == 0; j++) { |
| 385 | 14241 | |
| 386 | 4747 | repositoryFileManager.addDirectory(parent); |
| 387 | 14241 | |
| 388 | 18988 | final String child = files.get(j).toString(); |
| 389 | 4747 | final FileBuilder childBuilder = (FileBuilder) builder.getFileBuilders().get(child); |
| 390 | 14241 | |
| 391 | 20041 | for (final Iterator iter = parentBuilder.getRevisions().iterator(); iter.hasNext();) { |
| 392 | 5098 | final RevisionData parentData = (RevisionData) iter.next(); |
| 393 | |
int parentRevision; |
| 394 | 15294 | try { |
| 395 | 5098 | parentRevision = Integer.parseInt(parentData.getRevisionNumber()); |
| 396 | 0 | } catch (final Exception e) { |
| 397 | 15294 | continue; |
| 398 | 5098 | } |
| 399 | |
|
| 400 | 15294 | |
| 401 | 5098 | if (parentData.isCreationOrRestore() || parentData.isDeletion()) { |
| 402 | |
int k; |
| 403 | |
|
| 404 | |
|
| 405 | 15282 | |
| 406 | 5094 | k = detectActionOnChildGivenActionOnParent(childBuilder, parentRevision); |
| 407 | |
|
| 408 | 15282 | |
| 409 | 5811 | if (k < childBuilder.getRevisions().size()) { |
| 410 | 239 | createImplicitAction(implicitActions, child, childBuilder, parentData, k); |
| 411 | |
} |
| 412 | 15294 | } |
| 413 | 5098 | } |
| 414 | |
} |
| 415 | |
} |
| 416 | |
|
| 417 | |
|
| 418 | |
|
| 419 | 3 | |
| 420 | 1 | cleanPotentialDuplicateImplicitActions(fileBuilders); |
| 421 | |
|
| 422 | |
|
| 423 | |
|
| 424 | |
|
| 425 | |
|
| 426 | |
|
| 427 | |
|
| 428 | |
|
| 429 | |
|
| 430 | |
|
| 431 | |
|
| 432 | 3 | |
| 433 | 4 | removePotentialInconsistencies(implicitActions, fileBuilders); |
| 434 | 4 | SvnConfigurationOptions.getTaskLogger().log("verifying implicit actions finished in " + (System.currentTimeMillis() - startTime) + " ms."); |
| 435 | 1 | } |
| 436 | |
|
| 437 | |
private void createImplicitAction(final HashSet implicitActions, final String child, final FileBuilder childBuilder, final RevisionData parentData, |
| 438 | |
final int k) { |
| 439 | 717 | |
| 440 | 956 | final RevisionData implicit = parentData.createCopy(); |
| 441 | 239 | implicitActions.add(implicit); |
| 442 | |
|
| 443 | 717 | |
| 444 | 956 | final List toMove = new ArrayList(); |
| 445 | 3515 | for (final Iterator it = childBuilder.getRevisions().subList(k, childBuilder.getRevisions().size()).iterator(); it.hasNext();) { |
| 446 | 1092 | final RevisionData revToMove = (RevisionData) it.next(); |
| 447 | |
|
| 448 | |
|
| 449 | 3276 | |
| 450 | 1092 | toMove.add(revToMove); |
| 451 | 3276 | |
| 452 | 1092 | } |
| 453 | |
|
| 454 | 717 | |
| 455 | 239 | childBuilder.getRevisions().removeAll(toMove); |
| 456 | |
|
| 457 | |
|
| 458 | 717 | |
| 459 | 239 | builder.buildFile(child, false, false, new HashMap(), new HashMap()); |
| 460 | |
|
| 461 | |
|
| 462 | |
|
| 463 | |
|
| 464 | 717 | |
| 465 | 239 | builder.buildRevision(implicit); |
| 466 | |
|
| 467 | |
|
| 468 | 717 | |
| 469 | 3515 | for (final Iterator it = toMove.iterator(); it.hasNext();) { |
| 470 | 1092 | builder.buildRevision((RevisionData) it.next()); |
| 471 | 717 | } |
| 472 | 239 | } |
| 473 | |
|
| 474 | |
private int detectActionOnChildGivenActionOnParent(final FileBuilder childBuilder, final int parentRevision) { |
| 475 | 83664 | int k; |
| 476 | 99813 | for (k = 0; k < childBuilder.getRevisions().size(); k++) { |
| 477 | 95900 | final RevisionData childData = (RevisionData) childBuilder.getRevisions().get(k); |
| 478 | 23975 | final int childRevision = Integer.parseInt(childData.getRevisionNumber()); |
| 479 | |
|
| 480 | |
|
| 481 | 71925 | |
| 482 | 26801 | if (parentRevision == childRevision) { |
| 483 | 3768 | k = childBuilder.getRevisions().size(); |
| 484 | 942 | break; |
| 485 | |
} |
| 486 | 69099 | |
| 487 | 23750 | if (parentRevision > childRevision) { |
| 488 | 239 | break; |
| 489 | |
} |
| 490 | 15282 | } |
| 491 | 5094 | return k; |
| 492 | |
} |
| 493 | |
|
| 494 | 3 | private void removePotentialInconsistencies(final HashSet implicitActions, final Collection fileBuilders) { |
| 495 | 3442 | for (final Iterator iter = fileBuilders.iterator(); iter.hasNext();) { |
| 496 | 1147 | final FileBuilder filebuilder = (FileBuilder) iter.next(); |
| 497 | |
|
| 498 | |
|
| 499 | 3441 | |
| 500 | 1969 | if (!repositoryFileManager.existsInWorkingCopy(filebuilder.getName())) { |
| 501 | 274 | builder.addToAttic(filebuilder.getName()); |
| 502 | |
} |
| 503 | |
|
| 504 | 3441 | |
| 505 | 1177 | if (!repositoryFileManager.existsInWorkingCopy(filebuilder.getName()) && !filebuilder.finalRevisionIsDead()) { |
| 506 | 106 | int earliestDelete = -1; |
| 507 | 128 | for (int i = 0; i < filebuilder.getRevisions().size(); i++) { |
| 508 | 32 | final RevisionData data = (RevisionData) filebuilder.getRevisions().get(i); |
| 509 | 96 | |
| 510 | 65 | if (data.isDeletion()) { |
| 511 | 11 | earliestDelete = i; |
| 512 | |
} |
| 513 | 96 | |
| 514 | 41 | if ((!data.isCreationOrRestore() && data.isChange()) || !implicitActions.contains(data)) { |
| 515 | 3 | break; |
| 516 | |
} |
| 517 | |
} |
| 518 | 30 | |
| 519 | 10 | if (earliestDelete > 0) { |
| 520 | 30 | |
| 521 | 40 | final List toRemove = new ArrayList(); |
| 522 | 46 | for (final Iterator it = filebuilder.getRevisions().subList(0, earliestDelete).iterator(); it.hasNext();) { |
| 523 | 12 | toRemove.add(it.next()); |
| 524 | 30 | } |
| 525 | 10 | filebuilder.getRevisions().removeAll(toRemove); |
| 526 | |
} |
| 527 | 3441 | } |
| 528 | 1150 | } |
| 529 | 1 | } |
| 530 | |
|
| 531 | 3 | private void cleanPotentialDuplicateImplicitActions(final Collection fileBuilders) { |
| 532 | 3442 | for (final Iterator iter = fileBuilders.iterator(); iter.hasNext();) { |
| 533 | 1147 | final FileBuilder filebuilder = (FileBuilder) iter.next(); |
| 534 | 3441 | |
| 535 | 4588 | boolean previousIsDelete = false; |
| 536 | 1147 | final List toRemove = new ArrayList(); |
| 537 | |
|
| 538 | |
|
| 539 | 3441 | |
| 540 | 18118 | for (final Iterator it = filebuilder.getRevisions().iterator(); it.hasNext();) { |
| 541 | 22628 | final Revisio |