jhg: src/org/tmatesoft/hg/repo/HgRepository.java annotate

annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 614:1d1e96f5a908

Added tag v1.1m4 for changeset f41dd9a3b8af

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Fri, 10 May 2013 17:31:54 +0200
parents	f41dd9a3b8af
children	272ecffccc8a

rev	line source
10 382cfe9463db Dirstate parsing. DataAccess refactored to allow reuse and control over constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 9 diff changeset	1 /*
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 504 diff changeset	2 * Copyright (c) 2010-2013 TMate Software Ltd
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	3 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	4 * This program is free software; you can redistribute it and/or modify
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	5 * it under the terms of the GNU General Public License as published by
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	6 * the Free Software Foundation; version 2 of the License.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	7 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	8 * This program is distributed in the hope that it will be useful,
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	11 * GNU General Public License for more details.
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	12 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	13 * For information on how to redistribute this software under
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	14 * the terms of a license other than GNU General Public License
102 a3a2e5deb320 Updated contact address to support@hg4j.com Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 97 diff changeset	15 * contact TMate Software at support@hg4j.com
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	17 package org.tmatesoft.hg.repo;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	18
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: 591 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepositoryFiles.LastMessage;
5c68567b3645 Refresh tags, branches, bookmarks and ignore when their files (or csets in the repo) are changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 591 diff 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: 431 diff changeset	21
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	22 import java.io.File;
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	23 import java.io.FileReader;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	24 import java.io.IOException;
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	25 import java.nio.CharBuffer;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	26 import java.util.ArrayList;
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	27 import java.util.Collections;
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	28 import java.util.List;
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	29
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	30 import org.tmatesoft.hg.core.Nodeid;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	31 import org.tmatesoft.hg.core.SessionContext;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	32 import org.tmatesoft.hg.internal.ConfigFile;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 504 diff changeset	33 import org.tmatesoft.hg.internal.DirstateReader;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	34 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: 388 diff changeset	35 import org.tmatesoft.hg.internal.Internals;
504 bf352ce2b97f Allow to override lock timeout from within Hg4J Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	36 import org.tmatesoft.hg.internal.PropertyMarshal;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	37 import org.tmatesoft.hg.internal.RevlogStream;
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	38 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: 493 diff changeset	39 import org.tmatesoft.hg.repo.ext.HgExtensionsManager;
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	40 import org.tmatesoft.hg.util.Pair;
133 4a948ec83980 core.Path to util.Path as it's not Hg repo dependant Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 115 diff changeset	41 import org.tmatesoft.hg.util.Path;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	42 import org.tmatesoft.hg.util.PathRewrite;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	43 import org.tmatesoft.hg.util.ProgressSupport;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	44
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	45
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	46
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47 /**
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	48 * Shall be as state-less as possible, all the caching happens outside the repo, in commands/walkers
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	49 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	50 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	51 * @author TMate Software Ltd.
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	52 */
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: 488 diff changeset	53 public final class HgRepository implements SessionContext.Source {
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	54
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	55 // 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: 403 diff changeset	56
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	57 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	58 * 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: 403 diff changeset	59 */
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	60 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: 403 diff changeset	61
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	62 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	63 * 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: 403 diff changeset	64 * 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: 403 diff changeset	65 * 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: 403 diff changeset	66 */
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	67 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: 403 diff changeset	68
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	69 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	70 * 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: 403 diff changeset	71 */
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	72 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: 239 diff changeset	73
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	74 /**
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: 421 diff changeset	75 * 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: 421 diff changeset	76 *
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: 421 diff changeset	77 * <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: 421 diff changeset	78 * 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: 421 diff changeset	79 * 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: 421 diff changeset	80 *
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: 421 diff changeset	81 * <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: 421 diff changeset	82 * 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: 403 diff changeset	83 */
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	84 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: 403 diff changeset	85
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	86 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	87 * 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: 403 diff changeset	88 */
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	89 public static final String DEFAULT_BRANCH_NAME = "default";
5 fc265ddeab26 File content and non-effective, although working, patch application Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 3 diff changeset	90
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	91 private final File workingDir; // .hg/../
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	92 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: 491 diff changeset	93 /*
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: 491 diff changeset	94 * 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: 491 diff changeset	95 * 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: 491 diff changeset	96 * 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: 491 diff changeset	97 */
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: 491 diff changeset	98 private final PathRewrite normalizePath;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	99 private final SessionContext sessionContext;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	100
97 ee2c750b036d Changelog to HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 91 diff changeset	101 private HgChangelog changelog;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	102 private HgManifest manifest;
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	103 private HgTags tags;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	104 private HgBranches branches;
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	105 private HgMergeState mergeState;
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	106 private SubrepoManager subRepos;
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	107 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: 493 diff changeset	108 private HgExtensionsManager extManager;
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	109 private HgIgnore ignore;
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	110 private HgRepoConfig repoConfig;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	111
613 f41dd9a3b8af Remove few Experimental annotations as the API they've marked graduates Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 610 diff changeset	112 private HgRepositoryLock wdLock, storeLock;
f41dd9a3b8af Remove few Experimental annotations as the API they've marked graduates Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 610 diff changeset	113
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: 591 diff changeset	114 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: 591 diff changeset	115
430 d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	116 /*
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	117 * TODO [post-1.0] move to a better place, e.g. WorkingCopy container that tracks both dirstate and branches
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	118 * (and, perhaps, undo, lastcommit and other similar information), and is change listener so that we don't need to
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	119 * worry about this cached value become stale
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	120 */
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	121 private String wcBranch;
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	122
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	123
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	124 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: 235 diff changeset	125 workingDir = null;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	126 repoLocation = repositoryPath;
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	127 normalizePath = null;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	128 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: 367 diff changeset	129 impl = null;
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	130 }
a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	131
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	132 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	133 * @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: 423 diff changeset	134 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	135 HgRepository(SessionContext ctx, String repositoryPath, File repositoryRoot) throws HgRuntimeException {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	136 assert ".hg".equals(repositoryRoot.getName()) && repositoryRoot.isDirectory();
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	137 assert repositoryPath != null;
1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	138 assert repositoryRoot != null;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	139 assert ctx != null;
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	140 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: 235 diff changeset	141 if (workingDir == null) {
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	142 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: 235 diff changeset	143 }
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	144 repoLocation = repositoryPath;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	145 sessionContext = ctx;
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	146 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: 579 diff changeset	147
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	148 public RevlogStream getStream(HgDataFile df) {
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	149 return df.content;
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	150 }
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	151 public RevlogStream getManifestStream() {
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	152 return HgRepository.this.getManifest().content;
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	153 }
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	154 public RevlogStream getChangelogStream() {
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	155 return HgRepository.this.getChangelog().content;
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	156 }
e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	157 });
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: 591 diff changeset	158 normalizePath = impl.buildNormalizePathRewrite();
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	159 }
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	160
145 acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	161 @Override
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	162 public String toString() {
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	163 return getClass().getSimpleName() + "[" + getLocation() + (isInvalid() ? "(BAD)" : "") + "]";
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	164 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	165
491 4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	166 /**
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	167 * 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: 490 diff changeset	168 * 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: 490 diff changeset	169 * as an extra description of the failure.
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	170 *
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	171 * <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: 490 diff changeset	172 * 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: 490 diff changeset	173 * provide {@link File}, e.g. {@link #getWorkingDir()}
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	174 *
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	175 * @return repository location information, never <code>null</code>
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	176 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	177 public String getLocation() {
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	178 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: 68 diff changeset	179 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	180
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	181 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: 488 diff changeset	182 return impl == null \|\| impl.isInvalid();
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	183 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	184
97 ee2c750b036d Changelog to HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 91 diff changeset	185 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: 367 diff changeset	186 if (changelog == null) {
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	187 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: 367 diff changeset	188 changelog = new HgChangelog(this, content);
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	189 }
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: 367 diff changeset	190 return changelog;
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	191 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	192
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	193 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: 367 diff changeset	194 if (manifest == null) {
591 e447384f3771 CommitFacility as internal class; refactored infrastructure around internals (access to RevlogStream) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 579 diff changeset	195 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: 409 diff changeset	196 manifest = new HgManifest(this, content, impl.buildFileNameEncodingHelper());
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	197 }
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: 367 diff changeset	198 return manifest;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	199 }
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	200
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	201 /**
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: 591 diff changeset	202 * 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: 591 diff changeset	203 *
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	204 * @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: 481 diff changeset	205 */
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	206 public HgTags getTags() throws HgInvalidControlFileException {
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	207 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: 591 diff changeset	208 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: 591 diff changeset	209 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: 591 diff changeset	210 } 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: 591 diff changeset	211 tags.reloadIfChanged();
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	212 }
f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	213 return tags;
f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	214 }
f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	215
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	216 /**
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: 591 diff changeset	217 * 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: 591 diff changeset	218 * 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: 591 diff changeset	219 *
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	220 * @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: 481 diff changeset	221 * @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: 481 diff changeset	222 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 348 diff changeset	223 public HgBranches getBranches() throws HgInvalidControlFileException {
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: 591 diff changeset	224 final ProgressSupport ps = ProgressSupport.Factory.get(null);
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	225 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: 488 diff changeset	226 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: 591 diff changeset	227 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: 591 diff changeset	228 } 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: 591 diff changeset	229 branches.reloadIfChanged(ps);
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	230 }
8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	231 return branches;
8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	232 }
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	233
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	234 /**
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	235 * Access state of the recent merge
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	236 * @return merge state facility, never <code>null</code>
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	237 */
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	238 public HgMergeState getMergeState() {
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	239 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: 488 diff changeset	240 mergeState = new HgMergeState(impl);
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	241 }
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	242 return mergeState;
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	243 }
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	244
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	245 public HgDataFile getFileNode(String path) {
292 a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	246 CharSequence nPath = normalizePath.rewrite(path);
571 e4ee4bf4c7d0 Let session context control creation of Path instances Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 539 diff changeset	247 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: 491 diff changeset	248 return getFileNode(p);
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	249 }
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	250
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	251 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: 579 diff changeset	252 RevlogStream content = impl.resolveStoreFile(path);
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	253 if (content == null) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	254 return new HgDataFile(this, path);
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	255 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	256 return new HgDataFile(this, path, content);
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	257 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	258
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	259 /* clients need to rewrite path from their FS to a repository-friendly paths, and, perhaps, vice versa*/
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	260 public PathRewrite getToRepoPathHelper() {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	261 return normalizePath;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	262 }
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: 280 diff changeset	263
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: 280 diff changeset	264 /**
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	265 * @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: 337 diff changeset	266 * @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: 280 diff changeset	267 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	268 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: 504 diff changeset	269 return DirstateReader.readParents(impl);
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	270 }
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	271
a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	272 /**
a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	273 * @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: 337 diff changeset	274 * @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: 239 diff changeset	275 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	276 public String getWorkingCopyBranchName() throws HgInvalidControlFileException {
430 d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	277 if (wcBranch == null) {
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 504 diff changeset	278 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: 425 diff changeset	279 }
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	280 return wcBranch;
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	281 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	282
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	283 /**
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	284 * @return location where user files (shall) reside
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	285 */
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	286 public File getWorkingDir() {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	287 return workingDir;
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	288 }
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	289
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	290 /**
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	291 * Provides access to sub-repositories defined in this repository. Enumerated sub-repositories are those directly
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	292 * known, not recursive collection of all nested sub-repositories.
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	293 * @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: 481 diff changeset	294 * @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: 237 diff changeset	295 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	296 public List<HgSubrepoLocation> getSubrepositories() throws HgInvalidControlFileException {
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	297 if (subRepos == null) {
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	298 subRepos = new SubrepoManager(this);
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	299 subRepos.read();
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	300 }
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	301 return subRepos.all();
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	302 }
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	303
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	304
579 36e36b926747 Provide means to read user-specific configuration, with no specific repository selected Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 571 diff changeset	305 /**
36e36b926747 Provide means to read user-specific configuration, with no specific repository selected Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 571 diff changeset	306 * Repository-specific configuration.
36e36b926747 Provide means to read user-specific configuration, with no specific repository selected Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 571 diff changeset	307 * @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: 571 diff changeset	308 */
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	309 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: 318 diff changeset	310 if (repoConfig == null) {
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	311 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: 488 diff changeset	312 ConfigFile configFile = impl.readConfiguration();
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	313 repoConfig = new HgRepoConfig(configFile);
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	314 } catch (IOException ex) {
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	315 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: 488 diff changeset	316 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: 488 diff changeset	317 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: 318 diff changeset	318 //throw new HgInvalidControlFileException(m, ex, null);
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	319 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	320 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	321 return repoConfig;
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	322 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	323
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 504 diff changeset	324 // 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: 504 diff changeset	325 // (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: 430 diff changeset	326 /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: 289 diff changeset	327 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: 367 diff changeset	328 if (!impl.isCaseSensitiveFileSystem()) {
292 a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	329 canonicalPath = new PathRewrite() {
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	330
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	331 public CharSequence rewrite(CharSequence path) {
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	332 return path.toString().toLowerCase();
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	333 }
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	334 };
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	335 }
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: 488 diff changeset	336 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: 488 diff changeset	337 ds.read();
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	338 return ds;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	339 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	340
289 086a326f181f Provide public access to ignored files configuration to use in alternative file walkers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	341 /**
086a326f181f Provide public access to ignored files configuration to use in alternative file walkers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	342 * 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: 284 diff changeset	343 * @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: 481 diff changeset	344 * @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: 284 diff changeset	345 */
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	346 public HgIgnore getIgnore() throws HgInvalidControlFileException {
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	347 // TODO read config for additional locations
c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	348 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: 407 diff changeset	349 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: 591 diff changeset	350 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: 591 diff changeset	351 } 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: 591 diff changeset	352 ignore.reloadIfChanged(impl);
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	353 }
c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	354 return ignore;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	355 }
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	356
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	357 /**
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	358 * 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: 471 diff changeset	359 * This method provides this saved message.
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	360 *
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	361 * @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: 481 diff changeset	362 * @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: 471 diff changeset	363 */
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	364 public String getCommitLastMessage() throws HgInvalidControlFileException {
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: 488 diff changeset	365 File lastMessage = impl.getFileFromRepoDir(LastMessage.getPath());
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	366 if (!lastMessage.canRead()) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	367 return null;
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	368 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	369 FileReader fr = null;
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	370 try {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	371 fr = new FileReader(lastMessage);
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	372 CharBuffer cb = CharBuffer.allocate(Internals.ltoi(lastMessage.length()));
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	373 fr.read(cb);
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	374 return cb.flip().toString();
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	375 } catch (IOException ex) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	376 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: 471 diff changeset	377 } finally {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	378 if (fr != null) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	379 try {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	380 fr.close();
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	381 } catch (IOException ex) {
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: 488 diff changeset	382 getSessionContext().getLog().dump(getClass(), Warn, "Failed to close %s after read", lastMessage);
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	383 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	384 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	385 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	386 }
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	387
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	388 /**
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	389 * 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: 484 diff changeset	390 * everything that has to do with working directory state).
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	391 *
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	392 * 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: 486 diff changeset	393 * Use {@link HgRepositoryLock#acquire()} to actually lock the repository.
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	394 *
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	395 * @return lock object, never <code>null</code>
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	396 */
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	397 public HgRepositoryLock getWorkingDirLock() {
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	398 if (wdLock == null) {
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	399 int timeout = getLockTimeout();
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: 488 diff changeset	400 File lf = impl.getFileFromRepoDir("wlock");
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	401 synchronized (this) {
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	402 if (wdLock == null) {
488 45b3b6ca046f Repository locking mechanism is alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 487 diff changeset	403 wdLock = new HgRepositoryLock(lf, timeout);
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	404 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	405 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	406 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	407 return wdLock;
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	408 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	409
613 f41dd9a3b8af Remove few Experimental annotations as the API they've marked graduates Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 610 diff changeset	410 /**
f41dd9a3b8af Remove few Experimental annotations as the API they've marked graduates Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 610 diff changeset	411 * 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: 610 diff changeset	412 * the state of working directory
f41dd9a3b8af Remove few Experimental annotations as the API they've marked graduates Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 610 diff changeset	413 * @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: 610 diff changeset	414 */
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	415 public HgRepositoryLock getStoreLock() {
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	416 if (storeLock == null) {
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	417 int timeout = getLockTimeout();
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: 491 diff changeset	418 File fl = impl.getFileFromStoreDir("lock");
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	419 synchronized (this) {
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	420 if (storeLock == null) {
488 45b3b6ca046f Repository locking mechanism is alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 487 diff changeset	421 storeLock = new HgRepositoryLock(fl, timeout);
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	422 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	423 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	424 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	425 return storeLock;
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	426 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	427
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	428 /**
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	429 * Access bookmarks-related functionality
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	430 * @return facility to manage bookmarks, never <code>null</code>
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	431 * @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: 483 diff changeset	432 */
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	433 public HgBookmarks getBookmarks() throws HgInvalidControlFileException {
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	434 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: 488 diff changeset	435 bookmarks = new HgBookmarks(impl);
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	436 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: 591 diff changeset	437 } 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: 591 diff changeset	438 bookmarks.reloadIfChanged();
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	439 }
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	440 return bookmarks;
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	441 }
501 d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	442
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	443 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: 493 diff changeset	444 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: 493 diff changeset	445 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: 493 diff changeset	446 EM() {
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	447 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: 493 diff changeset	448 }
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	449 }
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	450 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: 493 diff changeset	451 }
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	452 return extManager;
d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	453 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	454
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: 488 diff changeset	455 /**
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: 488 diff changeset	456 * @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: 488 diff changeset	457 */
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: 488 diff changeset	458 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: 488 diff changeset	459 return sessionContext;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	460 }
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	461
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	462 /package-local/ List<Filter> getFiltersFromRepoToWorkingDir(Path p) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	463 return instantiateFilters(p, new Filter.Options(Filter.Direction.FromRepo));
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	464 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	465
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	466 /package-local/ List<Filter> getFiltersFromWorkingDirToRepo(Path p) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	467 return instantiateFilters(p, new Filter.Options(Filter.Direction.ToRepo));
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	468 }
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	469
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	470 /package-local/ File getFile(HgDataFile dataFile) {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	471 return new File(getWorkingDir(), dataFile.getPath().toString());
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	472 }
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	473
412 63c5a9d7ca3f Follow-up for Issue 29: unify path translation for manifest and dirstate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 409 diff changeset	474 /package-local/ Internals getImplHelper() {
63c5a9d7ca3f Follow-up for Issue 29: unify path translation for manifest and dirstate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 409 diff changeset	475 return impl;
63c5a9d7ca3f Follow-up for Issue 29: unify path translation for manifest and dirstate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 409 diff changeset	476 }
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	477
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	478 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: 488 diff changeset	479 List<Filter.Factory> factories = impl.getFilters();
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	480 if (factories.isEmpty()) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	481 return Collections.emptyList();
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	482 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	483 ArrayList<Filter> rv = new ArrayList<Filter>(factories.size());
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	484 for (Filter.Factory ff : factories) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	485 Filter f = ff.create(p, opts);
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	486 if (f != null) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	487 rv.add(f);
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	488 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	489 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	490 return rv;
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	491 }
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	492
db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	493 private int getLockTimeout() {
504 bf352ce2b97f Allow to override lock timeout from within Hg4J Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	494 int cfgValue = getConfiguration().getIntegerValue("ui", "timeout", 600);
bf352ce2b97f Allow to override lock timeout from within Hg4J Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	495 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: 501 diff changeset	496 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: 501 diff changeset	497 }
bf352ce2b97f Allow to override lock timeout from within Hg4J Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	498 return cfgValue;
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	499 }
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	500 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 614:1d1e96f5a908