Mercurial > hg4j
annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 325:f05c8b1f08c4
Explicit dependency for cmdline build
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Mon, 03 Oct 2011 06:54:43 +0200 | 
| parents | c3d2233ba842 | 
| children | a37ce7145c3f | 
| rev | line source | 
|---|---|
| 10 
382cfe9463db
Dirstate parsing. DataAccess refactored to allow reuse and control over constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
9diff
changeset | 1 /* | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 2 * Copyright (c) 2010-2011 TMate Software Ltd | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 3 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
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: 
68diff
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: 
68diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 7 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
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: 
68diff
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: 
68diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 11 * GNU General Public License for more details. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 12 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 13 * For information on how to redistribute this software under | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
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: 
68diff
changeset | 17 package org.tmatesoft.hg.repo; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 18 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 19 import java.io.File; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 20 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: 
231diff
changeset | 21 import java.io.StringReader; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 22 import java.lang.ref.SoftReference; | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 23 import java.util.ArrayList; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 24 import java.util.Collections; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 25 import java.util.HashMap; | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 26 import java.util.List; | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 27 | 
| 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: 
231diff
changeset | 28 import org.tmatesoft.hg.core.HgDataStreamException; | 
| 318 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 29 import org.tmatesoft.hg.core.HgInvalidControlFileException; | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 30 import org.tmatesoft.hg.core.Nodeid; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 31 import org.tmatesoft.hg.core.SessionContext; | 
| 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: 
231diff
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: 
104diff
changeset | 33 import org.tmatesoft.hg.internal.ConfigFile; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
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: 
229diff
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: 
104diff
changeset | 36 import org.tmatesoft.hg.internal.Filter; | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 37 import org.tmatesoft.hg.internal.Internals; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 38 import org.tmatesoft.hg.internal.RevlogStream; | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
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: 
231diff
changeset | 40 import org.tmatesoft.hg.util.CancelledException; | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
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: 
115diff
changeset | 42 import org.tmatesoft.hg.util.Path; | 
| 284 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 43 import org.tmatesoft.hg.util.PathPool; | 
| 64 
19e9e220bf68
Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
55diff
changeset | 44 import org.tmatesoft.hg.util.PathRewrite; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 45 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: 
55diff
changeset | 46 | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 47 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 48 | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 49 /** | 
| 64 
19e9e220bf68
Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
55diff
changeset | 50 * 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: 
68diff
changeset | 51 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 52 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 53 * @author TMate Software Ltd. | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 54 */ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 55 public final class HgRepository { | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 | 
| 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: 
148diff
changeset | 57 // 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: 
148diff
changeset | 58 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: 
64diff
changeset | 59 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: 
64diff
changeset | 60 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: 
239diff
changeset | 61 | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 62 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: 
3diff
changeset | 63 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 64 // temp aux marker method | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 65 public static IllegalStateException notImplemented() { | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 66 return new IllegalStateException("Not implemented"); | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 67 } | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 68 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 69 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: 
235diff
changeset | 70 private final File workingDir; // .hg/../ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 71 private final String repoLocation; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 72 private final DataAccessProvider dataAccess; | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 73 private final PathRewrite normalizePath; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 74 private final PathRewrite dataPathHelper; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 75 private final PathRewrite repoPathHelper; | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 76 private final boolean isCaseSensitiveFileSystem; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 77 private final SessionContext sessionContext; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 78 | 
| 97 
ee2c750b036d
Changelog to HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
91diff
changeset | 79 private HgChangelog changelog; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 80 private HgManifest manifest; | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 81 private HgTags tags; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 82 private HgBranches branches; | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 83 private HgMergeState mergeState; | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 84 private SubrepoManager subRepos; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 85 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 86 // XXX perhaps, shall enable caching explicitly | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 87 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: 
68diff
changeset | 88 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 89 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: 
77diff
changeset | 90 private HgIgnore ignore; | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 91 private ConfigFile configFile; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 92 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 93 HgRepository(String repositoryPath) { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 94 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: 
235diff
changeset | 95 workingDir = null; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 96 repoLocation = repositoryPath; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 97 dataAccess = null; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 98 dataPathHelper = repoPathHelper = null; | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 99 normalizePath = null; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 100 sessionContext = null; | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 101 isCaseSensitiveFileSystem = !Internals.runningOnWindows(); | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 102 } | 
| 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 103 | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 104 HgRepository(SessionContext ctx, String repositoryPath, File repositoryRoot) { | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 105 assert ".hg".equals(repositoryRoot.getName()) && repositoryRoot.isDirectory(); | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 106 assert repositoryPath != null; | 
| 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 107 assert repositoryRoot != null; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 108 assert ctx != null; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 109 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: 
235diff
changeset | 110 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: 
235diff
changeset | 111 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: 
235diff
changeset | 112 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: 
235diff
changeset | 113 } | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 114 repoLocation = repositoryPath; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 115 sessionContext = ctx; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 116 dataAccess = new DataAccessProvider(ctx); | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 117 final boolean runningOnWindows = Internals.runningOnWindows(); | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 118 isCaseSensitiveFileSystem = !runningOnWindows; | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 119 if (runningOnWindows) { | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 120 normalizePath = new PathRewrite() { | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 121 | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 122 public CharSequence rewrite(CharSequence p) { | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 123 // TODO handle . and .. (although unlikely to face them from GUI client) | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 124 String path = p.toString(); | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 125 path = path.replace('\\', '/').replace("//", "/"); | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 126 if (path.startsWith("/")) { | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 127 path = path.substring(1); | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 128 } | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 129 return path; | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 130 } | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 131 }; | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 132 } else { | 
| 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 133 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: 
141diff
changeset | 134 } | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 135 impl.parseRequires(this, new File(repoDir, "requires")); | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 136 dataPathHelper = impl.buildDataFilesHelper(); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 137 repoPathHelper = impl.buildRepositoryFilesHelper(); | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 138 } | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 139 | 
| 145 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 140 @Override | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 141 public String toString() { | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 142 return getClass().getSimpleName() + "[" + getLocation() + (isInvalid() ? "(BAD)" : "") + "]"; | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 143 } | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 144 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 145 public String getLocation() { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 146 return repoLocation; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 147 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 148 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 149 public boolean isInvalid() { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 150 return repoDir == null || !repoDir.exists() || !repoDir.isDirectory(); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 151 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 152 | 
| 97 
ee2c750b036d
Changelog to HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
91diff
changeset | 153 public HgChangelog getChangelog() { | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 154 if (this.changelog == null) { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 155 CharSequence 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: 
197diff
changeset | 156 RevlogStream content = resolve(Path.create(storagePath), true); | 
| 97 
ee2c750b036d
Changelog to HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
91diff
changeset | 157 this.changelog = new HgChangelog(this, content); | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 158 } | 
| 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 159 return this.changelog; | 
| 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 160 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 161 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 162 public HgManifest getManifest() { | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 163 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: 
197diff
changeset | 164 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: 
10diff
changeset | 165 this.manifest = new HgManifest(this, content); | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 166 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 167 return this.manifest; | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 168 } | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 169 | 
| 318 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 170 public HgTags getTags() throws HgInvalidControlFileException { | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 171 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: 
231diff
changeset | 172 tags = new HgTags(this); | 
| 318 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 173 HgDataFile hgTags = getFileNode(".hgtags"); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 174 if (hgTags.exists()) { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 175 for (int i = 0; i <= hgTags.getLastRevision(); i++) { // FIXME in fact, would be handy to have walk(start,end) | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 176 // method for data files as well, though it looks odd. | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 177 try { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 178 ByteArrayChannel sink = new ByteArrayChannel(); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 179 hgTags.content(i, sink); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 180 final String content = new String(sink.toArray(), "UTF8"); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 181 tags.readGlobal(new StringReader(content)); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 182 } catch (CancelledException ex) { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 183 // IGNORE, can't happen, we did not configure cancellation | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 184 getContext().getLog().debug(getClass(), ex, null); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 185 } catch (HgDataStreamException ex) { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 186 getContext().getLog().error(getClass(), ex, null); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 187 // FIXME need to react | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 188 } catch (IOException ex) { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 189 // UnsupportedEncodingException can't happen (UTF8) | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 190 // only from readGlobal. Need to reconsider exceptions thrown from there: | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 191 // BufferedReader wraps String and unlikely to throw IOException, perhaps, log is enough? | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 192 getContext().getLog().error(getClass(), ex, null); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 193 // XXX need to decide what to do this. failure to read single revision shall not break complete cycle | 
| 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: 
231diff
changeset | 194 } | 
| 
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: 
231diff
changeset | 195 } | 
| 318 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 196 } | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 197 File file2read = null; | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 198 try { | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 199 file2read = new File(getWorkingDir(), ".hgtags"); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 200 tags.readGlobal(file2read); // XXX replace with HgDataFile.workingCopy | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 201 file2read = new File(repoDir, "localtags"); | 
| 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 202 tags.readLocal(file2read); | 
| 104 
54562de502f7
Preliminary tags implementation
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 203 } catch (IOException ex) { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 204 getContext().getLog().error(getClass(), ex, null); | 
| 318 
c3d2233ba842
Shall propagate errors to clients, not work around them silently
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
295diff
changeset | 205 throw new HgInvalidControlFileException("Failed to read tags", ex, file2read); | 
| 104 
54562de502f7
Preliminary tags implementation
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 206 } | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 207 } | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 208 return tags; | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 209 } | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 210 | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 211 public HgBranches getBranches() { | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 212 if (branches == null) { | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 213 branches = new HgBranches(this); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 214 branches.collect(ProgressSupport.Factory.get(null)); | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 215 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 216 return branches; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 217 } | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 218 | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 219 @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: 
229diff
changeset | 220 public HgMergeState getMergeState() { | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 221 if (mergeState == null) { | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 222 mergeState = new HgMergeState(this); | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 223 } | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 224 return mergeState; | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 225 } | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 226 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 227 public HgDataFile getFileNode(String path) { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 228 CharSequence nPath = normalizePath.rewrite(path); | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 229 CharSequence 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: 
197diff
changeset | 230 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: 
114diff
changeset | 231 Path p = Path.create(nPath); | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 232 if (content == null) { | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 233 return new HgDataFile(this, p); | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 234 } | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 235 return new HgDataFile(this, p, content); | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 236 } | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 237 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 238 public HgDataFile getFileNode(Path path) { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 239 CharSequence 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: 
197diff
changeset | 240 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: 
114diff
changeset | 241 // 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: 
114diff
changeset | 242 if (content == null) { | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 243 return new HgDataFile(this, path); | 
| 
c0cc2535462c
Introduced channels to pipeline (and easily filter) data streams
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
114diff
changeset | 244 } | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 245 return new HgDataFile(this, path, content); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 246 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 247 | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 248 /* 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: 
141diff
changeset | 249 public PathRewrite getToRepoPathHelper() { | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 250 return normalizePath; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 251 } | 
| 284 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 252 | 
| 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 253 /** | 
| 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 254 * @return pair of values, {@link Pair#first()} and {@link Pair#second()} are respective parents, never <code>null</code>. | 
| 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 255 */ | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 256 public Pair<Nodeid,Nodeid> getWorkingCopyParents() { | 
| 284 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 257 return HgDirstate.readParents(this, new File(repoDir, "dirstate")); | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 258 } | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 259 | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 260 /** | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 261 * @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: 
239diff
changeset | 262 */ | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 263 public String getWorkingCopyBranchName() { | 
| 284 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 264 return HgDirstate.readBranch(this); | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 265 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
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: 
235diff
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: 
235diff
changeset | 268 * @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: 
235diff
changeset | 269 */ | 
| 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
235diff
changeset | 270 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: 
235diff
changeset | 271 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: 
235diff
changeset | 272 } | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 273 | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 274 /** | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 275 * 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: 
237diff
changeset | 276 * known, not recursive collection of all nested sub-repositories. | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 277 * @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: 
237diff
changeset | 278 */ | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 279 public List<HgSubrepoLocation> getSubrepositories() { | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 280 if (subRepos == null) { | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 281 subRepos = new SubrepoManager(this); | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 282 } | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 283 return subRepos.all(); | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 284 } | 
| 237 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
235diff
changeset | 285 | 
| 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
235diff
changeset | 286 // shall be of use only for internal classes | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 287 /*package-local*/ File getRepositoryRoot() { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 288 return repoDir; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 289 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 290 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 291 // 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) | 
| 280 
35125450c804
Erroneous and slow status for working copies based on non-tip revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
252diff
changeset | 292 // XXX consider passing Path pool or factory to produce (shared) Path instead of Strings | 
| 284 
7232b94f2ae3
HgDirstate shall operate with Path instead of String for file names. Use of Pair instead of array of unspecified length for parents.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
280diff
changeset | 293 /*package-local*/ final HgDirstate loadDirstate(PathPool pathPool) { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 294 PathRewrite canonicalPath = null; | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 295 if (!isCaseSensitiveFileSystem) { | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 296 canonicalPath = new PathRewrite() { | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 297 | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 298 public CharSequence rewrite(CharSequence path) { | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 299 return path.toString().toLowerCase(); | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 300 } | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 301 }; | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 302 } | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 303 return new HgDirstate(this, new File(repoDir, "dirstate"), pathPool, canonicalPath); | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 304 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 305 | 
| 289 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 306 /** | 
| 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 307 * Access to configured set of ignored files. | 
| 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 308 * @see HgIgnore#isIgnored(Path) | 
| 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 309 */ | 
| 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 310 public HgIgnore getIgnore() { | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 311 // TODO read config for additional locations | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 312 if (ignore == null) { | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 313 ignore = new HgIgnore(); | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 314 try { | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 315 File ignoreFile = new File(getWorkingDir(), ".hgignore"); | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 316 ignore.read(ignoreFile); | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 317 } catch (IOException ex) { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 318 getContext().getLog().warn(getClass(), ex, null); | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 319 } | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 320 } | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 321 return ignore; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 322 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 323 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 324 /*package-local*/ DataAccessProvider getDataAccess() { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 325 return dataAccess; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 326 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 327 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 328 /** | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 329 * Perhaps, should be separate interface, like ContentLookup | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 330 * 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: 
1diff
changeset | 331 */ | 
| 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: 
197diff
changeset | 332 /*package-local*/ RevlogStream resolve(Path path, boolean shallFakeNonExistent) { | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 333 final SoftReference<RevlogStream> ref = streamsCache.get(path); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 334 RevlogStream cached = ref == null ? null : ref.get(); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 335 if (cached != null) { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 336 return cached; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 337 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 338 File f = new File(repoDir, path.toString()); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 339 if (f.exists()) { | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 340 RevlogStream s = new RevlogStream(dataAccess, f); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 341 streamsCache.put(path, new SoftReference<RevlogStream>(s)); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 342 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: 
197diff
changeset | 343 } 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: 
197diff
changeset | 344 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: 
197diff
changeset | 345 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: 
197diff
changeset | 346 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: 
197diff
changeset | 347 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: 
197diff
changeset | 348 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: 
197diff
changeset | 349 } catch (IOException ex) { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 350 getContext().getLog().info(getClass(), ex, 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: 
197diff
changeset | 351 } | 
| 
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: 
197diff
changeset | 352 } | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 353 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 354 return null; // XXX empty stream instead? | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 355 } | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 356 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 357 // 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: 
104diff
changeset | 358 /*package-local*/ ConfigFile getConfigFile() { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 359 if (configFile == null) { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 360 configFile = new ConfigFile(); | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 361 try { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 362 configFile.addLocation(new File(System.getProperty("user.home"), ".hgrc")); | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 363 // last one, overrides anything else | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 364 // <repo>/.hg/hgrc | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 365 configFile.addLocation(new File(getRepositoryRoot(), "hgrc")); | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 366 } catch (IOException ex) { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 367 getContext().getLog().warn(getClass(), ex, "Errors while reading user configuration file"); | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 368 } | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 369 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 370 return configFile; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 371 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 372 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 373 /*package-local*/ List<Filter> getFiltersFromRepoToWorkingDir(Path p) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 374 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: 
104diff
changeset | 375 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 376 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 377 /*package-local*/ List<Filter> getFiltersFromWorkingDirToRepo(Path p) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 378 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: 
104diff
changeset | 379 } | 
| 237 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
235diff
changeset | 380 | 
| 
6e1373b54e9b
Allow access to working copy content through HgDataFile. Give access to repository's working dir
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
235diff
changeset | 381 /*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: 
235diff
changeset | 382 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: 
235diff
changeset | 383 } | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 384 | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 385 /*package-local*/ SessionContext getContext() { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 386 return sessionContext; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 387 } | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 388 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 389 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: 
104diff
changeset | 390 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: 
104diff
changeset | 391 if (factories.isEmpty()) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 392 return Collections.emptyList(); | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 393 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 394 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: 
104diff
changeset | 395 for (Filter.Factory ff : factories) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 396 Filter f = ff.create(p, opts); | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 397 if (f != null) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 398 rv.add(f); | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 399 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 400 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 401 return rv; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 402 } | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 403 } | 
