Mercurial > hg4j
annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 654:12a4f60ea972
1) Console push tool. 2) Pass class to blame into FileUtils
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 03 Jul 2013 15:11:40 +0200 | 
| parents | c75297c17867 | 
| children | 
| 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 /* | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
504diff
changeset | 2 * Copyright (c) 2010-2013 TMate Software Ltd | 
| 74 
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 | 
| 647 
c75297c17867
Location of repository files as enumeration, use file constants instead of plain names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
636diff
changeset | 19 import static org.tmatesoft.hg.repo.HgRepositoryFiles.*; | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 20 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn; | 
| 456 
909306e412e2
Refactor LogFacility and SessionContext, better API for both
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
431diff
changeset | 21 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 22 import java.io.File; | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 23 import java.io.FileReader; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 24 import java.io.IOException; | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 25 import java.nio.CharBuffer; | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 26 import java.util.ArrayList; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 27 import java.util.Collections; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 28 import java.util.List; | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 29 | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 30 import org.tmatesoft.hg.core.HgIOException; | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 31 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 | 32 import org.tmatesoft.hg.core.SessionContext; | 
| 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; | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
504diff
changeset | 34 import org.tmatesoft.hg.internal.DirstateReader; | 
| 636 
ffce73efa2c2
HgCommitCommand: save last commit message
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
628diff
changeset | 35 import org.tmatesoft.hg.internal.FileUtils; | 
| 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; | 
| 407 
30922c728341
Better multiline log printout; options to tune default log output
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
388diff
changeset | 37 import org.tmatesoft.hg.internal.Internals; | 
| 504 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 38 import org.tmatesoft.hg.internal.PropertyMarshal; | 
| 77 
c677e1593919
Moved RevlogStream implementation into .internal
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 39 import org.tmatesoft.hg.internal.RevlogStream; | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 40 import org.tmatesoft.hg.internal.SubrepoManager; | 
| 501 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 41 import org.tmatesoft.hg.repo.ext.HgExtensionsManager; | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 42 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 | 43 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: 
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 */ | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 55 public final class HgRepository implements SessionContext.Source { | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 | 
| 405 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 57 // IMPORTANT: if new constants added, consider fixing HgInternals#wrongRevisionIndex and HgInvalidRevisionException#getMessage | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 58 | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 59 /** | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 60 * Revision index constant to indicate most recent revision | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 61 */ | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 62 public static final int TIP = -3; // XXX TIP_REVISION? | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 63 | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 64 /** | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 65 * Revision index constant to indicate invalid revision index value. | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 66 * Primary use is default/uninitialized values where user input is expected and as return value where | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 67 * an exception (e.g. {@link HgInvalidRevisionException}) is not desired | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 68 */ | 
| 403 
2747b0723867
FIXMEs: work on exceptions and javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
396diff
changeset | 69 public static final int BAD_REVISION = Integer.MIN_VALUE; // XXX INVALID_REVISION? | 
| 405 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 70 | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 71 /** | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 72 * Revision index constant to indicate working copy | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 73 */ | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 74 public static final int WORKING_COPY = -2; // XXX WORKING_COPY_REVISION? | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 75 | 
| 405 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 76 /** | 
| 423 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 77 * Constant ({@value #NO_REVISION}) to indicate revision absence or a fictitious revision of an empty repository. | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 78 * | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 79 * <p>Revision absence is vital e.g. for missing parent from {@link HgChangelog#parents(int, int[], byte[], byte[])} call and | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 80 * to report cases when changeset records no corresponding manifest | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 81 * revision {@link HgManifest#walk(int, int, org.tmatesoft.hg.repo.HgManifest.Inspector)}. | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 82 * | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 83 * <p> Use as imaginary revision/empty repository is handy as an argument (contrary to {@link #BAD_REVISION}) | 
| 
9c9c442b5f2e
Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
421diff
changeset | 84 * e.g in a status operation to visit changes from the very beginning of a repository. | 
| 405 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 85 */ | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 86 public static final int NO_REVISION = -1; | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 87 | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 88 /** | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 89 * Name of the primary branch, "default". | 
| 
866fc3b597a0
Add an explicit constant instead of -1 to indicate 'no revision' case
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
403diff
changeset | 90 */ | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 91 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 | 92 | 
| 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 | 93 private final File workingDir; // .hg/../ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 94 private final String repoLocation; | 
| 493 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 95 /* | 
| 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 96 * normalized slashes but otherwise regular file names | 
| 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 97 * the only front-end path rewrite, kept here as rest of the library shall | 
| 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 98 * not bother with names normalization. | 
| 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 99 */ | 
| 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 100 private final PathRewrite normalizePath; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 101 private final SessionContext sessionContext; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 102 | 
| 97 
ee2c750b036d
Changelog to HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
91diff
changeset | 103 private HgChangelog changelog; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 104 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 | 105 private HgTags tags; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 106 private HgBranches branches; | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 107 private HgMergeState mergeState; | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 108 private SubrepoManager subRepos; | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 109 private HgBookmarks bookmarks; | 
| 501 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 110 private HgExtensionsManager extManager; | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 111 private HgIgnore ignore; | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 112 private HgRepoConfig repoConfig; | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 113 | 
| 613 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 114 private HgRepositoryLock wdLock, storeLock; | 
| 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 115 | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 116 private final org.tmatesoft.hg.internal.Internals impl; | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 117 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 118 HgRepository(String repositoryPath) { | 
| 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 | 119 workingDir = null; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 120 repoLocation = repositoryPath; | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 121 normalizePath = null; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 122 sessionContext = null; | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 123 impl = null; | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 124 } | 
| 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 125 | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 126 /** | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 127 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 128 */ | 
| 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 129 HgRepository(SessionContext ctx, String repositoryPath, File repositoryRoot) throws HgRuntimeException { | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 130 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 | 131 assert repositoryPath != null; | 
| 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 132 assert repositoryRoot != null; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 133 assert ctx != null; | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 134 workingDir = repositoryRoot.getParentFile(); | 
| 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 | 135 if (workingDir == null) { | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 136 throw new IllegalArgumentException(repositoryRoot.toString()); | 
| 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 | 137 } | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
145diff
changeset | 138 repoLocation = repositoryPath; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 139 sessionContext = ctx; | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 140 impl = new Internals(this, repositoryRoot, new Internals.ImplAccess() { | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 141 | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 142 public RevlogStream getStream(HgDataFile df) { | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 143 return df.content; | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 144 } | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 145 public RevlogStream getManifestStream() { | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 146 return HgRepository.this.getManifest().content; | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 147 } | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 148 public RevlogStream getChangelogStream() { | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 149 return HgRepository.this.getChangelog().content; | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 150 } | 
| 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 151 }); | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 152 normalizePath = impl.buildNormalizePathRewrite(); | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 153 } | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 154 | 
| 145 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 155 @Override | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 156 public String toString() { | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 157 return getClass().getSimpleName() + "[" + getLocation() + (isInvalid() ? "(BAD)" : "") + "]"; | 
| 
acc6151b1b7a
toString for friendly debug
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
142diff
changeset | 158 } | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 159 | 
| 491 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 160 /** | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 161 * Path to repository which has been used to initialize this instance. The value is always present, even | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 162 * if no repository has been found at that location ({@link #isInvalid()} is <code>true</code>) and serves | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 163 * as an extra description of the failure. | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 164 * | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 165 * <p> It's important to understand this is purely descriptive attribute, it's kept as close as possible to | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 166 * original value users supply to {@link HgLookup}. To get actual repository location, use methods that | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 167 * provide {@link File}, e.g. {@link #getWorkingDir()} | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 168 * | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 169 * @return repository location information, never <code>null</code> | 
| 
4a670f76e7d1
Javadoc for HgRepository#getLocation()
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
490diff
changeset | 170 */ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 171 public String getLocation() { | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 172 return repoLocation; // XXX field to keep this is bit too much | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 173 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 174 | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 175 public boolean isInvalid() { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 176 return impl == null || impl.isInvalid(); | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 177 } | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 178 | 
| 97 
ee2c750b036d
Changelog to HgChangelog
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
91diff
changeset | 179 public HgChangelog getChangelog() { | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 180 if (changelog == null) { | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 181 RevlogStream content = impl.createChangelogStream(); | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 182 changelog = new HgChangelog(this, content); | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 183 } | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 184 return changelog; | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 185 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 186 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 187 public HgManifest getManifest() { | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 188 if (manifest == null) { | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 189 RevlogStream content = impl.createManifestStream(); | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
409diff
changeset | 190 manifest = new HgManifest(this, content, impl.buildFileNameEncodingHelper()); | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 191 } | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 192 return manifest; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 193 } | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 194 | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 195 /** | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 196 * Access snapshot of repository tags. | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 197 * | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 198 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 199 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 200 public HgTags getTags() throws HgRuntimeException { | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 201 if (tags == null) { | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 202 tags = new HgTags(impl); | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 203 tags.read(); | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 204 } else { | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 205 tags.reloadIfChanged(); | 
| 50 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 206 } | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 207 return tags; | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 208 } | 
| 
f1db8610da62
Log to consult (placeholder, for now) class to find out associated tags
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
45diff
changeset | 209 | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 210 /** | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 211 * Access branch information. Returns a snapshot of branch information as it's available at the time of the call. | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 212 * If repository get changed, use this method to obtain an up-to-date state. | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 213 * | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 214 * @return branch manager instance, never <code>null</code> | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 215 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 216 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 217 public HgBranches getBranches() throws HgRuntimeException { | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 218 final ProgressSupport ps = ProgressSupport.Factory.get(null); | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 219 if (branches == null) { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 220 branches = new HgBranches(impl); | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 221 branches.collect(ps); | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 222 } else { | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 223 branches.reloadIfChanged(ps); | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 224 } | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 225 return branches; | 
| 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 226 } | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 227 | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 228 /** | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 229 * Access state of the recent merge | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 230 * @return merge state facility, never <code>null</code> | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 231 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 232 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 233 public HgMergeState getMergeState() throws HgRuntimeException { | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 234 if (mergeState == null) { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 235 mergeState = new HgMergeState(impl); | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 236 mergeState.refresh(); | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 237 } | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 238 return mergeState; | 
| 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
229diff
changeset | 239 } | 
| 220 
8de327242aa0
Basic information about branches
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
202diff
changeset | 240 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 241 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 | 242 CharSequence nPath = normalizePath.rewrite(path); | 
| 571 
e4ee4bf4c7d0
Let session context control creation of Path instances
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
539diff
changeset | 243 Path p = sessionContext.getPathFactory().path(nPath); | 
| 493 
ba36f66c32b4
Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
491diff
changeset | 244 return getFileNode(p); | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 245 } | 
| 1 
a3576694a4d1
Repository detection from local/specified directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
0diff
changeset | 246 | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 247 public HgDataFile getFileNode(Path path) { | 
| 591 
e447384f3771
CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
579diff
changeset | 248 RevlogStream content = impl.resolveStoreFile(path); | 
| 621 
99ad1e3a4e4d
RevlogStream: be aware of existence (not HgDataFile), facilitate use of an added HgDataFile over a commit; Rollback: be more sensitive about file changes (file size is not enough: write/rollback leaves it intact); tests
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
620diff
changeset | 249 assert content != null; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 250 return new HgDataFile(this, path, content); | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 251 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 252 | 
| 142 
37a34044e6bd
More reasonable use of path normalizer and path.source
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
141diff
changeset | 253 /* 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 | 254 public PathRewrite getToRepoPathHelper() { | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 255 return normalizePath; | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 256 } | 
| 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 | 
| 
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 | 258 /** | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 259 * @return pair of values, {@link Pair#first()} and {@link Pair#second()} are respective parents, never <code>null</code>. | 
| 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 260 * @throws HgInvalidControlFileException if attempt to read information about working copy parents from dirstate failed | 
| 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 | 261 */ | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 262 public Pair<Nodeid,Nodeid> getWorkingCopyParents() throws HgInvalidControlFileException { | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
504diff
changeset | 263 return DirstateReader.readParents(impl); | 
| 235 
fd845a53f53d
Experimental access to working dir parents
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
234diff
changeset | 264 } | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 265 | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 266 /** | 
| 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 267 * @return name of the branch associated with working directory, never <code>null</code>. | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 268 * @throws HgInvalidControlFileException if attempt to read branch name failed. | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 269 */ | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 270 public String getWorkingCopyBranchName() throws HgInvalidControlFileException { | 
| 620 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 271 /* | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 272 * TODO [post-1.1] 1) cache value (now if cached, is not updated after commit) | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 273 * 2) move to a better place, e.g. WorkingCopy container that tracks both dirstate and branches | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 274 * (and, perhaps, undo, lastcommit and other similar information), and is change listener so that we don't need to | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 275 * worry about this cached value become stale | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 276 */ | 
| 
272ecffccc8a
Do not cache branch value of working copy as it's not possible to refresh it after commit now
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
613diff
changeset | 277 String wcBranch = DirstateReader.readBranch(impl); | 
| 430 
d280759c2a3f
branch information is not directly related to dirstate, clean API from this dependency
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
425diff
changeset | 278 return wcBranch; | 
| 252 
a6d19adc2636
HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
239diff
changeset | 279 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
1diff
changeset | 280 | 
| 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 | 281 /** | 
| 
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 | 282 * @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 | 283 */ | 
| 
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 | 284 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 | 285 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 | 286 } | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 287 | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 288 /** | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 289 * 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 | 290 * known, not recursive collection of all nested sub-repositories. | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 291 * @return list of all known sub-repositories in this repository, or empty list if none found. | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 292 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 293 */ | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 294 public List<HgSubrepoLocation> getSubrepositories() throws HgInvalidControlFileException { | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 295 if (subRepos == null) { | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 296 subRepos = new SubrepoManager(this); | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 297 subRepos.read(); | 
| 239 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 298 } | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 299 return subRepos.all(); | 
| 
df9d2854d3d6
Initial access to subrepositories
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
237diff
changeset | 300 } | 
| 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 | 301 | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 302 | 
| 579 
36e36b926747
Provide means to read user-specific configuration, with no specific repository selected
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 303 /** | 
| 
36e36b926747
Provide means to read user-specific configuration, with no specific repository selected
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 304 * Repository-specific configuration. | 
| 
36e36b926747
Provide means to read user-specific configuration, with no specific repository selected
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 305 * @return access to configuration options, never <code>null</code> | 
| 
36e36b926747
Provide means to read user-specific configuration, with no specific repository selected
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
571diff
changeset | 306 */ | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 307 public HgRepoConfig getConfiguration() /* XXX throws HgInvalidControlFileException? Description of the exception suggests it is only for files under ./hg/*/ { | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 308 if (repoConfig == null) { | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 309 try { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 310 ConfigFile configFile = impl.readConfiguration(); | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 311 repoConfig = new HgRepoConfig(configFile); | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 312 } catch (HgIOException ex) { | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 313 String m = "Errors while reading user configuration file"; | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 314 getSessionContext().getLog().dump(getClass(), Warn, ex, m); | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 315 return new HgRepoConfig(new ConfigFile(getSessionContext())); // empty config, do not cache, allow to try once again | 
| 331 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 316 //throw new HgInvalidControlFileException(m, ex, null); | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 317 } | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 318 } | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 319 return repoConfig; | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 320 } | 
| 
a37ce7145c3f
Access to repository configuration
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
318diff
changeset | 321 | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
504diff
changeset | 322 // There seem to be no cases when access to HgDirstate is required from outside | 
| 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
504diff
changeset | 323 // (guess, working dir/revision walkers may hide dirstate access and no public visibility needed) | 
| 431 
12f668401613
FIXMEs: awkward API refactored, what need to be internal got hidden; public aspects got captured in slim interfaces
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
430diff
changeset | 324 /*package-local*/ final HgDirstate loadDirstate(Path.Source pathFactory) throws HgInvalidControlFileException { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 325 PathRewrite canonicalPath = null; | 
| 388 
b015f3918120
Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
367diff
changeset | 326 if (!impl.isCaseSensitiveFileSystem()) { | 
| 292 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 327 canonicalPath = new PathRewrite() { | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 328 | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 329 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 | 330 return path.toString().toLowerCase(); | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 331 } | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 332 }; | 
| 
a415fe296a50
Refactor PathRewrite to accept any char sequence, not only string
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
289diff
changeset | 333 } | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 334 HgDirstate ds = new HgDirstate(impl, pathFactory, canonicalPath); | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 335 ds.read(); | 
| 348 
a0864b2892cd
Expose errors reading mercurial control files with exception
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
337diff
changeset | 336 return ds; | 
| 74 
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 | 
| 289 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 339 /** | 
| 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 340 * 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 | 341 * @see HgIgnore#isIgnored(Path) | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 342 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 289 
086a326f181f
Provide public access to ignored files configuration to use in alternative file walkers
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
284diff
changeset | 343 */ | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 344 public HgIgnore getIgnore() throws HgInvalidControlFileException { | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 345 // TODO read config for additional locations | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 346 if (ignore == null) { | 
| 409 
0f5696623512
Support glob path pattern rewrite to facilitate use of globs with Windows path separator
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
407diff
changeset | 347 ignore = new HgIgnore(getToRepoPathHelper()); | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 348 ignore.read(impl); | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 349 } else { | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 350 ignore.reloadIfChanged(impl); | 
| 91 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 351 } | 
| 
c2ce1cfaeb9e
ignore file with regex and 'honest' glob support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
77diff
changeset | 352 return ignore; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 353 } | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 354 | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 355 /** | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 356 * Mercurial saves message user has supplied for a commit to facilitate message re-use in case commit fails. | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 357 * This method provides this saved message. | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 358 * | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 359 * @return message used for last commit attempt, or <code>null</code> if none | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 360 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 361 */ | 
| 482 
6c67debed07e
Distinguish files in wc from files under repo root, use these constants
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
481diff
changeset | 362 public String getCommitLastMessage() throws HgInvalidControlFileException { | 
| 636 
ffce73efa2c2
HgCommitCommand: save last commit message
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
628diff
changeset | 363 File lastMessage = impl.getRepositoryFile(LastMessage); | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 364 if (!lastMessage.canRead()) { | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 365 return null; | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 366 } | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 367 FileReader fr = null; | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 368 try { | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 369 fr = new FileReader(lastMessage); | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 370 CharBuffer cb = CharBuffer.allocate(Internals.ltoi(lastMessage.length())); | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 371 fr.read(cb); | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 372 return cb.flip().toString(); | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 373 } catch (IOException ex) { | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 374 throw new HgInvalidControlFileException("Can't retrieve message of last commit attempt", ex, lastMessage); | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 375 } finally { | 
| 654 
12a4f60ea972
1) Console push tool. 2) Pass class to blame into FileUtils
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
647diff
changeset | 376 new FileUtils(getSessionContext().getLog(), this).closeQuietly(fr, lastMessage); | 
| 481 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 377 } | 
| 
a458f9fb00ce
Access to user-supplied message of last commit
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
471diff
changeset | 378 } | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 379 | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 380 /** | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 381 * Access repository lock that covers non-store parts of the repository (dirstate, branches, etc - | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 382 * everything that has to do with working directory state). | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 383 * | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 384 * Note, the lock object returned merely gives access to lock mechanism. NO ACTUAL LOCKING IS DONE. | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 385 * Use {@link HgRepositoryLock#acquire()} to actually lock the repository. | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 386 * | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 387 * @return lock object, never <code>null</code> | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 388 */ | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 389 public HgRepositoryLock getWorkingDirLock() { | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 390 if (wdLock == null) { | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 391 int timeout = getLockTimeout(); | 
| 647 
c75297c17867
Location of repository files as enumeration, use file constants instead of plain names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
636diff
changeset | 392 File lf = impl.getRepositoryFile(WorkingCopyLock); | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 393 synchronized (this) { | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 394 if (wdLock == null) { | 
| 488 
45b3b6ca046f
Repository locking mechanism is alive
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
487diff
changeset | 395 wdLock = new HgRepositoryLock(lf, timeout); | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 396 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 397 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 398 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 399 return wdLock; | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 400 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 401 | 
| 613 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 402 /** | 
| 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 403 * Access repository lock that covers repository intrinsic files, unrelated to | 
| 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 404 * the state of working directory | 
| 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 405 * @return lock object, never <code>null</code> | 
| 
f41dd9a3b8af
Remove few Experimental annotations as the API they've marked graduates
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
610diff
changeset | 406 */ | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 407 public HgRepositoryLock getStoreLock() { | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 408 if (storeLock == null) { | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 409 int timeout = getLockTimeout(); | 
| 647 
c75297c17867
Location of repository files as enumeration, use file constants instead of plain names
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
636diff
changeset | 410 File fl = impl.getRepositoryFile(StoreLock); | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 411 synchronized (this) { | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 412 if (storeLock == null) { | 
| 488 
45b3b6ca046f
Repository locking mechanism is alive
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
487diff
changeset | 413 storeLock = new HgRepositoryLock(fl, timeout); | 
| 486 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 414 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 415 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 416 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 417 return storeLock; | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 418 } | 
| 
d740edfff563
Provisional support for Mercurial lock mechanism
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
484diff
changeset | 419 | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 420 /** | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 421 * Access bookmarks-related functionality | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 422 * @return facility to manage bookmarks, never <code>null</code> | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 423 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em> | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 424 */ | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
621diff
changeset | 425 public HgBookmarks getBookmarks() throws HgRuntimeException { | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 426 if (bookmarks == null) { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 427 bookmarks = new HgBookmarks(impl); | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 428 bookmarks.read(); | 
| 610 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 429 } else { | 
| 
5c68567b3645
Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
591diff
changeset | 430 bookmarks.reloadIfChanged(); | 
| 484 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 431 } | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 432 return bookmarks; | 
| 
ae4d6604debd
Bookmarks support added
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 433 } | 
| 501 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 434 | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 435 public HgExtensionsManager getExtensions() { | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 436 if (extManager == null) { | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 437 class EM extends HgExtensionsManager { | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 438 EM() { | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 439 super(HgRepository.this.getImplHelper()); | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 440 } | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 441 } | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 442 extManager = new EM(); | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 443 } | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 444 return extManager; | 
| 
d2f6ab541330
Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
493diff
changeset | 445 } | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 446 | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 447 /** | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 448 * @return session environment of the repository | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 449 */ | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 450 public SessionContext getSessionContext() { | 
| 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 451 return sessionContext; | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
68diff
changeset | 452 } | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 453 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 454 /*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 | 455 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 | 456 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 457 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 458 /*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 | 459 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 | 460 } | 
| 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 | 461 | 
| 
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 | 462 /*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 | 463 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 | 464 } | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
292diff
changeset | 465 | 
| 412 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
409diff
changeset | 466 /*package-local*/ Internals getImplHelper() { | 
| 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
409diff
changeset | 467 return impl; | 
| 
63c5a9d7ca3f
Follow-up for Issue 29: unify path translation for manifest and dirstate
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
409diff
changeset | 468 } | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 469 | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 470 private List<Filter> instantiateFilters(Path p, Filter.Options opts) { | 
| 490 
b3c16d1aede0
Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
488diff
changeset | 471 List<Filter.Factory> factories = impl.getFilters(); | 
| 114 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 472 if (factories.isEmpty()) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 473 return Collections.emptyList(); | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 474 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 475 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 | 476 for (Filter.Factory ff : factories) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 477 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 | 478 if (f != null) { | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 479 rv.add(f); | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 480 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 481 } | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 482 return rv; | 
| 
46291ec605a0
Filters to read and initialize according to configuration files
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
104diff
changeset | 483 } | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 484 | 
| 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 485 private int getLockTimeout() { | 
| 504 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 486 int cfgValue = getConfiguration().getIntegerValue("ui", "timeout", 600); | 
| 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 487 if (getSessionContext().getConfigurationProperty(Internals.CFG_PROPERTY_FS_LOCK_TIMEOUT, null) != null) { | 
| 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 488 return new PropertyMarshal(sessionContext).getInt(Internals.CFG_PROPERTY_FS_LOCK_TIMEOUT, cfgValue); | 
| 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 489 } | 
| 
bf352ce2b97f
Allow to override lock timeout from within Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
501diff
changeset | 490 return cfgValue; | 
| 487 
db48a77ec8ff
Access to reposiotry lock mechanism via HgRepositoryLock
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
486diff
changeset | 491 } | 
| 0 
dbd663faec1f
Basic changelog parsing
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 492 } | 
