Mercurial > hg4j
comparison src/org/tmatesoft/hg/core/HgAnnotateCommand.java @ 584:ed243b668502
Conditionally enable effective patch merge alternative for revlog reading
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 25 Apr 2013 16:08:17 +0200 |
| parents | 90df078d6418 |
| children | 73c20c648c1f |
comparison
equal
deleted
inserted
replaced
| 583:47dfa0ec7e35 | 584:ed243b668502 |
|---|---|
| 114 af.annotate(changesetStart, annotateRevision.get(), fa, HgIterateDirection.NewToOld); | 114 af.annotate(changesetStart, annotateRevision.get(), fa, HgIterateDirection.NewToOld); |
| 115 progress.worked(1); | 115 progress.worked(1); |
| 116 c.throwIfCancelled(); | 116 c.throwIfCancelled(); |
| 117 cancellation.checkCancelled(); | 117 cancellation.checkCancelled(); |
| 118 ProgressSupport.Sub subProgress = new ProgressSupport.Sub(progress, 1); | 118 ProgressSupport.Sub subProgress = new ProgressSupport.Sub(progress, 1); |
| 119 subProgress.start(c.lineRevisions.length); | |
| 119 LineImpl li = new LineImpl(); | 120 LineImpl li = new LineImpl(); |
| 120 for (int i = 0; i < c.lineRevisions.length; i++) { | 121 for (int i = 0; i < c.lineRevisions.length; i++) { |
| 121 li.init(i+1, c.lineRevisions[i], c.line(i)); | 122 li.init(i+1, c.lineRevisions[i], c.line(i)); |
| 122 inspector.next(li); | 123 inspector.next(li); |
| 123 subProgress.worked(1); | 124 subProgress.worked(1); |
