Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 270:c6450b0b1fd5
Avoid IAE:nullid when looking into stale merge/state file
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 24 Aug 2011 04:10:17 +0200 | 
| parents | a6d19adc2636 | 
| children | 35125450c804 | 
| rev | line source | 
|---|---|
| 
10
 
382cfe9463db
Dirstate parsing. DataAccess refactored to allow reuse and control over constants
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
9 
diff
changeset
 | 
1 /* | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
2 * Copyright (c) 2010-2011 TMate Software Ltd | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
3 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
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: 
68 
diff
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: 
68 
diff
changeset
 | 
6 * the Free Software Foundation; version 2 of the License. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
7 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
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: 
68 
diff
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: 
68 
diff
changeset
 | 
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
11 * GNU General Public License for more details. | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
12 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
13 * For information on how to redistribute this software under | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
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: 
97 
diff
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: 
68 
diff
changeset
 | 
17 package org.tmatesoft.hg.repo; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
18 | 
| 
235
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
19 import static org.tmatesoft.hg.core.Nodeid.NULL; | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
20 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
21 import java.io.File; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
22 import java.io.IOException; | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
23 import java.io.StringReader; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
24 import java.lang.ref.SoftReference; | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
25 import java.util.ArrayList; | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
26 import java.util.Collections; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
27 import java.util.HashMap; | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
28 import java.util.List; | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
29 | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
30 import org.tmatesoft.hg.core.HgDataStreamException; | 
| 
235
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
31 import org.tmatesoft.hg.core.Nodeid; | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
32 import org.tmatesoft.hg.internal.ByteArrayChannel; | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
33 import org.tmatesoft.hg.internal.ConfigFile; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
34 import org.tmatesoft.hg.internal.DataAccessProvider; | 
| 
231
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
35 import org.tmatesoft.hg.internal.Experimental; | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
36 import org.tmatesoft.hg.internal.Filter; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
37 import org.tmatesoft.hg.internal.RequiresFile; | 
| 
77
 
c677e1593919
Moved RevlogStream implementation into .internal
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
38 import org.tmatesoft.hg.internal.RevlogStream; | 
| 
239
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
39 import org.tmatesoft.hg.internal.SubrepoManager; | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
40 import org.tmatesoft.hg.util.CancelledException; | 
| 
235
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
41 import org.tmatesoft.hg.util.Pair; | 
| 
133
 
4a948ec83980
core.Path to util.Path as it's not Hg repo dependant
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
115 
diff
changeset
 | 
42 import org.tmatesoft.hg.util.Path; | 
| 
64
 
19e9e220bf68
Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
55 
diff
changeset
 | 
43 import org.tmatesoft.hg.util.PathRewrite; | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
44 import org.tmatesoft.hg.util.ProgressSupport; | 
| 
64
 
19e9e220bf68
Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
55 
diff
changeset
 | 
45 | 
| 
1
 
a3576694a4d1
Repository detection from local/specified directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
0 
diff
changeset
 | 
46 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
47 | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
48 /** | 
| 
64
 
19e9e220bf68
Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
55 
diff
changeset
 | 
49 * Shall be as state-less as possible, all the caching happens outside the repo, in commands/walkers | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
50 * | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
51 * @author Artem Tikhomirov | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
52 * @author TMate Software Ltd. | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
53 */ | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
54 public final class HgRepository { | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
55 | 
| 
197
 
3a7696fb457c
Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
56 // if new constants added, consider fixing HgInternals#wrongLocalRevision | 
| 
 
3a7696fb457c
Investigate optimization options to allow fast processing of huge repositories. Fix defect in StatusCollector that lead to wrong result comparing first revision to empty repo (-1 to 0), due to same TIP constant value
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
148 
diff
changeset
 | 
57 public static final int TIP = -3; | 
| 
68
 
0e499fed9b3d
StatusCommand with tests. Extra constants to indicate common revision cases
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
64 
diff
changeset
 | 
58 public static final int BAD_REVISION = Integer.MIN_VALUE; | 
| 
 
0e499fed9b3d
StatusCommand with tests. Extra constants to indicate common revision cases
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
64 
diff
changeset
 | 
59 public static final int WORKING_COPY = -2; | 
| 
252
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
60 | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
61 public static final String DEFAULT_BRANCH_NAME = "default"; | 
| 
5
 
fc265ddeab26
File content and non-effective, although working, patch application
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
3 
diff
changeset
 | 
62 | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
63 // temp aux marker method | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
64 public static IllegalStateException notImplemented() { | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
65 return new IllegalStateException("Not implemented"); | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
66 } | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
145 
diff
changeset
 | 
67 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
68 private final File repoDir; // .hg folder | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
69 private final File workingDir; // .hg/../ | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
70 private final String repoLocation; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
71 private final DataAccessProvider dataAccess; | 
| 
142
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
72 private final PathRewrite normalizePath; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
73 private final PathRewrite dataPathHelper; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
74 private final PathRewrite repoPathHelper; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
75 | 
| 
97
 
ee2c750b036d
Changelog to HgChangelog
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
91 
diff
changeset
 | 
76 private HgChangelog changelog; | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
77 private HgManifest manifest; | 
| 
50
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
78 private HgTags tags; | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
79 private HgBranches branches; | 
| 
231
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
80 private HgMergeState mergeState; | 
| 
239
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
81 private SubrepoManager subRepos; | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
82 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
83 // XXX perhaps, shall enable caching explicitly | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
84 private final HashMap<Path, SoftReference<RevlogStream>> streamsCache = new HashMap<Path, SoftReference<RevlogStream>>(); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
85 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
86 private final org.tmatesoft.hg.internal.Internals impl = new org.tmatesoft.hg.internal.Internals(); | 
| 
91
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
87 private HgIgnore ignore; | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
88 private ConfigFile configFile; | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
89 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
90 HgRepository(String repositoryPath) { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
91 repoDir = null; | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
92 workingDir = null; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
93 repoLocation = repositoryPath; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
94 dataAccess = null; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
95 dataPathHelper = repoPathHelper = null; | 
| 
142
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
96 normalizePath = null; | 
| 
1
 
a3576694a4d1
Repository detection from local/specified directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
0 
diff
changeset
 | 
97 } | 
| 
 
a3576694a4d1
Repository detection from local/specified directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
0 
diff
changeset
 | 
98 | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
145 
diff
changeset
 | 
99 HgRepository(String repositoryPath, File repositoryRoot) { | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
100 assert ".hg".equals(repositoryRoot.getName()) && repositoryRoot.isDirectory(); | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
145 
diff
changeset
 | 
101 assert repositoryPath != null; | 
| 
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
145 
diff
changeset
 | 
102 assert repositoryRoot != null; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
103 repoDir = repositoryRoot; | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
104 workingDir = repoDir.getParentFile(); | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
105 if (workingDir == null) { | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
106 throw new IllegalArgumentException(repoDir.toString()); | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
107 } | 
| 
148
 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
145 
diff
changeset
 | 
108 repoLocation = repositoryPath; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
109 dataAccess = new DataAccessProvider(); | 
| 
142
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
110 final boolean runningOnWindows = System.getProperty("os.name").indexOf("Windows") != -1; | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
111 if (runningOnWindows) { | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
112 normalizePath = new PathRewrite() { | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
113 | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
114 public String rewrite(String path) { | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
115 // TODO handle . and .. (although unlikely to face them from GUI client) | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
116 path = path.replace('\\', '/').replace("//", "/"); | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
117 if (path.startsWith("/")) { | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
118 path = path.substring(1); | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
119 } | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
120 return path; | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
121 } | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
122 }; | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
123 } else { | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
124 normalizePath = new PathRewrite.Empty(); // or strip leading slash, perhaps? | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
125 } | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
126 parseRequires(); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
127 dataPathHelper = impl.buildDataFilesHelper(); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
128 repoPathHelper = impl.buildRepositoryFilesHelper(); | 
| 
1
 
a3576694a4d1
Repository detection from local/specified directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
0 
diff
changeset
 | 
129 } | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
130 | 
| 
145
 
acc6151b1b7a
toString for friendly debug
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
142 
diff
changeset
 | 
131 @Override | 
| 
 
acc6151b1b7a
toString for friendly debug
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
142 
diff
changeset
 | 
132 public String toString() { | 
| 
 
acc6151b1b7a
toString for friendly debug
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
142 
diff
changeset
 | 
133 return getClass().getSimpleName() + "[" + getLocation() + (isInvalid() ? "(BAD)" : "") + "]"; | 
| 
 
acc6151b1b7a
toString for friendly debug
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
142 
diff
changeset
 | 
134 } | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
135 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
136 public String getLocation() { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
137 return repoLocation; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
138 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
139 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
140 public boolean isInvalid() { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
141 return repoDir == null || !repoDir.exists() || !repoDir.isDirectory(); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
142 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
143 | 
| 
97
 
ee2c750b036d
Changelog to HgChangelog
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
91 
diff
changeset
 | 
144 public HgChangelog getChangelog() { | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
145 if (this.changelog == null) { | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
146 String storagePath = repoPathHelper.rewrite("00changelog.i"); | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
147 RevlogStream content = resolve(Path.create(storagePath), true); | 
| 
97
 
ee2c750b036d
Changelog to HgChangelog
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
91 
diff
changeset
 | 
148 this.changelog = new HgChangelog(this, content); | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
149 } | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
150 return this.changelog; | 
| 
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
151 } | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
152 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
153 public HgManifest getManifest() { | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
154 if (this.manifest == null) { | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
155 RevlogStream content = resolve(Path.create(repoPathHelper.rewrite("00manifest.i")), true); | 
| 
13
 
df8c67f3006a
Basic manifest parsing to analyze what's in there
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
10 
diff
changeset
 | 
156 this.manifest = new HgManifest(this, content); | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
157 } | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
158 return this.manifest; | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
159 } | 
| 
50
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
160 | 
| 
231
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
161 public HgTags getTags() { | 
| 
50
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
162 if (tags == null) { | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
163 tags = new HgTags(this); | 
| 
104
 
54562de502f7
Preliminary tags implementation
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
164 try { | 
| 
234
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
165 HgDataFile hgTags = getFileNode(".hgtags"); | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
166 if (hgTags.exists()) { | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
167 for (int i = 0; i <= hgTags.getLastRevision(); i++) { // FIXME in fact, would be handy to have walk(start,end) | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
168 // method for data files as well, though it looks odd. | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
169 try { | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
170 ByteArrayChannel sink = new ByteArrayChannel(); | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
171 hgTags.content(i, sink); | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
172 final String content = new String(sink.toArray(), "UTF8"); | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
173 tags.readGlobal(new StringReader(content)); | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
174 } catch (CancelledException ex) { | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
175 ex.printStackTrace(); // IGNORE, can't happen, we did not configure cancellation | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
176 } catch (HgDataStreamException ex) { | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
177 ex.printStackTrace(); // FIXME need to react | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
178 } catch (IOException ex) { | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
179 // UnsupportedEncodingException can't happen (UTF8) | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
180 // only from readGlobal. Need to reconsider exceptions thrown from there | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
181 ex.printStackTrace(); // XXX need to decide what to do this. failure to read single revision shall not break complete cycle | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
182 } | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
183 } | 
| 
 
b2cfbe46f9b6
HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
231 
diff
changeset
 | 
184 } | 
| 
252
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
185 tags.readGlobal(new File(getWorkingDir(), ".hgtags")); // XXX replace with HgDataFile.workingCopy | 
| 
104
 
54562de502f7
Preliminary tags implementation
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
186 tags.readLocal(new File(repoDir, "localtags")); | 
| 
 
54562de502f7
Preliminary tags implementation
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
187 } catch (IOException ex) { | 
| 
 
54562de502f7
Preliminary tags implementation
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
188 ex.printStackTrace(); // FIXME log or othewise report | 
| 
 
54562de502f7
Preliminary tags implementation
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
102 
diff
changeset
 | 
189 } | 
| 
50
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
190 } | 
| 
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
191 return tags; | 
| 
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
192 } | 
| 
 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
45 
diff
changeset
 | 
193 | 
| 
231
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
194 public HgBranches getBranches() { | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
195 if (branches == null) { | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
196 branches = new HgBranches(this); | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
197 branches.collect(ProgressSupport.Factory.get(null)); | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
198 } | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
199 return branches; | 
| 
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
200 } | 
| 
231
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
201 | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
202 @Experimental(reason="Perhaps, shall not cache instance, and provide loadMergeState as it may change often") | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
203 public HgMergeState getMergeState() { | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
204 if (mergeState == null) { | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
205 mergeState = new HgMergeState(this); | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
206 } | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
207 return mergeState; | 
| 
 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
229 
diff
changeset
 | 
208 } | 
| 
220
 
8de327242aa0
Basic information about branches
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
202 
diff
changeset
 | 
209 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
210 public HgDataFile getFileNode(String path) { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
211 String nPath = normalizePath.rewrite(path); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
212 String storagePath = dataPathHelper.rewrite(nPath); | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
213 RevlogStream content = resolve(Path.create(storagePath), false); | 
| 
115
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
214 Path p = Path.create(nPath); | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
215 if (content == null) { | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
216 return new HgDataFile(this, p); | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
217 } | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
218 return new HgDataFile(this, p, content); | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
219 } | 
| 
1
 
a3576694a4d1
Repository detection from local/specified directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
0 
diff
changeset
 | 
220 | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
221 public HgDataFile getFileNode(Path path) { | 
| 
77
 
c677e1593919
Moved RevlogStream implementation into .internal
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
74 
diff
changeset
 | 
222 String storagePath = dataPathHelper.rewrite(path.toString()); | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
223 RevlogStream content = resolve(Path.create(storagePath), false); | 
| 
115
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
224 // XXX no content when no file? or HgDataFile.exists() to detect that? | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
225 if (content == null) { | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
226 return new HgDataFile(this, path); | 
| 
 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
114 
diff
changeset
 | 
227 } | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
228 return new HgDataFile(this, path, content); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
229 } | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
230 | 
| 
142
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
231 /* clients need to rewrite path from their FS to a repository-friendly paths, and, perhaps, vice versa*/ | 
| 
 
37a34044e6bd
More reasonable use of path normalizer and path.source
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
141 
diff
changeset
 | 
232 public PathRewrite getToRepoPathHelper() { | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
233 return normalizePath; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
234 } | 
| 
235
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
235 | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
236 @Experimental(reason="return type and possible values (presently null, perhaps Nodeid.NULL) may get changed") | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
237 public Pair<Nodeid,Nodeid> getWorkingCopyParents() { | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
238 Nodeid[] p = loadDirstate().parents(); | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
239 return new Pair<Nodeid,Nodeid>(NULL == p[0] ? null : p[0], NULL == p[1] ? null : p[1]); | 
| 
 
fd845a53f53d
Experimental access to working dir parents
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
234 
diff
changeset
 | 
240 } | 
| 
252
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
241 | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
242 /** | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
243 * @return name of the branch associated with working directory, never <code>null</code>. | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
244 */ | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
245 public String getWorkingCopyBranchName() { | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
246 return loadDirstate().branch(); | 
| 
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
247 } | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
248 | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
249 /** | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
250 * @return location where user files (shall) reside | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
251 */ | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
252 public File getWorkingDir() { | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
253 return workingDir; | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
254 } | 
| 
239
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
255 | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
256 /** | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
257 * Provides access to sub-repositories defined in this repository. Enumerated sub-repositories are those directly | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
258 * known, not recursive collection of all nested sub-repositories. | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
259 * @return list of all known sub-repositories in this repository, or empty list if none found. | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
260 */ | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
261 public List<HgSubrepoLocation> getSubrepositories() { | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
262 if (subRepos == null) { | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
263 subRepos = new SubrepoManager(this); | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
264 } | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
265 return subRepos.all(); | 
| 
 
df9d2854d3d6
Initial access to subrepositories
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
237 
diff
changeset
 | 
266 } | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
267 | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
268 // shall be of use only for internal classes | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
269 /*package-local*/ File getRepositoryRoot() { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
270 return repoDir; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
271 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
272 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
273 // XXX package-local, unless there are cases when required from outside (guess, working dir/revision walkers may hide dirstate access and no public visibility needed) | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
274 /*package-local*/ final HgDirstate loadDirstate() { | 
| 
252
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
275 return new HgDirstate(this, new File(repoDir, "dirstate")); | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
276 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
277 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
278 // package-local, see comment for loadDirstate | 
| 
91
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
279 /*package-local*/ final HgIgnore getIgnore() { | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
280 // TODO read config for additional locations | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
281 if (ignore == null) { | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
282 ignore = new HgIgnore(); | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
283 try { | 
| 
252
 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
239 
diff
changeset
 | 
284 File ignoreFile = new File(getWorkingDir(), ".hgignore"); | 
| 
91
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
285 ignore.read(ignoreFile); | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
286 } catch (IOException ex) { | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
287 ex.printStackTrace(); // log warn | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
288 } | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
289 } | 
| 
 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
77 
diff
changeset
 | 
290 return ignore; | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
291 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
292 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
293 /*package-local*/ DataAccessProvider getDataAccess() { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
294 return dataAccess; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
295 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
296 | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
297 /** | 
| 
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
298 * Perhaps, should be separate interface, like ContentLookup | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
299 * path - repository storage path (i.e. one usually with .i or .d) | 
| 
2
 
08db726a0fb7
Shaping out low-level Hg structures
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
1 
diff
changeset
 | 
300 */ | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
301 /*package-local*/ RevlogStream resolve(Path path, boolean shallFakeNonExistent) { | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
302 final SoftReference<RevlogStream> ref = streamsCache.get(path); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
303 RevlogStream cached = ref == null ? null : ref.get(); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
304 if (cached != null) { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
305 return cached; | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
306 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
307 File f = new File(repoDir, path.toString()); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
308 if (f.exists()) { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
309 RevlogStream s = new RevlogStream(dataAccess, f); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
310 streamsCache.put(path, new SoftReference<RevlogStream>(s)); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
311 return s; | 
| 
202
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
312 } else { | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
313 if (shallFakeNonExistent) { | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
314 try { | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
315 File fake = File.createTempFile(f.getName(), null); | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
316 fake.deleteOnExit(); | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
317 return new RevlogStream(dataAccess, fake); | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
318 } catch (IOException ex) { | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
319 ex.printStackTrace(); // FIXME report in debug | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
320 } | 
| 
 
706bcc7cfee4
Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general.
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
197 
diff
changeset
 | 
321 } | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
322 } | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
323 return null; // XXX empty stream instead? | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
324 } | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
325 | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
326 // can't expose internal class, otherwise seems reasonable to have it in API | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
327 /*package-local*/ ConfigFile getConfigFile() { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
328 if (configFile == null) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
329 configFile = impl.newConfigFile(); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
330 configFile.addLocation(new File(System.getProperty("user.home"), ".hgrc")); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
331 // last one, overrides anything else | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
332 // <repo>/.hg/hgrc | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
333 configFile.addLocation(new File(getRepositoryRoot(), "hgrc")); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
334 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
335 return configFile; | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
336 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
337 | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
338 /*package-local*/ List<Filter> getFiltersFromRepoToWorkingDir(Path p) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
339 return instantiateFilters(p, new Filter.Options(Filter.Direction.FromRepo)); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
340 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
341 | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
342 /*package-local*/ List<Filter> getFiltersFromWorkingDirToRepo(Path p) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
343 return instantiateFilters(p, new Filter.Options(Filter.Direction.ToRepo)); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
344 } | 
| 
237
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
345 | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
346 /*package-local*/ File getFile(HgDataFile dataFile) { | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
347 return new File(getWorkingDir(), dataFile.getPath().toString()); | 
| 
 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
235 
diff
changeset
 | 
348 } | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
349 | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
350 private List<Filter> instantiateFilters(Path p, Filter.Options opts) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
351 List<Filter.Factory> factories = impl.getFilters(this, getConfigFile()); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
352 if (factories.isEmpty()) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
353 return Collections.emptyList(); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
354 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
355 ArrayList<Filter> rv = new ArrayList<Filter>(factories.size()); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
356 for (Filter.Factory ff : factories) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
357 Filter f = ff.create(p, opts); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
358 if (f != null) { | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
359 rv.add(f); | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
360 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
361 } | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
362 return rv; | 
| 
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
363 } | 
| 
74
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
364 | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
365 private void parseRequires() { | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
366 new RequiresFile().parse(impl, new File(repoDir, "requires")); | 
| 
 
6f1b88693d48
Complete refactoring to org.tmatesoft
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
68 
diff
changeset
 | 
367 } | 
| 
114
 
46291ec605a0
Filters to read and initialize according to configuration files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
104 
diff
changeset
 | 
368 | 
| 
0
 
dbd663faec1f
Basic changelog parsing
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
369 } | 
