Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgChangelog.java @ 511:122e0600799f
Respect multiple joins/forks in a history of a single file
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 14 Dec 2012 15:39:49 +0100 | 
| parents | 31a89587eb04 | 
| children | 1ee452f31187 | 
| rev | line source | 
|---|---|
| 21 
e929cecae4e1
Refactor to move revlog content to base class
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
3diff
changeset | 1 /* | 
| 418 
528b6780a8bd
A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
386diff
changeset | 2 * Copyright (c) 2010-2012 TMate Software Ltd | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 3 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 4 * This program is free software; you can redistribute it and/or modify | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 5 * it under the terms of the GNU General Public License as published by | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 7 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 8 * This program is distributed in the hope that it will be useful, | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 11 * GNU General Public License for more details. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 12 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 13 * For information on how to redistribute this software under | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 14 * the terms of a license other than GNU General Public License | 
| 102 
a3a2e5deb320
Updated contact address to support@hg4j.com
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
97diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 17 package org.tmatesoft.hg.repo; | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 157 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 19 import java.io.IOException; | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 20 import java.io.UnsupportedEncodingException; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 21 import java.util.ArrayList; | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 22 import java.util.Arrays; | 
| 146 
8c9f729f4dfa
Timezone finally in use
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
137diff
changeset | 23 import java.util.Calendar; | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 24 import java.util.Collections; | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 25 import java.util.Date; | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 26 import java.util.Formatter; | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 27 import java.util.HashMap; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 28 import java.util.List; | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 29 import java.util.Locale; | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 30 import java.util.Map; | 
| 146 
8c9f729f4dfa
Timezone finally in use
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
137diff
changeset | 31 import java.util.TimeZone; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 32 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 33 import org.tmatesoft.hg.core.Nodeid; | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 34 import org.tmatesoft.hg.internal.Callback; | 
| 157 
d5268ca7715b
Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com>diff
changeset | 35 import org.tmatesoft.hg.internal.DataAccess; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 36 import org.tmatesoft.hg.internal.IterateControlMediator; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 37 import org.tmatesoft.hg.internal.Lifecycle; | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 38 import org.tmatesoft.hg.internal.Pool; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 39 import org.tmatesoft.hg.internal.RevlogStream; | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 40 import org.tmatesoft.hg.util.CancelSupport; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 41 import org.tmatesoft.hg.util.ProgressSupport; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 42 | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 /** | 
| 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 44 * Representation of the Mercurial changelog file (list of ChangeSets) | 
| 153 | 45 * | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 46 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
48diff
changeset | 47 * @author TMate Software Ltd. | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 */ | 
| 426 
063b0663495a
HgManifest#getFileRevisions refactored into #walkFileRevisions to match pattern throught rest of the library
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
424diff
changeset | 49 public final class HgChangelog extends Revlog { | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 50 | 
| 153 | 51 /* package-local */HgChangelog(HgRepository hgRepo, RevlogStream content) { | 
| 21 
e929cecae4e1
Refactor to move revlog content to base class
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
3diff
changeset | 52 super(hgRepo, content); | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 53 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 54 | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 55 public void all(final HgChangelog.Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 137 
144d771ee73c
explicit op name instead math op to get last rev number
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
135diff
changeset | 56 range(0, getLastRevision(), inspector); | 
| 48 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
47diff
changeset | 57 } | 
| 
e34f90b9ded1
Limit option for history/log
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
47diff
changeset | 58 | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 59 public void range(int start, int end, final HgChangelog.Inspector inspector) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 60 if (inspector == null) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 61 throw new IllegalArgumentException(); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 62 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 63 content.iterate(start, end, true, new RawCsetParser(inspector)); | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 64 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 65 | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 66 public List<RawChangeset> range(int start, int end) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 67 final RawCsetCollector c = new RawCsetCollector(end - start + 1); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 68 range(start, end, c); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 69 return c.result; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 70 } | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 71 | 
| 242 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 72 /** | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 73 * Access individual revisions. Note, regardless of supplied revision order, inspector gets | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 74 * changesets strictly in the order they are in the changelog. | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 75 * @param inspector callback to get changesets | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 76 * @param revisions revisions to read, unrestricted ordering. | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 77 */ | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 78 public void range(final HgChangelog.Inspector inspector, final int... revisions) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 242 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 79 Arrays.sort(revisions); | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 80 rangeInternal(inspector, revisions); | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 81 } | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 82 | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 83 /** | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 84 * Friends-only version of {@link #range(Inspector, int...)}, when callers know array is sorted | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 85 */ | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 86 /*package-local*/ void rangeInternal(HgChangelog.Inspector inspector, int[] sortedRevisions) throws HgInvalidRevisionException, HgInvalidControlFileException { | 
| 242 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 87 if (sortedRevisions == null || sortedRevisions.length == 0) { | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 88 return; | 
| 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 89 } | 
| 242 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 90 if (inspector == null) { | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 91 throw new IllegalArgumentException(); | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 92 } | 
| 
ad6a046943be
Improved reading of sparse revisions from a revlog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
236diff
changeset | 93 content.iterate(sortedRevisions, true, new RawCsetParser(inspector)); | 
| 3 
24bb4f365164
Rudimentary log functionality with basic infrastructure is in place
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 94 } | 
| 354 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 95 | 
| 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 96 /** | 
| 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 97 * @throws HgInvalidRevisionException if supplied nodeid doesn't identify any revision from this revlog | 
| 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 98 * @throws HgInvalidControlFileException if access to revlog index/data entry failed | 
| 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 99 */ | 
| 
5f9073eabf06
Propagate errors with exceptions up to a end client
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
329diff
changeset | 100 public RawChangeset changeset(Nodeid nid) throws HgInvalidControlFileException, HgInvalidRevisionException { | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
366diff
changeset | 101 int x = getRevisionIndex(nid); | 
| 236 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
211diff
changeset | 102 return range(x, x).get(0); | 
| 
883300108179
Speed up branches calculation when cached branch information is available
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
211diff
changeset | 103 } | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 104 | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 105 @Callback | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 106 public interface Inspector { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 107 /** | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 108 * Access next changeset | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 109 * TODO describe what revisionNumber is when Inspector is used with HgBundle (BAD_REVISION or bundle's local order?) | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 110 * | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 111 * @param revisionIndex index of revision being inspected, local to the inspected object | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 112 * @param nodeid revision being inspected | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 113 * @param cset changeset raw data | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 114 */ | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 115 void next(int revisionIndex, Nodeid nodeid, RawChangeset cset); | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 116 } | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 117 | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 118 /** | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 119 * Entry in the Changelog | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 120 */ | 
| 154 
ba2bf656f00f
Changeset => RawChangeset
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
153diff
changeset | 121 public static class RawChangeset implements Cloneable /* for those that would like to keep a copy */{ | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 122 // TODO immutable | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 123 private/* final */Nodeid manifest; | 
| 153 | 124 private String user; | 
| 125 private String comment; | |
| 126 private List<String> files; // unmodifiable collection (otherwise #files() and implicit #clone() shall be revised) | |
| 127 private Date time; | |
| 128 private int timezone; | |
| 161 
9423235ca77b
Record possible value (and knowledge source) for extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
157diff
changeset | 129 // http://mercurial.selenic.com/wiki/PruningDeadBranches - Closing changesets can be identified by close=1 in the changeset's extra field. | 
| 153 | 130 private Map<String, String> extras; | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 131 | 
| 153 | 132 /** | 
| 133 * @see mercurial/changelog.py:read() | |
| 134 * | |
| 135 * <pre> | |
| 136 * format used: | |
| 137 * nodeid\n : manifest node in ascii | |
| 138 * user\n : user, no \n or \r allowed | |
| 139 * time tz extra\n : date (time is int or float, timezone is int) | |
| 140 * : extra is metadatas, encoded and separated by '\0' | |
| 141 * : older versions ignore it | |
| 142 * files\n\n : files modified by the cset, no \n or \r allowed | |
| 143 * (.*) : comment (free text, ideally utf-8) | |
| 144 * | |
| 145 * changelog v0 doesn't use extra | |
| 146 * </pre> | |
| 147 */ | |
| 154 
ba2bf656f00f
Changeset => RawChangeset
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
153diff
changeset | 148 private RawChangeset() { | 
| 153 | 149 } | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 150 | 
| 153 | 151 public Nodeid manifest() { | 
| 152 return manifest; | |
| 153 } | |
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 154 | 
| 153 | 155 public String user() { | 
| 156 return user; | |
| 157 } | |
| 158 | |
| 159 public String comment() { | |
| 160 return comment; | |
| 161 } | |
| 162 | |
| 163 public List<String> files() { | |
| 164 return files; | |
| 165 } | |
| 166 | |
| 167 public Date date() { | |
| 168 return time; | |
| 169 } | |
| 211 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 170 | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 171 /** | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 172 * @return time zone value, as is, positive for Western Hemisphere. | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 173 */ | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 174 public int timezone() { | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 175 return timezone; | 
| 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 176 } | 
| 153 | 177 | 
| 178 public String dateString() { | |
| 179 // XXX keep once formatted? Perhaps, there's faster way to set up calendar/time zone? | |
| 180 StringBuilder sb = new StringBuilder(30); | |
| 181 Formatter f = new Formatter(sb, Locale.US); | |
| 211 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 182 TimeZone tz = TimeZone.getTimeZone(TimeZone.getAvailableIDs(timezone * 1000)[0]); | 
| 153 | 183 // apparently timezone field records number of seconds time differs from UTC, | 
| 184 // i.e. value to substract from time to get UTC time. Calendar seems to add | |
| 185 // timezone offset to UTC, instead, hence sign change. | |
| 211 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
196diff
changeset | 186 // tz.setRawOffset(timezone * -1000); | 
| 153 | 187 Calendar c = Calendar.getInstance(tz, Locale.US); | 
| 188 c.setTime(time); | |
| 189 f.format("%ta %<tb %<td %<tH:%<tM:%<tS %<tY %<tz", c); | |
| 190 return sb.toString(); | |
| 191 } | |
| 192 | |
| 193 public Map<String, String> extras() { | |
| 194 return extras; | |
| 195 } | |
| 196 | |
| 197 public String branch() { | |
| 198 return extras.get("branch"); | |
| 199 } | |
| 200 | |
| 201 @Override | |
| 202 public String toString() { | |
| 203 StringBuilder sb = new StringBuilder(); | |
| 204 sb.append("Changeset {"); | |
| 205 sb.append("User: ").append(user).append(", "); | |
| 206 sb.append("Comment: ").append(comment).append(", "); | |
| 207 sb.append("Manifest: ").append(manifest).append(", "); | |
| 208 sb.append("Date: ").append(time).append(", "); | |
| 209 sb.append("Files: ").append(files.size()); | |
| 210 for (String s : files) { | |
| 211 sb.append(", ").append(s); | |
| 212 } | |
| 213 if (extras != null) { | |
| 214 sb.append(", Extra: ").append(extras); | |
| 215 } | |
| 216 sb.append("}"); | |
| 217 return sb.toString(); | |
| 218 } | |
| 219 | |
| 220 @Override | |
| 154 
ba2bf656f00f
Changeset => RawChangeset
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
153diff
changeset | 221 public RawChangeset clone() { | 
| 153 | 222 try { | 
| 154 
ba2bf656f00f
Changeset => RawChangeset
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
153diff
changeset | 223 return (RawChangeset) super.clone(); | 
| 153 | 224 } catch (CloneNotSupportedException ex) { | 
| 225 throw new InternalError(ex.toString()); | |
| 226 } | |
| 227 } | |
| 228 | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 229 /*package*/ static RawChangeset parse(DataAccess da) throws IOException, HgInvalidDataFormatException { | 
| 365 
3572fcb06473
Don't expose methods with DataAccess in public API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
363diff
changeset | 230 byte[] data = da.byteArray(); | 
| 
3572fcb06473
Don't expose methods with DataAccess in public API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
363diff
changeset | 231 RawChangeset rv = new RawChangeset(); | 
| 
3572fcb06473
Don't expose methods with DataAccess in public API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
363diff
changeset | 232 rv.init(data, 0, data.length, null); | 
| 
3572fcb06473
Don't expose methods with DataAccess in public API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
363diff
changeset | 233 return rv; | 
| 153 | 234 } | 
| 235 | |
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 236 // @param usersPool - it's likely user names get repeated again and again throughout repository. can be null | 
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 237 /* package-local */void init(byte[] data, int offset, int length, Pool<String> usersPool) throws HgInvalidDataFormatException { | 
| 153 | 238 final int bufferEndIndex = offset + length; | 
| 239 final byte lineBreak = (byte) '\n'; | |
| 240 int breakIndex1 = indexOf(data, lineBreak, offset, bufferEndIndex); | |
| 241 if (breakIndex1 == -1) { | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 242 throw new HgInvalidDataFormatException("Bad Changeset data"); | 
| 153 | 243 } | 
| 244 Nodeid _nodeid = Nodeid.fromAscii(data, 0, breakIndex1); | |
| 245 int breakIndex2 = indexOf(data, lineBreak, breakIndex1 + 1, bufferEndIndex); | |
| 246 if (breakIndex2 == -1) { | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 247 throw new HgInvalidDataFormatException("Bad Changeset data"); | 
| 153 | 248 } | 
| 249 String _user = new String(data, breakIndex1 + 1, breakIndex2 - breakIndex1 - 1); | |
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 250 if (usersPool != null) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 251 _user = usersPool.unify(_user); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 252 } | 
| 153 | 253 int breakIndex3 = indexOf(data, lineBreak, breakIndex2 + 1, bufferEndIndex); | 
| 254 if (breakIndex3 == -1) { | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 255 throw new HgInvalidDataFormatException("Bad Changeset data"); | 
| 153 | 256 } | 
| 257 String _timeString = new String(data, breakIndex2 + 1, breakIndex3 - breakIndex2 - 1); | |
| 258 int space1 = _timeString.indexOf(' '); | |
| 259 if (space1 == -1) { | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 260 throw new HgInvalidDataFormatException(String.format("Bad Changeset data: %s in [%d..%d]", "time string", breakIndex2+1, breakIndex3)); | 
| 153 | 261 } | 
| 262 int space2 = _timeString.indexOf(' ', space1 + 1); | |
| 263 if (space2 == -1) { | |
| 264 space2 = _timeString.length(); | |
| 265 } | |
| 363 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 266 long unixTime = Long.parseLong(_timeString.substring(0, space1)); | 
| 153 | 267 int _timezone = Integer.parseInt(_timeString.substring(space1 + 1, space2)); | 
| 363 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 268 // unixTime is local time, and timezone records difference of the local time to UTC. | 
| 153 | 269 Date _time = new Date(unixTime * 1000); | 
| 270 String _extras = space2 < _timeString.length() ? _timeString.substring(space2 + 1) : null; | |
| 271 Map<String, String> _extrasMap; | |
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
242diff
changeset | 272 final String extras_branch_key = "branch"; | 
| 386 
73e875154afb
Do not fail with empty extras string in changeset
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 273 if (_extras == null || _extras.trim().length() == 0) { | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
242diff
changeset | 274 _extrasMap = Collections.singletonMap(extras_branch_key, HgRepository.DEFAULT_BRANCH_NAME); | 
| 153 | 275 } else { | 
| 276 _extrasMap = new HashMap<String, String>(); | |
| 277 for (String pair : _extras.split("\00")) { | |
| 363 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 278 pair = decode(pair); | 
| 153 | 279 int eq = pair.indexOf(':'); | 
| 280 _extrasMap.put(pair.substring(0, eq), pair.substring(eq + 1)); | |
| 281 } | |
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
242diff
changeset | 282 if (!_extrasMap.containsKey(extras_branch_key)) { | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
242diff
changeset | 283 _extrasMap.put(extras_branch_key, HgRepository.DEFAULT_BRANCH_NAME); | 
| 153 | 284 } | 
| 285 _extrasMap = Collections.unmodifiableMap(_extrasMap); | |
| 286 } | |
| 287 | |
| 288 // | |
| 289 int lastStart = breakIndex3 + 1; | |
| 290 int breakIndex4 = indexOf(data, lineBreak, lastStart, bufferEndIndex); | |
| 291 ArrayList<String> _files = null; | |
| 292 if (breakIndex4 > lastStart) { | |
| 293 // if breakIndex4 == lastStart, we already found \n\n and hence there are no files (e.g. merge revision) | |
| 294 _files = new ArrayList<String>(5); | |
| 295 while (breakIndex4 != -1 && breakIndex4 + 1 < bufferEndIndex) { | |
| 296 _files.add(new String(data, lastStart, breakIndex4 - lastStart)); | |
| 297 lastStart = breakIndex4 + 1; | |
| 298 if (data[breakIndex4 + 1] == lineBreak) { | |
| 299 // found \n\n | |
| 300 break; | |
| 301 } else { | |
| 302 breakIndex4 = indexOf(data, lineBreak, lastStart, bufferEndIndex); | |
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 303 } | 
| 153 | 304 } | 
| 305 if (breakIndex4 == -1 || breakIndex4 >= bufferEndIndex) { | |
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 306 throw new HgInvalidDataFormatException("Bad Changeset data"); | 
| 153 | 307 } | 
| 308 } else { | |
| 309 breakIndex4--; | |
| 310 } | |
| 311 String _comment; | |
| 312 try { | |
| 313 _comment = new String(data, breakIndex4 + 2, bufferEndIndex - breakIndex4 - 2, "UTF-8"); | |
| 418 
528b6780a8bd
A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
386diff
changeset | 314 // TODO post-1.0 respect ui.fallbackencoding and try to decode if set; use EncodingHelper | 
| 153 | 315 } catch (UnsupportedEncodingException ex) { | 
| 316 _comment = ""; | |
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 317 // Could hardly happen | 
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 318 throw new HgInvalidDataFormatException("Bad Changeset data", ex); | 
| 153 | 319 } | 
| 320 // change this instance at once, don't leave it partially changes in case of error | |
| 321 this.manifest = _nodeid; | |
| 322 this.user = _user; | |
| 323 this.time = _time; | |
| 324 this.timezone = _timezone; | |
| 325 this.files = _files == null ? Collections.<String> emptyList() : Collections.unmodifiableList(_files); | |
| 326 this.comment = _comment; | |
| 327 this.extras = _extrasMap; | |
| 328 } | |
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 329 | 
| 153 | 330 private static int indexOf(byte[] src, byte what, int startOffset, int endIndex) { | 
| 331 for (int i = startOffset; i < endIndex; i++) { | |
| 332 if (src[i] == what) { | |
| 333 return i; | |
| 334 } | |
| 335 } | |
| 336 return -1; | |
| 337 } | |
| 363 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 338 | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 339 private static String decode(String s) { | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 340 if (s != null && s.indexOf('\\') != -1) { | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 341 // TestAuxUtilities#testChangelogExtrasDecode | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 342 return s.replace("\\\\", "\\").replace("\\n", "\n").replace("\\r", "\r").replace("\\0", "\00"); | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 343 } | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 344 return s; | 
| 
d9dfa9fe9cec
Decode escape sequences in changeset extras field
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
360diff
changeset | 345 } | 
| 129 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 346 } | 
| 
645829962785
core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 347 | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 348 private static class RawCsetCollector implements Inspector { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 349 final ArrayList<RawChangeset> result; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 350 | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 351 public RawCsetCollector(int count) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 352 result = new ArrayList<RawChangeset>(count > 0 ? count : 5); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 353 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 354 | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 355 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 356 result.add(cset.clone()); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 357 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 358 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 359 | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 360 private static class RawCsetParser implements RevlogStream.Inspector, Lifecycle { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 361 | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 362 private final Inspector inspector; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 363 private final Pool<String> usersPool; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 364 private final RawChangeset cset = new RawChangeset(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 365 private final ProgressSupport progressHelper; | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 366 private IterateControlMediator iterateControl; | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 367 | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 368 public RawCsetParser(HgChangelog.Inspector delegate) { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 369 assert delegate != null; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 370 inspector = delegate; | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 371 usersPool = new Pool<String>(); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 372 progressHelper = ProgressSupport.Factory.get(delegate); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 373 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 374 | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 375 public void next(int revisionNumber, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess da) { | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 376 try { | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 377 byte[] data = da.byteArray(); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 378 cset.init(data, 0, data.length, usersPool); | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 379 // XXX there's no guarantee for Changeset.Callback that distinct instance comes each time, consider instance reuse | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 380 inspector.next(revisionNumber, Nodeid.fromBinary(nodeid, 0), cset); | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 381 progressHelper.worked(1); | 
| 427 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 382 } catch (HgInvalidDataFormatException ex) { | 
| 
31a89587eb04
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
426diff
changeset | 383 throw ex.setRevisionIndex(revisionNumber); | 
| 366 
189dc6dc1c3e
Use exceptions to expose errors reading mercurial data
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
365diff
changeset | 384 } catch (IOException ex) { | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 385 // XXX need better exception, perhaps smth like HgChangelogException (extends HgInvalidControlFileException) | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
419diff
changeset | 386 throw new HgInvalidControlFileException("Failed reading changelog", ex, null).setRevisionIndex(revisionNumber); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 387 } | 
| 312 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 388 if (iterateControl != null) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 389 iterateControl.checkCancelled(); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 390 } | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 391 } | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 392 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 393 public void start(int count, Callback callback, Object token) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 394 CancelSupport cs = CancelSupport.Factory.get(inspector, null); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 395 iterateControl = cs == null ? null : new IterateControlMediator(cs, callback); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 396 progressHelper.start(count); | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 397 } | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 398 | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 399 public void finish(Object token) { | 
| 
f9f3e9b67ccc
Facilitate cancellation and progress reporting in changelog and manifest iterations
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 400 progressHelper.done(); | 
| 196 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 401 } | 
| 
e2115da4cf6a
Pool objects to avoid memory polution with duplicates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
182diff
changeset | 402 } | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 403 } | 
