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

annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 491:4a670f76e7d1

Javadoc for HgRepository#getLocation()

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 16 Oct 2012 21:07:27 +0200
parents	b3c16d1aede0
children	ba36f66c32b4

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 /*
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	2 * Copyright (c) 2010-2012 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
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepositoryFiles.*;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	20 import static org.tmatesoft.hg.util.LogFacility.Severity.*;
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;
234 b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	25 import java.io.StringReader;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	26 import java.lang.ref.SoftReference;
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	27 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	28 import java.util.ArrayList;
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	29 import java.util.Collections;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	30 import java.util.HashMap;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	31 import java.util.List;
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	32
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	33 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	34 import org.tmatesoft.hg.core.SessionContext;
234 b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	35 import org.tmatesoft.hg.internal.ByteArrayChannel;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	36 import org.tmatesoft.hg.internal.ConfigFile;
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	37 import org.tmatesoft.hg.internal.Experimental;
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	38 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	39 import org.tmatesoft.hg.internal.Internals;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	40 import org.tmatesoft.hg.internal.RevlogStream;
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	41 import org.tmatesoft.hg.internal.SubrepoManager;
234 b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	42 import org.tmatesoft.hg.util.CancelledException;
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	43 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	44 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	45 import org.tmatesoft.hg.util.PathRewrite;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	46 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	47
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	48
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	49
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	50 /**
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 55 diff changeset	51 * 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	52 *
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	53 * @author Artem Tikhomirov
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	54 * @author TMate Software Ltd.
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	55 */
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	56 public final class HgRepository implements SessionContext.Source {
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	57
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	58 // 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	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 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	61 * 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	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 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	64
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	65 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	66 * 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	67 * 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	68 * 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	69 */
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	70 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	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 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	73 * 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	74 */
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	75 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	76
405 866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	77 /**
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	78 * 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	79 *
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 * <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	81 * 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	82 * 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	83 *
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	84 * <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	85 * 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	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 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	88
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	89 /**
866fc3b597a0 Add an explicit constant instead of -1 to indicate 'no revision' case Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	90 * 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	91 */
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	92 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	93
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	94 // temp aux marker method
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	95 public static IllegalStateException notImplemented() {
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	96 return new IllegalStateException("Not implemented");
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	97 }
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	98
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	99 private final File repoDir; // .hg folder
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	100 private final File workingDir; // .hg/../
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	101 private final String repoLocation;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 412 diff changeset	102 private final PathRewrite normalizePath; // normalized slashes but otherwise regular file names
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 412 diff changeset	103 private final PathRewrite dataPathHelper; // access to file storage area (usually under .hg/store/data/), with filenames mangled
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 412 diff changeset	104 private final PathRewrite repoPathHelper; // access to system files
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	105 private final SessionContext sessionContext;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	106
97 ee2c750b036d Changelog to HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 91 diff changeset	107 private HgChangelog changelog;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	108 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	109 private HgTags tags;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	110 private HgBranches branches;
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	111 private HgMergeState mergeState;
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	112 private SubrepoManager subRepos;
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	113 private HgBookmarks bookmarks;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	114
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	115 // XXX perhaps, shall enable caching explicitly
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	116 private final HashMap<Path, SoftReference<RevlogStream>> streamsCache = new HashMap<Path, SoftReference<RevlogStream>>();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	117
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	118 private final org.tmatesoft.hg.internal.Internals impl;
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	119 private HgIgnore ignore;
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	120 private HgRepoConfig repoConfig;
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	121
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	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 * 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	124 * (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	125 * 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	126 */
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	127 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	128
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	129
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	130 HgRepository(String repositoryPath) {
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	131 repoDir = null;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	132 workingDir = null;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	133 repoLocation = repositoryPath;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	134 dataPathHelper = repoPathHelper = null;
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	135 normalizePath = null;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	136 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	137 impl = null;
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	138 }
a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	139
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	140 /**
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	141 * @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	142 */
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	143 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	144 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	145 assert repositoryPath != null;
1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	146 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	147 assert ctx != null;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	148 repoDir = repositoryRoot;
237 6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	149 workingDir = repoDir.getParentFile();
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	150 if (workingDir == null) {
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	151 throw new IllegalArgumentException(repoDir.toString());
6e1373b54e9b Allow access to working copy content through HgDataFile. Give access to repository's working dir Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 235 diff changeset	152 }
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 145 diff changeset	153 repoLocation = repositoryPath;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	154 sessionContext = ctx;
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	155 impl = new org.tmatesoft.hg.internal.Internals(this, repositoryRoot);
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	156 impl.parseRequires();
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	157 normalizePath = impl.buildNormalizePathRewrite();
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	158 dataPathHelper = impl.buildDataFilesHelper();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	159 repoPathHelper = impl.buildRepositoryFilesHelper();
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	160 }
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	161
145 acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	162 @Override
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	163 public String toString() {
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	164 return getClass().getSimpleName() + "[" + getLocation() + (isInvalid() ? "(BAD)" : "") + "]";
acc6151b1b7a toString for friendly debug Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	165 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	166
491 4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	167 /**
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	168 * 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	169 * 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	170 * as an extra description of the failure.
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	171 *
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	172 * <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	173 * 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	174 * provide {@link File}, e.g. {@link #getWorkingDir()}
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	175 *
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	176 * @return repository location information, never <code>null</code>
4a670f76e7d1 Javadoc for HgRepository#getLocation() Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	177 */
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	178 public String getLocation() {
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	179 return repoLocation;
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
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	182 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	183 return impl == null \|\| impl.isInvalid();
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	184 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	185
97 ee2c750b036d Changelog to HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 91 diff changeset	186 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	187 if (changelog == null) {
292 a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	188 CharSequence storagePath = repoPathHelper.rewrite("00changelog.i");
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	189 RevlogStream content = resolve(Path.create(storagePath), true);
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 changelog = new HgChangelog(this, content);
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	191 }
388 b015f3918120 Work on FIXME: correct HgDataFile#workingCopy with tests; BasicSessionContext with property override; platform-specific options to internals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 367 diff changeset	192 return changelog;
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	193 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	194
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	195 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	196 if (manifest == null) {
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	197 RevlogStream content = resolve(Path.create(repoPathHelper.rewrite("00manifest.i")), true);
412 63c5a9d7ca3f Follow-up for Issue 29: unify path translation for manifest and dirstate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 409 diff changeset	198 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	199 }
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	200 return manifest;
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	201 }
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	202
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	203 /**
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) {
234 b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	208 tags = new HgTags(this);
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	209 HgDataFile hgTags = getFileNode(HgTags.getPath());
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	210 if (hgTags.exists()) {
418 528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 414 diff changeset	211 for (int i = 0; i <= hgTags.getLastRevision(); i++) { // TODO post-1.0 in fact, would be handy to have walk(start,end)
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	212 // method for data files as well, though it looks odd.
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	213 try {
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	214 ByteArrayChannel sink = new ByteArrayChannel();
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	215 hgTags.content(i, sink);
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	216 final String content = new String(sink.toArray(), "UTF8");
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	217 tags.readGlobal(new StringReader(content));
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	218 } catch (CancelledException ex) {
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	219 // IGNORE, can't happen, we did not configure cancellation
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	220 getSessionContext().getLog().dump(getClass(), Debug, ex, null);
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	221 } catch (IOException ex) {
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	222 // UnsupportedEncodingException can't happen (UTF8)
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	223 // only from readGlobal. Need to reconsider exceptions thrown from there:
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	224 // BufferedReader wraps String and unlikely to throw IOException, perhaps, log is enough?
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	225 getSessionContext().getLog().dump(getClass(), Error, ex, null);
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	226 // XXX need to decide what to do this. failure to read single revision shall not break complete cycle
234 b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	227 }
b2cfbe46f9b6 HgTags got TagInfo to access tags. Tags are read from all branches/revisions now, not only working copy Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 231 diff changeset	228 }
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	229 }
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	230 File file2read = null;
c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	231 try {
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	232 file2read = new File(getWorkingDir(), HgTags.getPath());
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	233 tags.readGlobal(file2read); // XXX replace with HgDataFile.workingCopy
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	234 file2read = impl.getFileFromRepoDir(HgLocalTags.getName()); // XXX pass internalrepo to readLocal, keep filename there
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	235 tags.readLocal(file2read);
104 54562de502f7 Preliminary tags implementation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	236 } 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	237 getSessionContext().getLog().dump(getClass(), Error, ex, null);
318 c3d2233ba842 Shall propagate errors to clients, not work around them silently Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	238 throw new HgInvalidControlFileException("Failed to read tags", ex, file2read);
104 54562de502f7 Preliminary tags implementation Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	239 }
50 f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	240 }
f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	241 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	242 }
f1db8610da62 Log to consult (placeholder, for now) class to find out associated tags Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 45 diff changeset	243
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	244 /**
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	245 * Access branch information
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	246 * @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	247 * @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	248 */
366 189dc6dc1c3e Use exceptions to expose errors reading mercurial data Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 348 diff changeset	249 public HgBranches getBranches() throws HgInvalidControlFileException {
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	250 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	251 branches = new HgBranches(impl);
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	252 branches.collect(ProgressSupport.Factory.get(null));
8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	253 }
8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	254 return branches;
8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	255 }
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	256
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	257 /**
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	258 * Access state of the recent merge
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	259 * @return merge state facility, never <code>null</code>
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	260 */
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	261 public HgMergeState getMergeState() {
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	262 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	263 mergeState = new HgMergeState(impl);
231 1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	264 }
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	265 return mergeState;
1792b37650f2 Introduced access to conflict resolution information (merge state) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 229 diff changeset	266 }
220 8de327242aa0 Basic information about branches Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	267
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	268 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	269 CharSequence nPath = normalizePath.rewrite(path);
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	270 CharSequence storagePath = dataPathHelper.rewrite(nPath);
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	271 RevlogStream content = resolve(Path.create(storagePath), false);
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	272 Path p = Path.create(nPath);
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	273 if (content == null) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	274 return new HgDataFile(this, p);
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	275 }
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	276 return new HgDataFile(this, p, content);
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	277 }
1 a3576694a4d1 Repository detection from local/specified directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 0 diff changeset	278
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	279 public HgDataFile getFileNode(Path path) {
292 a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	280 CharSequence storagePath = dataPathHelper.rewrite(path.toString());
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	281 RevlogStream content = resolve(Path.create(storagePath), false);
115 c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	282 // XXX no content when no file? or HgDataFile.exists() to detect that?
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	283 if (content == null) {
c0cc2535462c Introduced channels to pipeline (and easily filter) data streams Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 114 diff changeset	284 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	285 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	286 return new HgDataFile(this, path, content);
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	287 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	288
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 141 diff changeset	289 /* 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	290 public PathRewrite getToRepoPathHelper() {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	291 return normalizePath;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	292 }
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	293
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	294 /**
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	295 * @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	296 * @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	297 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	298 public Pair<Nodeid,Nodeid> getWorkingCopyParents() 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	299 return HgDirstate.readParents(impl);
235 fd845a53f53d Experimental access to working dir parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 234 diff changeset	300 }
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	301
a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	302 /**
a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	303 * @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	304 * @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	305 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	306 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	307 if (wcBranch == 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	308 wcBranch = HgDirstate.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	309 }
d280759c2a3f branch information is not directly related to dirstate, clean API from this dependency Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	310 return wcBranch;
252 a6d19adc2636 HgRepository.getWorkingCopyBranchName() to retrieve branch associated with working directory Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 239 diff changeset	311 }
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	312
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	313 /**
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	314 * @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	315 */
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	316 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	317 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	318 }
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	319
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	320 /**
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	321 * 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	322 * known, not recursive collection of all nested sub-repositories.
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	323 * @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	324 * @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	325 */
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	326 public List<HgSubrepoLocation> getSubrepositories() throws HgInvalidControlFileException {
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	327 if (subRepos == null) {
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	328 subRepos = new SubrepoManager(this);
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	329 subRepos.read();
239 df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	330 }
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	331 return subRepos.all();
df9d2854d3d6 Initial access to subrepositories Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 237 diff changeset	332 }
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	333
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	334
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	335 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	336 if (repoConfig == null) {
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	337 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	338 ConfigFile configFile = impl.readConfiguration();
331 a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	339 repoConfig = new HgRepoConfig(configFile);
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	340 } catch (IOException ex) {
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	341 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	342 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	343 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	344 //throw new HgInvalidControlFileException(m, ex, null);
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	345 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	346 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	347 return repoConfig;
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	348 }
a37ce7145c3f Access to repository configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 318 diff changeset	349
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	350 // shall be of use only for internal classes
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	351 /package-local/ File getRepositoryRoot() {
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	352 return repoDir;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	353 }
337 f377f833b780 Issue 17: temporary code to nail down the problem Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 335 diff changeset	354
f377f833b780 Issue 17: temporary code to nail down the problem Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 335 diff changeset	355 /package-local, debug/String getStoragePath(HgDataFile df) {
418 528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 414 diff changeset	356 // may come handy for debug
337 f377f833b780 Issue 17: temporary code to nail down the problem Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 335 diff changeset	357 return dataPathHelper.rewrite(df.getPath().toString()).toString();
f377f833b780 Issue 17: temporary code to nail down the problem Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 335 diff changeset	358 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	359
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	360 // XXX package-local, unless there are cases when required from outside (guess, working dir/revision walkers may hide dirstate access and no public visibility needed)
280 35125450c804 Erroneous and slow status for working copies based on non-tip revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 252 diff changeset	361 // XXX consider passing Path pool or factory to produce (shared) Path instead of Strings
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	362 /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	363 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	364 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	365 canonicalPath = new PathRewrite() {
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	366
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	367 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	368 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	369 }
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	370 };
a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 289 diff changeset	371 }
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	372 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	373 ds.read();
348 a0864b2892cd Expose errors reading mercurial control files with exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 337 diff changeset	374 return ds;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	375 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	376
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	377 /**
086a326f181f Provide public access to ignored files configuration to use in alternative file walkers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 284 diff changeset	378 * 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	379 * @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	380 * @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	381 */
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	382 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	383 // 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	384 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	385 ignore = new HgIgnore(getToRepoPathHelper());
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	386 File ignoreFile = new File(getWorkingDir(), HgIgnore.getPath());
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	387 try {
335 3d41dc148d14 Do not fail with exception on syntax errors in .hgignore Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 331 diff changeset	388 final List<String> errors = ignore.read(ignoreFile);
3d41dc148d14 Do not fail with exception on syntax errors in .hgignore Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 331 diff changeset	389 if (errors != 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	390 getSessionContext().getLog().dump(getClass(), Warn, "Syntax errors parsing %s:\n%s", ignoreFile.getName(), Internals.join(errors, ",\n"));
335 3d41dc148d14 Do not fail with exception on syntax errors in .hgignore Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 331 diff changeset	391 }
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	392 } catch (IOException ex) {
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	393 final String m = String.format("Error reading %s file", ignoreFile);
6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	394 throw new HgInvalidControlFileException(m, ex, ignoreFile);
91 c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	395 }
c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	396 }
c2ce1cfaeb9e ignore file with regex and 'honest' glob support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	397 return ignore;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	398 }
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	399
481 a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	400 /**
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	401 * 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	402 * 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	403 *
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	404 * @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	405 * @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	406 */
482 6c67debed07e Distinguish files in wc from files under repo root, use these constants Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 481 diff changeset	407 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	408 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	409 if (!lastMessage.canRead()) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	410 return null;
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	411 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	412 FileReader fr = null;
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	413 try {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	414 fr = new FileReader(lastMessage);
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	415 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	416 fr.read(cb);
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	417 return cb.flip().toString();
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	418 } catch (IOException ex) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	419 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	420 } finally {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	421 if (fr != null) {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	422 try {
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	423 fr.close();
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	424 } 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	425 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	426 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	427 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	428 }
a458f9fb00ce Access to user-supplied message of last commit Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	429 }
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	430
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	431 private HgRepositoryLock wdLock, storeLock;
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	432
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	433 /**
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	434 * PROVISIONAL CODE, DO NOT USE
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	435 *
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	436 * 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	437 * 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	438 *
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	439 * 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	440 * 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	441 *
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	442 * @return lock object, never <code>null</code>
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	443 */
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	444 @Experimental(reason="WORK IN PROGRESS")
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	445 public HgRepositoryLock getWorkingDirLock() {
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	446 if (wdLock == null) {
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	447 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	448 File lf = impl.getFileFromRepoDir("wlock");
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	449 synchronized (this) {
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	450 if (wdLock == null) {
488 45b3b6ca046f Repository locking mechanism is alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 487 diff changeset	451 wdLock = new HgRepositoryLock(lf, timeout);
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	452 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	453 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	454 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	455 return wdLock;
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	456 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	457
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	458 @Experimental(reason="WORK IN PROGRESS")
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	459 public HgRepositoryLock getStoreLock() {
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	460 if (storeLock == null) {
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	461 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	462 File fl = impl.getFileFromRepoDir(repoPathHelper.rewrite("lock").toString());
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	463 synchronized (this) {
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	464 if (storeLock == null) {
488 45b3b6ca046f Repository locking mechanism is alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 487 diff changeset	465 storeLock = new HgRepositoryLock(fl, timeout);
486 d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	466 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	467 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	468 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	469 return storeLock;
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	470 }
d740edfff563 Provisional support for Mercurial lock mechanism Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 484 diff changeset	471
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	472 /**
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	473 * Access bookmarks-related functionality
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	474 * @return facility to manage bookmarks, never <code>null</code>
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	475 * @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	476 */
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	477 public HgBookmarks getBookmarks() throws HgInvalidControlFileException {
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	478 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	479 bookmarks = new HgBookmarks(impl);
484 ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	480 bookmarks.read();
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	481 }
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	482 return bookmarks;
ae4d6604debd Bookmarks support added Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 483 diff changeset	483 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	484
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	485 /**
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	486 * @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	487 */
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	488 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	489 return sessionContext;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	490 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	491
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	492 /**
08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	493 * Perhaps, should be separate interface, like ContentLookup
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	494 * path - repository storage path (i.e. one usually with .i or .d)
2 08db726a0fb7 Shaping out low-level Hg structures Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 1 diff changeset	495 */
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	496 /package-local/ RevlogStream resolve(Path path, boolean shallFakeNonExistent) {
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	497 final SoftReference<RevlogStream> ref = streamsCache.get(path);
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	498 RevlogStream cached = ref == null ? null : ref.get();
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	499 if (cached != null) {
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	500 return cached;
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	501 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	502 File f = new File(repoDir, path.toString());
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	503 if (f.exists()) {
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	504 RevlogStream s = new RevlogStream(impl.getDataAccess(), f);
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	505 if (impl.shallCacheRevlogs()) {
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	506 streamsCache.put(path, new SoftReference<RevlogStream>(s));
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	507 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	508 return s;
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	509 } else {
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	510 if (shallFakeNonExistent) {
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	511 try {
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	512 File fake = File.createTempFile(f.getName(), null);
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	513 fake.deleteOnExit();
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	514 return new RevlogStream(impl.getDataAccess(), fake);
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	515 } 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	516 getSessionContext().getLog().dump(getClass(), Info, ex, null);
202 706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	517 }
706bcc7cfee4 Basic test for HgIncomingCommand. Fix RepositoryComparator for cases when whole repository is unknown. Respect freshly initialized (empty) repositories in general. Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 197 diff changeset	518 }
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	519 }
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	520 return null; // XXX empty stream instead?
6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 68 diff changeset	521 }
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	522
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	523 /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	524 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	525 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	526
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	527 /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	528 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	529 }
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	530
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	531 /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	532 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	533 }
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	534
412 63c5a9d7ca3f Follow-up for Issue 29: unify path translation for manifest and dirstate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 409 diff changeset	535 /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	536 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	537 }
114 46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	538
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	539 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	540 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	541 if (factories.isEmpty()) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	542 return Collections.emptyList();
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	543 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	544 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	545 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	546 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	547 if (f != null) {
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	548 rv.add(f);
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	549 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	550 }
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	551 return rv;
46291ec605a0 Filters to read and initialize according to configuration files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 104 diff changeset	552 }
487 db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	553
db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	554 private int getLockTimeout() {
db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	555 return getConfiguration().getIntegerValue("ui", "timeout", 600);
db48a77ec8ff Access to reposiotry lock mechanism via HgRepositoryLock Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 486 diff changeset	556 }
0 dbd663faec1f Basic changelog parsing Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	557 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgRepository.java @ 491:4a670f76e7d1