Mercurial > hg4j
annotate src/org/tmatesoft/hg/repo/HgLookup.java @ 509:a30e74dca193
Establish parent-child between first and last elements of history chunks for two renamed files
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Thu, 13 Dec 2012 13:18:35 +0100 |
parents | 0bd2d0441d8f |
children | 2f9ed6bcefa2 |
rev | line source |
---|---|
74
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
1 /* |
456
909306e412e2
Refactor LogFacility and SessionContext, better API for both
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
431
diff
changeset
|
2 * Copyright (c) 2010-2012 TMate Software Ltd |
74
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
3 * |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
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:
49
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:
49
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:
49
diff
changeset
|
7 * |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
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:
49
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:
49
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:
49
diff
changeset
|
11 * GNU General Public License for more details. |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
12 * |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
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:
49
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:
95
diff
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:
49
diff
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:
431
diff
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:
431
diff
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:
172
diff
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:
169
diff
changeset
|
23 import java.net.URL; |
148
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
102
diff
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:
172
diff
changeset
|
25 import org.tmatesoft.hg.core.HgBadArgumentException; |
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:
357
diff
changeset
|
26 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:
215
diff
changeset
|
27 import org.tmatesoft.hg.core.SessionContext; |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
28 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:
172
diff
changeset
|
29 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:
151
diff
changeset
|
30 import org.tmatesoft.hg.internal.DataAccessProvider; |
503
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
31 import org.tmatesoft.hg.repo.HgRepoConfig.PathsSection; |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
32 |
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
33 /** |
148
1a7a9a20e1f9
Exceptions, javadoc. Initial cancel and progress support
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
102
diff
changeset
|
34 * Utility methods to find Mercurial repository at a given location |
74
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
35 * |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
36 * @author Artem Tikhomirov |
6f1b88693d48
Complete refactoring to org.tmatesoft
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
49
diff
changeset
|
37 * @author TMate Software Ltd. |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
38 */ |
95
bcd31a4c638a
Lookup to HgLookup
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
74
diff
changeset
|
39 public class HgLookup { |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
40 |
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:
172
diff
changeset
|
41 private ConfigFile globalCfg; |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
42 private SessionContext sessionContext; |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
43 |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
44 public HgLookup() { |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
45 } |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
46 |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
47 public HgLookup(SessionContext ctx) { |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
48 sessionContext = ctx; |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
49 } |
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:
172
diff
changeset
|
50 |
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:
357
diff
changeset
|
51 public HgRepository detectFromWorkingDir() throws HgRepositoryNotFoundException { |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
52 return detect(System.getProperty("user.dir")); |
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
53 } |
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
54 |
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:
357
diff
changeset
|
55 public HgRepository detect(String location) throws HgRepositoryNotFoundException { |
95
bcd31a4c638a
Lookup to HgLookup
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
74
diff
changeset
|
56 return detect(new File(location)); |
bcd31a4c638a
Lookup to HgLookup
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
74
diff
changeset
|
57 } |
bcd31a4c638a
Lookup to HgLookup
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
74
diff
changeset
|
58 |
bcd31a4c638a
Lookup to HgLookup
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
74
diff
changeset
|
59 // look up in specified location and above |
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:
357
diff
changeset
|
60 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:
483
diff
changeset
|
61 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:
483
diff
changeset
|
62 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:
483
diff
changeset
|
63 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:
483
diff
changeset
|
64 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:
483
diff
changeset
|
65 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:
483
diff
changeset
|
66 break; |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
67 } |
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:
483
diff
changeset
|
68 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:
483
diff
changeset
|
69 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:
483
diff
changeset
|
70 |
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:
483
diff
changeset
|
71 } 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:
483
diff
changeset
|
72 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:
483
diff
changeset
|
73 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:
102
diff
changeset
|
74 } |
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:
483
diff
changeset
|
75 String repoPath = repository.getParentFile().getAbsolutePath(); |
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:
483
diff
changeset
|
76 return new HgRepository(getContext(), repoPath, repository); |
4
aa1912c70b36
Fix offset issue for inline revlogs. Commandline processing.
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
2
diff
changeset
|
77 } |
169
8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
151
diff
changeset
|
78 |
425
48f993aa2f41
FIXMEs: exceptions, javadoc
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
423
diff
changeset
|
79 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:
151
diff
changeset
|
80 if (location == null || !location.canRead()) { |
425
48f993aa2f41
FIXMEs: exceptions, javadoc
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
423
diff
changeset
|
81 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:
151
diff
changeset
|
82 } |
357
dfb8405d996f
Clean debug stacktraces
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
295
diff
changeset
|
83 return new HgBundle(getContext(), new DataAccessProvider(getContext()), 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:
151
diff
changeset
|
84 } |
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:
172
diff
changeset
|
85 |
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:
172
diff
changeset
|
86 /** |
503
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
87 * 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:
492
diff
changeset
|
88 * |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
89 * @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:
492
diff
changeset
|
90 * @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:
172
diff
changeset
|
91 * @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:
172
diff
changeset
|
92 * @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:
172
diff
changeset
|
93 */ |
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:
172
diff
changeset
|
94 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:
172
diff
changeset
|
95 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:
172
diff
changeset
|
96 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:
172
diff
changeset
|
97 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:
172
diff
changeset
|
98 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:
172
diff
changeset
|
99 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:
172
diff
changeset
|
100 } 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:
172
diff
changeset
|
101 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:
172
diff
changeset
|
102 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:
172
diff
changeset
|
103 } |
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:
172
diff
changeset
|
104 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:
492
diff
changeset
|
105 String server = null; |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
106 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:
492
diff
changeset
|
107 PathsSection ps = hgRepo.getConfiguration().getPaths(); |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
108 server = key == null || key.trim().isEmpty() ? ps.getDefault() : ps.getString(key, null); |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
109 } 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:
492
diff
changeset
|
110 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:
492
diff
changeset
|
111 } |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
112 if (server == null) { |
0bd2d0441d8f
Add lookup of remote paths from repository's .hg/hgrc, respect default (origin)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
492
diff
changeset
|
113 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:
492
diff
changeset
|
114 } |
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:
172
diff
changeset
|
115 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:
172
diff
changeset
|
116 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:
172
diff
changeset
|
117 } |
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:
172
diff
changeset
|
118 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:
172
diff
changeset
|
119 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:
172
diff
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:
172
diff
changeset
|
121 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:
172
diff
changeset
|
122 } |
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:
172
diff
changeset
|
123 } |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
124 return new HgRemoteRepository(getContext(), 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:
172
diff
changeset
|
125 } |
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:
172
diff
changeset
|
126 |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
127 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:
170
diff
changeset
|
128 if (url == null) { |
2c3e96674e2a
Towards outgoing changes - initial detection logic, get connected with remote repo stub
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
170
diff
changeset
|
129 throw new IllegalArgumentException(); |
2c3e96674e2a
Towards outgoing changes - initial detection logic, get connected with remote repo stub
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
170
diff
changeset
|
130 } |
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:
169
diff
changeset
|
131 if (Boolean.FALSE.booleanValue()) { |
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:
169
diff
changeset
|
132 throw HgRepository.notImplemented(); |
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:
169
diff
changeset
|
133 } |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
134 return new HgRemoteRepository(getContext(), 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:
169
diff
changeset
|
135 } |
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:
172
diff
changeset
|
136 |
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:
172
diff
changeset
|
137 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:
172
diff
changeset
|
138 if (globalCfg == null) { |
483
e31e85cf4d4c
Handle include and unset directives in config files
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
456
diff
changeset
|
139 globalCfg = new ConfigFile(getContext()); |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
140 try { |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
141 globalCfg.addLocation(new File(System.getProperty("user.home"), ".hgrc")); |
483
e31e85cf4d4c
Handle include and unset directives in config files
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
456
diff
changeset
|
142 } catch (HgInvalidFileException ex) { |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
143 // XXX perhaps, makes sense to let caller/client know that we've failed to read global config? |
456
909306e412e2
Refactor LogFacility and SessionContext, better API for both
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
431
diff
changeset
|
144 getContext().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:
215
diff
changeset
|
145 } |
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:
172
diff
changeset
|
146 } |
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:
172
diff
changeset
|
147 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:
172
diff
changeset
|
148 } |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
149 |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
150 private SessionContext getContext() { |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
151 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:
425
diff
changeset
|
152 sessionContext = new BasicSessionContext(null); |
295
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
153 } |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
154 return sessionContext; |
981f9f50bb6c
Issue 11: Error log facility. SessionContext to share common facilities
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
215
diff
changeset
|
155 } |
2
08db726a0fb7
Shaping out low-level Hg structures
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff
changeset
|
156 } |