hg4j: src/org/tmatesoft/hg/repo/HgRemoteRepository.java annotate

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 665:dde18bc7053b v1.2m1

Test Copy-on-Write transactions

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 10 Jul 2013 20:16:37 +0200
parents	cd77bf51b562
children	545b1d4cc11d

rev	line source
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: diff changeset	1 /*
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	2 * Copyright (c) 2011-2013 TMate Software Ltd
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: diff changeset	3 *
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: diff changeset	4 * This program is free software; you can redistribute it and/or modify
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: diff changeset	5 * it under the terms of the GNU General Public License as published by
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: diff changeset	6 * the Free Software Foundation; version 2 of the License.
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: diff changeset	7 *
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: diff changeset	8 * This program is distributed in the hope that it will be useful,
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: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
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: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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: diff changeset	11 * GNU General Public License for more details.
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: diff changeset	12 *
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: diff changeset	13 * For information on how to redistribute this software under
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: diff changeset	14 * the terms of a license other than GNU General Public License
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: diff changeset	15 * contact TMate Software at support@hg4j.com
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: diff changeset	16 */
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: diff changeset	17 package org.tmatesoft.hg.repo;
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: diff changeset	18
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	19 import static org.tmatesoft.hg.util.LogFacility.Severity.Info;
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	20 import static org.tmatesoft.hg.util.Outcome.Kind.Failure;
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	21 import static org.tmatesoft.hg.util.Outcome.Kind.Success;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	22
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	23 import java.io.BufferedReader;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	24 import java.io.ByteArrayOutputStream;
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: diff changeset	25 import java.io.File;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	26 import java.io.FileOutputStream;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	27 import java.io.IOException;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	28 import java.io.InputStream;
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	29 import java.io.InputStreamReader;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	30 import java.io.OutputStream;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	31 import java.io.StreamTokenizer;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	32 import java.net.ContentHandler;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	33 import java.net.ContentHandlerFactory;
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	34 import java.net.HttpURLConnection;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	35 import java.net.MalformedURLException;
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	36 import java.net.URL;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	37 import java.net.URLConnection;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	38 import java.security.cert.CertificateException;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	39 import java.security.cert.X509Certificate;
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	40 import java.util.ArrayList;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	41 import java.util.Arrays;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	42 import java.util.Collection;
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	43 import java.util.Collections;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	44 import java.util.HashSet;
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	45 import java.util.Iterator;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	46 import java.util.LinkedHashMap;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	47 import java.util.LinkedList;
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: diff changeset	48 import java.util.List;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	49 import java.util.Map;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	50 import java.util.Set;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	51 import java.util.prefs.BackingStoreException;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	52 import java.util.prefs.Preferences;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	53 import java.util.zip.InflaterInputStream;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	54
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	55 import javax.net.ssl.HttpsURLConnection;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	56 import javax.net.ssl.SSLContext;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	57 import javax.net.ssl.TrustManager;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	58 import javax.net.ssl.X509TrustManager;
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: diff changeset	59
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: 179 diff changeset	60 import org.tmatesoft.hg.core.HgBadArgumentException;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	61 import org.tmatesoft.hg.core.HgIOException;
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	62 import org.tmatesoft.hg.core.HgRemoteConnectionException;
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	63 import org.tmatesoft.hg.core.HgRepositoryNotFoundException;
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: diff changeset	64 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: 274 diff changeset	65 import org.tmatesoft.hg.core.SessionContext;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	66 import org.tmatesoft.hg.internal.DataSerializer;
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	67 import org.tmatesoft.hg.internal.DataSerializer.OutputStreamSerializer;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	68 import org.tmatesoft.hg.internal.EncodingHelper;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	69 import org.tmatesoft.hg.internal.Internals;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	70 import org.tmatesoft.hg.internal.PropertyMarshal;
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	71 import org.tmatesoft.hg.util.LogFacility.Severity;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	72 import org.tmatesoft.hg.util.Outcome;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	73 import org.tmatesoft.hg.util.Pair;
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: diff changeset	74
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: diff changeset	75 /**
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: diff changeset	76 * WORK IN PROGRESS, DO NOT USE
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: diff changeset	77 *
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: diff changeset	78 * @see http://mercurial.selenic.com/wiki/WireProtocol
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	79 * @see http://mercurial.selenic.com/wiki/HttpCommandProtocol
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: diff changeset	80 *
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: diff changeset	81 * @author Artem Tikhomirov
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: diff changeset	82 * @author TMate Software Ltd.
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: diff changeset	83 */
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: 456 diff changeset	84 public class HgRemoteRepository implements SessionContext.Source {
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	85
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	86 private final URL url;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	87 private final SSLContext sslContext;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	88 private final String authInfo;
407 30922c728341 Better multiline log printout; options to tune default log output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	89 private final boolean debug;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	90 private HgLookup lookupHelper;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	91 private final SessionContext sessionContext;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	92 private Set<String> remoteCapabilities;
ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	93
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	94 static {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	95 URLConnection.setContentHandlerFactory(new ContentHandlerFactory() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	96
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	97 public ContentHandler createContentHandler(String mimetype) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	98 if ("application/mercurial-0.1".equals(mimetype)) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	99 return new ContentHandler() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	100
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	101 @Override
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	102 public Object getContent(URLConnection urlc) throws IOException {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	103 if (urlc.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	104 ByteArrayOutputStream bos = new ByteArrayOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	105 InputStream is = urlc.getInputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	106 int r;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	107 while ((r = is.read()) != -1) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	108 bos.write(r);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	109 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	110 return new String(bos.toByteArray());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	111 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	112 return "<empty>";
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	113 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	114 };
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	115 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	116 return null;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	117 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	118 });
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	119 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	120
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	121 HgRemoteRepository(SessionContext ctx, URL url) throws HgBadArgumentException {
981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	122 if (url == null \|\| ctx == null) {
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	123 throw new IllegalArgumentException();
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	124 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	125 this.url = url;
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	126 sessionContext = ctx;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	127 debug = new PropertyMarshal(ctx).getBoolean("hg4j.remote.debug", false);
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	128 if ("https".equals(url.getProtocol())) {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	129 try {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	130 sslContext = SSLContext.getInstance("SSL");
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	131 class TrustEveryone implements X509TrustManager {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	132 public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	133 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	134 System.out.println("checkClientTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	135 }
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	136 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	137 public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	138 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	139 System.out.println("checkServerTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	140 }
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	141 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	142 public X509Certificate[] getAcceptedIssuers() {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	143 return new X509Certificate[0];
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	144 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	145 };
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	146 sslContext.init(null, new TrustManager[] { new TrustEveryone() }, null);
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	147 } catch (Exception ex) {
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: 179 diff changeset	148 throw new HgBadArgumentException("Can't initialize secure connection", ex);
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	149 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	150 } else {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	151 sslContext = null;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	152 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	153 if (url.getUserInfo() != null) {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	154 String ai = null;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	155 try {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	156 // Hack to get Base64-encoded credentials
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	157 Preferences tempNode = Preferences.userRoot().node("xxx");
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	158 tempNode.putByteArray("xxx", url.getUserInfo().getBytes());
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	159 ai = tempNode.get("xxx", null);
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	160 tempNode.removeNode();
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	161 } catch (BackingStoreException ex) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	162 sessionContext.getLog().dump(getClass(), Info, ex, null);
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	163 // IGNORE
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	164 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	165 authInfo = ai;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	166 } else {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	167 authInfo = null;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	168 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	169 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	170
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	171 public boolean isInvalid() throws HgRemoteConnectionException {
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	172 initCapabilities();
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	173 return remoteCapabilities.isEmpty();
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: 179 diff changeset	174 }
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: 179 diff changeset	175
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: 179 diff changeset	176 /**
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: 179 diff changeset	177 * @return human-readable address of the server, without user credentials or any other security information
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: 179 diff changeset	178 */
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: 179 diff changeset	179 public String getLocation() {
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: 179 diff changeset	180 if (url.getUserInfo() == 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: 179 diff changeset	181 return url.toExternalForm();
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: 179 diff changeset	182 }
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: 179 diff changeset	183 if (url.getPort() != -1) {
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: 179 diff changeset	184 return String.format("%s://%s:%d%s", url.getProtocol(), url.getHost(), url.getPort(), url.getPath());
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: 179 diff changeset	185 } else {
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: 179 diff changeset	186 return String.format("%s://%s%s", url.getProtocol(), url.getHost(), url.getPath());
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: 179 diff changeset	187 }
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: 179 diff changeset	188 }
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: 456 diff changeset	189
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: 456 diff changeset	190 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: 456 diff changeset	191 return sessionContext;
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: 456 diff changeset	192 }
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: 179 diff changeset	193
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	194 public List<Nodeid> heads() throws HgRemoteConnectionException {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	195 HttpURLConnection c = null;
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	196 try {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	197 URL u = new URL(url, url.getPath() + "?cmd=heads");
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	198 c = setupConnection(u.openConnection());
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	199 c.connect();
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	200 if (debug) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	201 dumpResponseHeader(u, c);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	202 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	203 InputStreamReader is = new InputStreamReader(c.getInputStream(), "US-ASCII");
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	204 StreamTokenizer st = new StreamTokenizer(is);
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	205 st.ordinaryChars('0', '9'); // wordChars performs \|, hence need to 0 first
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	206 st.wordChars('0', '9');
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	207 st.eolIsSignificant(false);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	208 LinkedList<Nodeid> parseResult = new LinkedList<Nodeid>();
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	209 while (st.nextToken() != StreamTokenizer.TT_EOF) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	210 parseResult.add(Nodeid.fromAscii(st.sval));
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	211 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	212 return parseResult;
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	213 } catch (MalformedURLException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	214 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("heads").setServerInfo(getLocation());
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	215 } catch (IOException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	216 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("heads").setServerInfo(getLocation());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	217 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	218 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	219 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	220 }
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	221 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	222 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	223
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	224 public List<Nodeid> between(Nodeid tip, Nodeid base) throws HgRemoteConnectionException {
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	225 Range r = new Range(base, tip);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	226 // XXX shall handle errors like no range key in the returned map, not sure how.
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	227 return between(Collections.singletonList(r)).get(r);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	228 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	229
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	230 /**
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	231 * @param ranges
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	232 * @return map, where keys are input instances, values are corresponding server reply
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	233 * @throws HgRemoteConnectionException
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	234 */
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	235 public Map<Range, List<Nodeid>> between(Collection<Range> ranges) throws HgRemoteConnectionException {
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	236 if (ranges.isEmpty()) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	237 return Collections.emptyMap();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	238 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	239 // if fact, shall do other way round, this method shall send
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	240 LinkedHashMap<Range, List<Nodeid>> rv = new LinkedHashMap<HgRemoteRepository.Range, List<Nodeid>>(ranges.size() * 4 / 3);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	241 StringBuilder sb = new StringBuilder(20 + ranges.size() * 82);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	242 sb.append("pairs=");
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	243 for (Range r : ranges) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	244 sb.append(r.end.toString());
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	245 sb.append('-');
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	246 sb.append(r.start.toString());
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	247 sb.append('+');
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	248 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	249 if (sb.charAt(sb.length() - 1) == '+') {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	250 // strip last space
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	251 sb.setLength(sb.length() - 1);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	252 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	253 HttpURLConnection c = null;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	254 try {
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	255 boolean usePOST = ranges.size() > 3;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	256 URL u = new URL(url, url.getPath() + "?cmd=between" + (usePOST ? "" : '&' + sb.toString()));
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	257 c = setupConnection(u.openConnection());
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	258 if (usePOST) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	259 c.setRequestMethod("POST");
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	260 c.setRequestProperty("Content-Length", String.valueOf(sb.length()/nodeids are ASCII, bytes == characters /));
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	261 c.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	262 c.setDoOutput(true);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	263 c.connect();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	264 OutputStream os = c.getOutputStream();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	265 os.write(sb.toString().getBytes());
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	266 os.flush();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	267 os.close();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	268 } else {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	269 c.connect();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	270 }
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	271 if (debug) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	272 System.out.printf("%d ranges, method:%s \n", ranges.size(), c.getRequestMethod());
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	273 dumpResponseHeader(u, c);
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	274 }
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	275 InputStreamReader is = new InputStreamReader(c.getInputStream(), "US-ASCII");
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	276 StreamTokenizer st = new StreamTokenizer(is);
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	277 st.ordinaryChars('0', '9');
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	278 st.wordChars('0', '9');
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	279 st.eolIsSignificant(true);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	280 Iterator<Range> rangeItr = ranges.iterator();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	281 LinkedList<Nodeid> currRangeList = null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	282 Range currRange = null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	283 boolean possiblyEmptyNextLine = true;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	284 while (st.nextToken() != StreamTokenizer.TT_EOF) {
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	285 if (st.ttype == StreamTokenizer.TT_EOL) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	286 if (possiblyEmptyNextLine) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	287 // newline follows newline;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	288 assert currRange == null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	289 assert currRangeList == null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	290 if (!rangeItr.hasNext()) {
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: 414 diff changeset	291 throw new HgInvalidStateException("Internal error"); // TODO revisit-1.1
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	292 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	293 rv.put(rangeItr.next(), Collections.<Nodeid>emptyList());
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	294 } else {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	295 if (currRange == null \|\| currRangeList == null) {
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: 414 diff changeset	296 throw new HgInvalidStateException("Internal error"); // TODO revisit-1.1
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	297 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	298 // indicate next range value is needed
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	299 currRange = null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	300 currRangeList = null;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	301 possiblyEmptyNextLine = true;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	302 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	303 } else {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	304 possiblyEmptyNextLine = false;
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	305 if (currRange == null) {
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	306 if (!rangeItr.hasNext()) {
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: 414 diff changeset	307 throw new HgInvalidStateException("Internal error"); // TODO revisit-1.1
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	308 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	309 currRange = rangeItr.next();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	310 currRangeList = new LinkedList<Nodeid>();
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	311 rv.put(currRange, currRangeList);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	312 }
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	313 Nodeid nid = Nodeid.fromAscii(st.sval);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	314 currRangeList.addLast(nid);
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	315 }
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	316 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	317 is.close();
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	318 return rv;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	319 } catch (MalformedURLException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	320 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("between").setServerInfo(getLocation());
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	321 } catch (IOException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	322 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("between").setServerInfo(getLocation());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	323 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	324 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	325 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	326 }
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	327 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	328 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	329
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	330 public List<RemoteBranch> branches(List<Nodeid> nodes) throws HgRemoteConnectionException {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	331 StringBuilder sb = appendNodeidListArgument("nodes", nodes, null);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	332 HttpURLConnection c = null;
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	333 try {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	334 URL u = new URL(url, url.getPath() + "?cmd=branches&" + sb.toString());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	335 c = setupConnection(u.openConnection());
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	336 c.connect();
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	337 if (debug) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	338 dumpResponseHeader(u, c);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	339 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	340 InputStreamReader is = new InputStreamReader(c.getInputStream(), "US-ASCII");
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	341 StreamTokenizer st = new StreamTokenizer(is);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	342 st.ordinaryChars('0', '9');
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	343 st.wordChars('0', '9');
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	344 st.eolIsSignificant(false);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	345 ArrayList<Nodeid> parseResult = new ArrayList<Nodeid>(nodes.size() * 4);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	346 while (st.nextToken() != StreamTokenizer.TT_EOF) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	347 parseResult.add(Nodeid.fromAscii(st.sval));
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	348 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	349 if (parseResult.size() != nodes.size() * 4) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	350 throw new HgRemoteConnectionException(String.format("Bad number of nodeids in result (shall be factor 4), expected %d, got %d", nodes.size()*4, parseResult.size()));
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	351 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	352 ArrayList<RemoteBranch> rv = new ArrayList<RemoteBranch>(nodes.size());
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	353 for (int i = 0; i < nodes.size(); i++) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	354 RemoteBranch rb = new RemoteBranch(parseResult.get(i4), parseResult.get(i4 + 1), parseResult.get(i4 + 2), parseResult.get(i4 + 3));
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	355 rv.add(rb);
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	356 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	357 return rv;
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	358 } catch (MalformedURLException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	359 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("branches").setServerInfo(getLocation());
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	360 } catch (IOException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	361 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("branches").setServerInfo(getLocation());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	362 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	363 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	364 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	365 }
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	366 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	367 }
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: diff changeset	368
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	369 /*
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: 190 diff changeset	370 * XXX need to describe behavior when roots arg is empty; our RepositoryComparator code currently returns empty lists when
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: 190 diff changeset	371 * no common elements found, which in turn means we need to query changes starting with NULL nodeid.
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: 190 diff changeset	372 *
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	373 * WireProtocol wiki: roots = a list of the latest nodes on every service side changeset branch that both the client and server know about.
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	374 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	375 * Perhaps, shall be named 'changegroup'
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	376
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	377 * Changegroup:
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	378 * http://mercurial.selenic.com/wiki/Merge
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	379 * http://mercurial.selenic.com/wiki/WireProtocol
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	380 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	381 * according to latter, bundleformat data is sent through zlib
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	382 * (there's no header like HG10?? with the server output, though,
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	383 * as one may expect according to http://mercurial.selenic.com/wiki/BundleFormat)
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	384 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	385 public HgBundle getChanges(List<Nodeid> roots) throws HgRemoteConnectionException, HgRuntimeException {
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: 190 diff changeset	386 List<Nodeid> _roots = roots.isEmpty() ? Collections.singletonList(Nodeid.NULL) : roots;
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	387 StringBuilder sb = appendNodeidListArgument("roots", _roots, null);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	388 HttpURLConnection c = null;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	389 try {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	390 URL u = new URL(url, url.getPath() + "?cmd=changegroup&" + sb.toString());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	391 c = setupConnection(u.openConnection());
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	392 c.connect();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	393 if (debug) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	394 dumpResponseHeader(u, c);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	395 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	396 File tf = writeBundle(c.getInputStream(), false, "HG10GZ" /didn't see any other that zip/);
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	397 if (debug) {
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 207 diff changeset	398 System.out.printf("Wrote bundle %s for roots %s\n", tf, sb);
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	399 }
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	400 return getLookupHelper().loadBundle(tf);
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	401 } catch (MalformedURLException ex) { // XXX in fact, this exception might be better to be re-thrown as RuntimeEx,
41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	402 // as there's little user can do about this issue (URLs are constructed by our code)
41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	403 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("changegroup").setServerInfo(getLocation());
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	404 } catch (IOException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	405 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("changegroup").setServerInfo(getLocation());
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	406 } catch (HgRepositoryNotFoundException ex) {
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	407 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("changegroup").setServerInfo(getLocation());
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	408 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	409 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	410 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	411 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	412 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	413 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	414
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	415 public void unbundle(HgBundle bundle, List<Nodeid> remoteHeads) throws HgRemoteConnectionException, HgRuntimeException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	416 if (remoteHeads == null) {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	417 // TODO collect heads from bundle:
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	418 // bundle.inspectChangelog(new HeadCollector(for each c : if collected has c.p1 or c.p2, remove them. Add c))
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	419 // or get from remote server???
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	420 throw Internals.notImplemented();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	421 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	422 StringBuilder sb = appendNodeidListArgument("heads", remoteHeads, null);
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	423
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	424 HttpURLConnection c = null;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	425 DataSerializer.DataSource bundleData = bundle.new BundleSerializer();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	426 try {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	427 URL u = new URL(url, url.getPath() + "?cmd=unbundle&" + sb.toString());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	428 c = setupConnection(u.openConnection());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	429 c.setRequestMethod("POST");
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	430 c.setRequestProperty("Content-Length", String.valueOf(bundleData.serializeLength()));
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	431 c.setRequestProperty("Content-Type", "application/mercurial-0.1");
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	432 c.setDoOutput(true);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	433 c.connect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	434 OutputStream os = c.getOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	435 bundleData.serialize(new OutputStreamSerializer(os));
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	436 os.flush();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	437 os.close();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	438 if (debug) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	439 dumpResponseHeader(u, c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	440 dumpResponse(c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	441 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	442 checkResponseOk(c, "Push", "unbundle");
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	443 } catch (MalformedURLException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	444 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("unbundle").setServerInfo(getLocation());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	445 } catch (IOException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	446 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("unbundle").setServerInfo(getLocation());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	447 } catch (HgIOException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	448 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("unbundle").setServerInfo(getLocation());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	449 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	450 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	451 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	452 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	453 }
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: diff changeset	454 }
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	455
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	456 public Bookmarks getBookmarks() throws HgRemoteConnectionException, HgRuntimeException {
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	457 final String actionName = "Get remote bookmarks";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	458 final List<Pair<String, String>> values = listkeys("bookmarks", actionName);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	459 ArrayList<Pair<String, Nodeid>> rv = new ArrayList<Pair<String, Nodeid>>();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	460 for (Pair<String, String> l : values) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	461 if (l.second().length() != Nodeid.SIZE_ASCII) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	462 sessionContext.getLog().dump(getClass(), Severity.Warn, "%s: bad nodeid '%s', ignored", actionName, l.second());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	463 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	464 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	465 Nodeid n = Nodeid.fromAscii(l.second());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	466 String bm = new String(l.first());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	467 rv.add(new Pair<String, Nodeid>(bm, n));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	468 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	469 return new Bookmarks(rv);
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	470 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	471
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	472 public Outcome updateBookmark(String name, Nodeid oldRev, Nodeid newRev) throws HgRemoteConnectionException, HgRuntimeException {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	473 initCapabilities();
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	474 if (!remoteCapabilities.contains("pushkey")) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	475 return new Outcome(Failure, "Server doesn't support pushkey protocol");
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	476 }
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	477 if (pushkey("Update remote bookmark", "bookmarks", name, oldRev.toString(), newRev.toString())) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	478 return new Outcome(Success, String.format("Bookmark %s updated to %s", name, newRev.shortNotation()));
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	479 }
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	480 return new Outcome(Failure, String.format("Bookmark update (%s: %s -> %s) failed", name, oldRev.shortNotation(), newRev.shortNotation()));
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	481 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	482
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	483 public Phases getPhases() throws HgRemoteConnectionException, HgRuntimeException {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	484 initCapabilities();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	485 if (!remoteCapabilities.contains("pushkey")) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	486 // old server defaults to publishing
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	487 return new Phases(true, Collections.<Nodeid>emptyList());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	488 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	489 final List<Pair<String, String>> values = listkeys("phases", "Get remote phases");
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	490 boolean publishing = false;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	491 ArrayList<Nodeid> draftRoots = new ArrayList<Nodeid>();
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	492 for (Pair<String, String> l : values) {
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	493 if ("publishing".equalsIgnoreCase(l.first())) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	494 publishing = Boolean.parseBoolean(l.second());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	495 continue;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	496 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	497 Nodeid root = Nodeid.fromAscii(l.first());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	498 int ph = Integer.parseInt(l.second());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	499 if (ph == HgPhase.Draft.mercurialOrdinal()) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	500 draftRoots.add(root);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	501 } else {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	502 assert false;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	503 sessionContext.getLog().dump(getClass(), Severity.Error, "Unexpected phase value %d for revision %s", ph, root);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	504 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	505 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	506 return new Phases(publishing, draftRoots);
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	507 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	508
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	509 public Outcome updatePhase(HgPhase from, HgPhase to, Nodeid n) throws HgRemoteConnectionException, HgRuntimeException {
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	510 initCapabilities();
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	511 if (!remoteCapabilities.contains("pushkey")) {
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	512 return new Outcome(Failure, "Server doesn't support pushkey protocol");
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	513 }
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	514 if (pushkey("Update remote phases", "phases", n.toString(), String.valueOf(from.mercurialOrdinal()), String.valueOf(to.mercurialOrdinal()))) {
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	515 return new Outcome(Success, String.format("Phase of %s updated to %s", n.shortNotation(), to.name()));
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	516 }
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	517 return new Outcome(Failure, String.format("Phase update (%s: %s -> %s) failed", n.shortNotation(), from.name(), to.name()));
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	518 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	519
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	520 @Override
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	521 public String toString() {
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	522 return getClass().getSimpleName() + '[' + getLocation() + ']';
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	523 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	524
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	525
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	526 private void initCapabilities() throws HgRemoteConnectionException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	527 if (remoteCapabilities == null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	528 remoteCapabilities = new HashSet<String>();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	529 // say hello to server, check response
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	530 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	531 URL u = new URL(url, url.getPath() + "?cmd=hello");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	532 HttpURLConnection c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	533 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	534 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	535 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	536 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	537 BufferedReader r = new BufferedReader(new InputStreamReader(c.getInputStream(), "US-ASCII"));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	538 String line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	539 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	540 final String capsPrefix = "capabilities:";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	541 if (line == null \|\| !line.startsWith(capsPrefix)) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	542 // for whatever reason, some servers do not respond to hello command (e.g. svnkit)
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	543 // but respond to 'capabilities' instead. Try it.
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	544 // TODO [post-1.0] tests needed
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	545 u = new URL(url, url.getPath() + "?cmd=capabilities");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	546 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	547 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	548 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	549 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	550 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	551 r = new BufferedReader(new InputStreamReader(c.getInputStream(), "US-ASCII"));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	552 line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	553 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	554 if (line == null \|\| line.trim().length() == 0) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	555 return;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	556 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	557 } else {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	558 line = line.substring(capsPrefix.length()).trim();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	559 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	560 String[] caps = line.split("\\s");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	561 remoteCapabilities.addAll(Arrays.asList(caps));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	562 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	563 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	564 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("hello").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	565 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	566 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("hello").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	567 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	568 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	569 }
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	570
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	571 private HgLookup getLookupHelper() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	572 if (lookupHelper == null) {
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	573 lookupHelper = new HgLookup(sessionContext);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	574 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	575 return lookupHelper;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	576 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	577
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	578 private List<Pair<String,String>> listkeys(String namespace, String actionName) throws HgRemoteConnectionException, HgRuntimeException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	579 HttpURLConnection c = null;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	580 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	581 URL u = new URL(url, url.getPath() + "?cmd=listkeys&namespace=" + namespace);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	582 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	583 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	584 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	585 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	586 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	587 checkResponseOk(c, actionName, "listkeys");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	588 ArrayList<Pair<String, String>> rv = new ArrayList<Pair<String, String>>();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	589 BufferedReader r = new BufferedReader(new InputStreamReader(c.getInputStream(), EncodingHelper.getUTF8()));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	590 String l;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	591 while ((l = r.readLine()) != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	592 int sep = l.indexOf('\t');
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	593 if (sep == -1) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	594 sessionContext.getLog().dump(getClass(), Severity.Warn, "%s: bad line '%s', ignored", actionName, l);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	595 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	596 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	597 rv.add(new Pair<String,String>(l.substring(0, sep), l.substring(sep+1)));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	598 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	599 r.close();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	600 return rv;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	601 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	602 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("listkeys").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	603 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	604 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("listkeys").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	605 } finally {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	606 if (c != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	607 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	608 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	609 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	610 }
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	611
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	612 private boolean pushkey(String opName, String namespace, String key, String oldValue, String newValue) throws HgRemoteConnectionException, HgRuntimeException {
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	613 HttpURLConnection c = null;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	614 try {
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	615 final String p = String.format("%s?cmd=pushkey&namespace=%s&key=%s&old=%s&new=%s", url.getPath(), namespace, key, oldValue, newValue);
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	616 URL u = new URL(url, p);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	617 c = setupConnection(u.openConnection());
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	618 c.setRequestMethod("POST");
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	619 c.connect();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	620 if (debug) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	621 dumpResponseHeader(u, c);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	622 }
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 651 diff changeset	623 checkResponseOk(c, opName, "pushkey");
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	624 final InputStream is = c.getInputStream();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	625 int rv = is.read();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	626 is.close();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	627 return rv == '1';
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	628 } catch (MalformedURLException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	629 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	630 } catch (IOException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	631 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	632 } finally {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	633 if (c != null) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	634 c.disconnect();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	635 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	636 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	637 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	638
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	639 private void checkResponseOk(HttpURLConnection c, String opName, String remoteCmd) throws HgRemoteConnectionException, IOException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	640 if (c.getResponseCode() != 200) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	641 String m = c.getResponseMessage() == null ? "unknown reason" : c.getResponseMessage();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	642 String em = String.format("%s failed: %s (HTTP error:%d)", opName, m, c.getResponseCode());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	643 throw new HgRemoteConnectionException(em).setRemoteCommand(remoteCmd).setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	644 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	645 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	646
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	647 private HttpURLConnection setupConnection(URLConnection urlConnection) {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	648 urlConnection.setRequestProperty("User-Agent", "hg4j/1.0.0");
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	649 urlConnection.addRequestProperty("Accept", "application/mercurial-0.1");
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	650 if (authInfo != null) {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	651 urlConnection.addRequestProperty("Authorization", "Basic " + authInfo);
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	652 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	653 if (sslContext != null) {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	654 ((HttpsURLConnection) urlConnection).setSSLSocketFactory(sslContext.getSocketFactory());
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	655 }
177 e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	656 return (HttpURLConnection) urlConnection;
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	657 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	658
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	659 private StringBuilder appendNodeidListArgument(String key, List<Nodeid> values, StringBuilder sb) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	660 if (sb == null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	661 sb = new StringBuilder(20 + values.size() * 41);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	662 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	663 sb.append(key);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	664 sb.append('=');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	665 for (Nodeid n : values) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	666 sb.append(n.toString());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	667 sb.append('+');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	668 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	669 if (sb.charAt(sb.length() - 1) == '+') {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	670 // strip last space
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	671 sb.setLength(sb.length() - 1);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	672 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	673 return sb;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	674 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	675
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	676 private void dumpResponseHeader(URL u, HttpURLConnection c) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	677 System.out.printf("Query (%d bytes):%s\n", u.getQuery().length(), u.getQuery());
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	678 System.out.println("Response headers:");
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	679 final Map<String, List<String>> headerFields = c.getHeaderFields();
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	680 for (String s : headerFields.keySet()) {
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	681 System.out.printf("%s: %s\n", s, c.getHeaderField(s));
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	682 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	683 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	684
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	685 private void dumpResponse(HttpURLConnection c) throws IOException {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	686 if (c.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	687 final Object content = c.getContent();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	688 System.out.println(content);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	689 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	690 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	691
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	692 private static File writeBundle(InputStream is, boolean decompress, String header) throws IOException {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	693 InputStream zipStream = decompress ? new InflaterInputStream(is) : is;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	694 File tf = File.createTempFile("hg4j-bundle-", null);
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	695 FileOutputStream fos = new FileOutputStream(tf);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	696 fos.write(header.getBytes());
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	697 int r;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	698 byte[] buf = new byte[8*1024];
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	699 while ((r = zipStream.read(buf)) != -1) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	700 fos.write(buf, 0, r);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	701 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	702 fos.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	703 zipStream.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	704 return tf;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	705 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	706
178 62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	707
176 a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	708 public static final class Range {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	709 /**
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	710 * Root of the range, earlier revision
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	711 */
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	712 public final Nodeid start;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	713 /**
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	714 * Head of the range, later revision.
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	715 */
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	716 public final Nodeid end;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	717
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	718 /**
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	719 * @param from - root/base revision
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	720 * @param to - head/tip revision
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	721 */
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	722 public Range(Nodeid from, Nodeid to) {
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	723 start = from;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	724 end = to;
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	725 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	726 }
184 ec1820f64d2b Complete incoming cmdline client, with both lite (revisions) and complete (full changeset) information dump Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 181 diff changeset	727
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	728 public static final class RemoteBranch {
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	729 public final Nodeid head, root, p1, p2;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	730
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	731 public RemoteBranch(Nodeid h, Nodeid r, Nodeid parent1, Nodeid parent2) {
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	732 head = h;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	733 root = r;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	734 p1 = parent1;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	735 p2 = parent2;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	736 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	737
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	738 @Override
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	739 public boolean equals(Object obj) {
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	740 if (this == obj) {
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	741 return true;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	742 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	743 if (false == obj instanceof RemoteBranch) {
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	744 return false;
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	745 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	746 RemoteBranch o = (RemoteBranch) obj;
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	747 // in fact, p1 and p2 are not supposed to be null, ever (at least for RemoteBranch created from server output)
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	748 return head.equals(o.head) && root.equals(o.root) && (p1 == null && o.p1 == null \|\| p1.equals(o.p1)) && (p2 == null && o.p2 == null \|\| p2.equals(o.p2));
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	749 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	750 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	751
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	752 public static final class Bookmarks implements Iterable<Pair<String, Nodeid>> {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	753 private final List<Pair<String, Nodeid>> bm;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	754
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	755 private Bookmarks(List<Pair<String, Nodeid>> bookmarks) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	756 bm = bookmarks;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	757 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	758
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	759 public Iterator<Pair<String, Nodeid>> iterator() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	760 return bm.iterator();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	761 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	762 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	763
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	764 public static final class Phases {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	765 private final boolean pub;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	766 private final List<Nodeid> droots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	767
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	768 private Phases(boolean publishing, List<Nodeid> draftRoots) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	769 pub = publishing;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	770 droots = draftRoots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	771 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	772
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	773 /**
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	774 * Non-publishing servers may (shall?) respond with a list of draft roots.
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	775 * This method doesn't make sense when {@link #isPublishingServer()} is <code>true</code>
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	776 *
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	777 * @return list of draft roots on remote server
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	778 */
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	779 public List<Nodeid> draftRoots() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	780 return droots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	781 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	782
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	783 /**
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	784 * @return <code>true</code> if revisions on remote server shall be deemed published (either
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	785 * old server w/o explicit setting, or a new one with <code>phases.publish == true</code>)
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	786 */
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	787 public boolean isPublishingServer() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	788 return pub;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	789 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	790 }
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: diff changeset	791 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 665:dde18bc7053b v1.2m1