Mercurial > jhg
annotate src/org/tmatesoft/hg/repo/HgLookup.java @ 678:8625cba0a5a8
Towards better blame of merge revisions: refactor merge handling strategy
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 19 Jul 2013 15:36:29 +0200 | 
| parents | 6526d8adbc0f | 
| children | 822f3a83ff57 | 
| rev | line source | 
|---|---|
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 1 /* | 
| 578 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 2 * Copyright (c) 2010-2013 TMate Software Ltd | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 3 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
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: 
49diff
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: 
49diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 7 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
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: 
49diff
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: 
49diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 11 * GNU General Public License for more details. | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 12 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 13 * For information on how to redistribute this software under | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
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: 
95diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 17 package org.tmatesoft.hg.repo; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 456 
909306e412e2
Refactor LogFacility and SessionContext, better API for both
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
431diff
changeset | 19 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn; | 
| 
909306e412e2
Refactor LogFacility and SessionContext, better API for both
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
431diff
changeset | 20 | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 21 import java.io.File; | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 22 import java.net.MalformedURLException; | 
| 170 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
169diff
changeset | 23 import java.net.URL; | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 24 | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 25 import org.tmatesoft.hg.core.HgBadArgumentException; | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 26 import org.tmatesoft.hg.core.HgIOException; | 
| 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: 
357diff
changeset | 27 import org.tmatesoft.hg.core.HgRepositoryNotFoundException; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 28 import org.tmatesoft.hg.core.SessionContext; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 29 import org.tmatesoft.hg.internal.BasicSessionContext; | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 30 import org.tmatesoft.hg.internal.ConfigFile; | 
| 169 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
151diff
changeset | 31 import org.tmatesoft.hg.internal.DataAccessProvider; | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
503diff
changeset | 32 import org.tmatesoft.hg.internal.Internals; | 
| 578 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 33 import org.tmatesoft.hg.internal.RequiresFile; | 
| 503 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 34 import org.tmatesoft.hg.repo.HgRepoConfig.PathsSection; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 35 | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 36 /** | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 37 * Utility methods to find Mercurial repository at a given location | 
| 74 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 38 * | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 39 * @author Artem Tikhomirov | 
| 
6f1b88693d48
Complete refactoring to org.tmatesoft
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
49diff
changeset | 40 * @author TMate Software Ltd. | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 */ | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 42 public class HgLookup implements SessionContext.Source { | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 44 private ConfigFile globalCfg; | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 45 private SessionContext sessionContext; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 46 | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 47 public HgLookup() { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 48 } | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 49 | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 50 public HgLookup(SessionContext ctx) { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 51 sessionContext = ctx; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 52 } | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 53 | 
| 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: 
357diff
changeset | 54 public HgRepository detectFromWorkingDir() throws HgRepositoryNotFoundException { | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 55 return detect(System.getProperty("user.dir")); | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 } | 
| 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 57 | 
| 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: 
357diff
changeset | 58 public HgRepository detect(String location) throws HgRepositoryNotFoundException { | 
| 95 
bcd31a4c638a
Lookup to HgLookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 59 return detect(new File(location)); | 
| 
bcd31a4c638a
Lookup to HgLookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 60 } | 
| 
bcd31a4c638a
Lookup to HgLookup
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
74diff
changeset | 61 | 
| 578 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 62 /** | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 63 * Look up repository in specified location and above | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 64 * | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 65 * @param location where to look for .hg directory, never <code>null</code> | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 66 * @return repository object, never <code>null</code> | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 67 * @throws HgRepositoryNotFoundException if no repository found, or repository version is not supported | 
| 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 68 */ | 
| 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: 
357diff
changeset | 69 public HgRepository detect(File location) throws HgRepositoryNotFoundException { | 
| 492 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 70 File dir = location.getAbsoluteFile(); | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 71 File repository; | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 72 do { | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 73 repository = new File(dir, ".hg"); | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 74 if (repository.exists() && repository.isDirectory()) { | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 75 break; | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 76 } | 
| 492 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 77 repository = null; | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 78 dir = dir.getParentFile(); | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 79 | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 80 } while(dir != null); | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 81 if (repository == null) { | 
| 
e4eaa23e3442
Leave path as close as possible to one supplied by user. No need to keep it as canonical
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
483diff
changeset | 82 throw new HgRepositoryNotFoundException(String.format("Can't locate .hg/ directory of Mercurial repository in %s nor in parent dirs", location)).setLocation(location.getPath()); | 
| 148 
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
102diff
changeset | 83 } | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 84 try { | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 85 String repoPath = repository.getParentFile().getAbsolutePath(); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 86 HgRepository rv = new HgRepository(getSessionContext(), repoPath, repository); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 87 int requiresFlags = rv.getImplHelper().getRequiresFlags(); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 88 if ((requiresFlags & RequiresFile.REVLOGV1) == 0) { | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 89 throw new HgRepositoryNotFoundException(String.format("%s: repository version is not supported (Mercurial <0.9?)", repoPath)).setLocation(location.getPath()); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 90 } | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 91 return rv; | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 92 } catch (HgRuntimeException ex) { | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 93 HgRepositoryNotFoundException e = new HgRepositoryNotFoundException("Failed to initialize Hg4J library").setLocation(location.getPath()); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 94 e.initCause(ex); | 
| 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 95 throw e; | 
| 578 
f97e81d13190
Throw exception if repository encountered is too old for Hg4J
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
526diff
changeset | 96 } | 
| 4 
aa1912c70b36
Fix offset issue for inline revlogs. Commandline processing.
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
2diff
changeset | 97 } | 
| 169 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
151diff
changeset | 98 | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 99 public HgBundle loadBundle(File location) throws HgRepositoryNotFoundException { | 
| 169 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
151diff
changeset | 100 if (location == null || !location.canRead()) { | 
| 425 
48f993aa2f41
FIXMEs: exceptions, javadoc
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
423diff
changeset | 101 throw new HgRepositoryNotFoundException(String.format("Can't read file %s", location)).setLocation(String.valueOf(location)); | 
| 169 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
151diff
changeset | 102 } | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 103 return new HgBundle(getSessionContext(), new DataAccessProvider(getSessionContext()), location).link(); | 
| 169 
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
151diff
changeset | 104 } | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 105 | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 106 /** | 
| 503 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 107 * Try to instantiate remote server using an immediate url or an url from configuration files | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 108 * | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 109 * @param key either URL or a key from configuration file that points to remote server; if <code>null</code> or empty string, default remote location of the supplied repository (if any) is looked up | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 110 * @param hgRepo optional local repository to get default or otherwise configured remote location | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 111 * @return an instance featuring access to remote repository, check {@link HgRemoteRepository#isInvalid()} before actually using it | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 112 * @throws HgBadArgumentException if anything is wrong with the remote server's URL | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 113 */ | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 114 public HgRemoteRepository detectRemote(String key, HgRepository hgRepo) throws HgBadArgumentException { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 115 URL url; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 116 Exception toReport; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 117 try { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 118 url = new URL(key); | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 119 toReport = null; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 120 } catch (MalformedURLException ex) { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 121 url = null; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 122 toReport = ex; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 123 } | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 124 if (url == null) { | 
| 503 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 125 String server = null; | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 126 if (hgRepo != null && !hgRepo.isInvalid()) { | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 127 PathsSection ps = hgRepo.getConfiguration().getPaths(); | 
| 622 
4e6179bde4fc
Update to comply with Java 1.5 target
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
618diff
changeset | 128 server = key == null || key.trim().length() == 0 ? ps.getDefault() : ps.getString(key, null); // XXX Java 1.5 isEmpty() | 
| 503 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 129 } else if (key == null || key.trim().length() == 0) { | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 130 throw new HgBadArgumentException("Can't look up empty key in a global configuration", null); | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 131 } | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 132 if (server == null) { | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 133 server = getGlobalConfig().getSection("paths").get(key); | 
| 
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
492diff
changeset | 134 } | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 135 if (server == null) { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 136 throw new HgBadArgumentException(String.format("Can't find server %s specification in the config", key), toReport); | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 137 } | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 138 try { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 139 url = new URL(server); | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 140 } catch (MalformedURLException ex) { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 141 throw new HgBadArgumentException(String.format("Found %s server spec in the config, but failed to initialize with it", key), ex); | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 142 } | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 143 } | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 144 return new HgRemoteRepository(getSessionContext(), url); | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 145 } | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 146 | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 147 public HgRemoteRepository detect(URL url) throws HgBadArgumentException { | 
| 171 
2c3e96674e2a
Towards outgoing changes - initial detection logic, get connected with remote repo stub
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
170diff
changeset | 148 if (url == null) { | 
| 
2c3e96674e2a
Towards outgoing changes - initial detection logic, get connected with remote repo stub
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
170diff
changeset | 149 throw new IllegalArgumentException(); | 
| 
2c3e96674e2a
Towards outgoing changes - initial detection logic, get connected with remote repo stub
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
170diff
changeset | 150 } | 
| 170 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
169diff
changeset | 151 if (Boolean.FALSE.booleanValue()) { | 
| 526 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
503diff
changeset | 152 throw Internals.notImplemented(); | 
| 170 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
169diff
changeset | 153 } | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 154 return new HgRemoteRepository(getSessionContext(), url); | 
| 170 
71ddbf8603e8
Initial clone: populate given directory from a bundle. Everything but remote server access is there, albeit prototype code style
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
169diff
changeset | 155 } | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 156 | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 157 private ConfigFile getGlobalConfig() { | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 158 if (globalCfg == null) { | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 159 globalCfg = new ConfigFile(getSessionContext()); | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 160 try { | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 161 globalCfg.addLocation(new File(System.getProperty("user.home"), ".hgrc")); | 
| 628 
6526d8adbc0f
Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
622diff
changeset | 162 } catch (HgIOException ex) { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 163 // XXX perhaps, makes sense to let caller/client know that we've failed to read global config? | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 164 getSessionContext().getLog().dump(getClass(), Warn, ex, null); | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 165 } | 
| 181 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 166 } | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 167 return globalCfg; | 
| 
cd3371670f0b
Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
172diff
changeset | 168 } | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 169 | 
| 618 
7c0d2ce340b8
Refactor approach how content finds it way down to a commit revision
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
578diff
changeset | 170 public SessionContext getSessionContext() { | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 171 if (sessionContext == null) { | 
| 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: 
425diff
changeset | 172 sessionContext = new BasicSessionContext(null); | 
| 295 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 173 } | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 174 return sessionContext; | 
| 
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
215diff
changeset | 175 } | 
| 2 
08db726a0fb7
Shaping out low-level Hg structures
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 176 } | 
