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

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 648:690e71d29bf6

Introduced RevisionSet to ease update of phase roots on push

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 25 Jun 2013 20:48:37 +0200
parents	3b7d51ed4c65
children	e79cf9a8130b

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;
909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	20
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	21 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	22 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	23 import java.io.File;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	24 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	25 import java.io.IOException;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	26 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	27 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	28 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	29 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	30 import java.net.ContentHandler;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	31 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	32 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	33 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	34 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	35 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	36 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	37 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	38 import java.util.ArrayList;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	39 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	40 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	41 import java.util.Collections;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	42 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	43 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	44 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	45 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	46 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	47 import java.util.Map;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	48 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	49 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	50 import java.util.prefs.Preferences;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	51 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	52
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	53 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	54 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	55 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	56 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	57
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	58 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	59 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	60 import org.tmatesoft.hg.core.HgRemoteConnectionException;
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	61 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	62 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	63 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	64 import org.tmatesoft.hg.internal.DataSerializer;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	65 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	66 import org.tmatesoft.hg.internal.Internals;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	67 import org.tmatesoft.hg.internal.DataSerializer.OutputStreamSerializer;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	68 import org.tmatesoft.hg.internal.PropertyMarshal;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	69 import org.tmatesoft.hg.util.Pair;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	70 import org.tmatesoft.hg.util.LogFacility.Severity;
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	71
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	72 /**
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	73 * 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	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 * @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	76 * @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	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 * @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	79 * @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	80 */
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	81 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	82
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	83 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	84 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	85 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	86 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	87 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	88 private final SessionContext sessionContext;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	89 private Set<String> remoteCapabilities;
ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	90
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	91 static {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	92 URLConnection.setContentHandlerFactory(new ContentHandlerFactory() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	93
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	94 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	95 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	96 return new ContentHandler() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	97
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	98 @Override
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	99 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	100 if (urlc.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	101 ByteArrayOutputStream bos = new ByteArrayOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	102 InputStream is = urlc.getInputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	103 int r;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	104 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	105 bos.write(r);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	106 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	107 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	108 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	109 return "<empty>";
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	110 }
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 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	113 return null;
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 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	117
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	118 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	119 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	120 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	121 }
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	122 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	123 sessionContext = ctx;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	124 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	125 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	126 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	127 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	128 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	129 public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	130 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	131 System.out.println("checkClientTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	132 }
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	133 }
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	134 public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	135 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	136 System.out.println("checkServerTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	137 }
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	138 }
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	139 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	140 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	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 };
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 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	144 } 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	145 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	146 }
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 } 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	148 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	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 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	151 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	152 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	153 // 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	154 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	155 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	156 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	157 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	158 } catch (BackingStoreException ex) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	159 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	160 // 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	161 }
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	162 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	163 } 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	164 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	165 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	166 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	167
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	168 public boolean isInvalid() throws HgRemoteConnectionException {
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	169 initCapabilities();
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	170 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	171 }
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	172
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	173 /**
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 * @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	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 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	177 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	178 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	179 }
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.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	181 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	182 } 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	183 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	184 }
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 }
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	186
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	187 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	188 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	189 }
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	190
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	191 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	192 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	193 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	194 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	195 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	196 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	197 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	198 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	199 }
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 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	201 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	202 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	203 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	204 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	205 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	206 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	207 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	208 }
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 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	210 } 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	211 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	212 } 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	213 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	214 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	215 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	216 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	217 }
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	218 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	219 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	220
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	221 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	222 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	223 // 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	224 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	225 }
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
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 /**
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 * @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	229 * @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	230 * @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	231 */
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	232 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	233 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	234 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	235 }
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 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	237 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	238 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	239 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	240 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	241 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	242 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	243 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	244 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	245 }
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 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	247 // 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	248 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	249 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	250 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	251 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	252 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	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261 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	262 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	263 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	264 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	265 } 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	266 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	267 }
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	268 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	269 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	270 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	271 }
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	272 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	273 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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283 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	284 // 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	285 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	286 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	287 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	288 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	289 }
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 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	291 } 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	292 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	293 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	294 }
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 // 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	296 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	297 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	298 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	299 }
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 } 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	301 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	302 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	303 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	304 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	305 }
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 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	307 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	308 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	309 }
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 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	311 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	312 }
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	313 }
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	314 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	315 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	316 } 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	317 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	318 } 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	319 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	320 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	321 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	322 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	323 }
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	324 }
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	325 }
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	326
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	327 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	328 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	329 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	330 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	331 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	332 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	333 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	334 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	335 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	336 }
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 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	338 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	339 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	340 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	341 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	342 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	343 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	344 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	345 }
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 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	347 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	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 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	350 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	351 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	352 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	353 }
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 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	355 } 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	356 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	357 } 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	358 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	359 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	360 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	361 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	362 }
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	363 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	364 }
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	365
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	366 /*
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	367 * 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	368 * 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	369 *
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	370 * 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	371 *
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	372 * 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	373
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 * 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	375 * 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	376 * 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	377 *
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 * 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	379 * (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	380 * 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	381 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	382 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	383 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	384 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	385 HttpURLConnection c = null;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	386 try {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	387 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	388 c = setupConnection(u.openConnection());
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	389 c.connect();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	390 if (debug) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	391 dumpResponseHeader(u, c);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	392 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	393 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	394 if (debug) {
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 207 diff changeset	395 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	396 }
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	397 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	398 } 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	399 // 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	400 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	401 } 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	402 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	403 } catch (HgRepositoryNotFoundException ex) {
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	404 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	405 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	406 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	407 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	408 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	409 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	410 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	411
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	412 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	413 if (remoteHeads == null) {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	414 // 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	415 // 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	416 // 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	417 throw Internals.notImplemented();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	418 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	419 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	420
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	421 HttpURLConnection c = null;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	422 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	423 try {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	424 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	425 c = setupConnection(u.openConnection());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	426 c.setRequestMethod("POST");
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	427 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	428 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	429 c.setDoOutput(true);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	430 c.connect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	431 OutputStream os = c.getOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	432 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	433 os.flush();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	434 os.close();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	435 if (debug) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	436 dumpResponseHeader(u, c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	437 dumpResponse(c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	438 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	439 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	440 } catch (MalformedURLException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	441 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	442 } catch (IOException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	443 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	444 } catch (HgIOException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	445 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	446 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	447 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	448 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	449 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	450 }
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	451 }
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	452
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	453 public List<Pair<String,Nodeid>> bookmarks() throws HgRemoteConnectionException, HgRuntimeException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	454 final String actionName = "Get remote bookmarks";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	455 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	456 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	457 for (Pair<String, String> l : values) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	458 if (l.second().length() != Nodeid.SIZE_ASCII) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	459 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	460 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	461 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	462 Nodeid n = Nodeid.fromAscii(l.second());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	463 String bm = new String(l.first());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	464 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	465 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	466 return rv;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	467 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	468
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	469 public void updateBookmark(String name, Nodeid oldRev, Nodeid newRev) throws HgRemoteConnectionException, HgRuntimeException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	470 final String namespace = "bookmarks";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	471 HttpURLConnection c = null;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	472 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	473 URL u = new URL(url, String.format("%s?cmd=pushkey&namespace=%s&key=%s&old=%s&new=%s",url.getPath(), namespace, name, oldRev.toString(), newRev.toString()));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	474 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	475 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	476 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	477 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	478 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	479 checkResponseOk(c, "Update remote bookmark", "pushkey");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	480 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	481 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	482 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	483 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	484 } finally {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	485 if (c != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	486 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	487 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	488 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	489 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	490
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	491 private void phases() throws HgRemoteConnectionException, HgRuntimeException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	492 final List<Pair<String, String>> values = listkeys("phases", "Get remote phases");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	493 for (Pair<String, String> l : values) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	494 System.out.printf("%s : %s\n", l.first(), l.second());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	495 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	496 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	497
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	498 public static void main(String[] args) throws Exception {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	499 final HgRemoteRepository r = new HgLookup().detectRemote("http://selenic.com/hg", null);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	500 if (r.isInvalid()) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	501 return;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	502 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	503 System.out.println(r.remoteCapabilities);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	504 r.phases();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	505 final List<Pair<String, Nodeid>> bm = r.bookmarks();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	506 for (Pair<String, Nodeid> pair : bm) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	507 System.out.println(pair);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	508 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	509 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	510
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	511 @Override
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	512 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	513 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	514 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	515
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	516
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	517 private void initCapabilities() throws HgRemoteConnectionException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	518 if (remoteCapabilities == null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	519 remoteCapabilities = new HashSet<String>();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	520 // say hello to server, check response
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	521 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	522 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	523 HttpURLConnection c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	524 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	525 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	526 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	527 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	528 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	529 String line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	530 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	531 final String capsPrefix = "capabilities:";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	532 if (line == null \|\| !line.startsWith(capsPrefix)) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	533 // 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	534 // but respond to 'capabilities' instead. Try it.
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	535 // TODO [post-1.0] tests needed
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	536 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	537 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	538 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	539 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	540 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	541 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	542 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	543 line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	544 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	545 if (line == null \|\| line.trim().length() == 0) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	546 return;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	547 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	548 } else {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	549 line = line.substring(capsPrefix.length()).trim();
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 String[] caps = line.split("\\s");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	552 remoteCapabilities.addAll(Arrays.asList(caps));
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 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	555 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	556 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	557 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	558 }
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 }
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	561
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	562 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	563 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	564 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	565 }
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	566 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	567 }
646 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 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	570 HttpURLConnection c = null;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	571 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	572 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	573 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	574 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	575 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	576 dumpResponseHeader(u, c);
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 checkResponseOk(c, actionName, "listkeys");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	579 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	580 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	581 String l;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	582 while ((l = r.readLine()) != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	583 int sep = l.indexOf('\t');
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	584 if (sep == -1) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	585 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	586 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	587 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	588 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	589 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	590 r.close();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	591 return rv;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	592 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	593 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	594 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	595 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	596 } finally {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	597 if (c != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	598 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	599 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	600 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	601 }
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	602
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	603 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	604 if (c.getResponseCode() != 200) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	605 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	606 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	607 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	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
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	611 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	612 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	613 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	614 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	615 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	616 }
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	617 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	618 ((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	619 }
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	620 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	621 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	622
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	623 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	624 if (sb == null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	625 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	626 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	627 sb.append(key);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	628 sb.append('=');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	629 for (Nodeid n : values) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	630 sb.append(n.toString());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	631 sb.append('+');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	632 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	633 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	634 // strip last space
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	635 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	636 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	637 return sb;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	638 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	639
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	640 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	641 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	642 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	643 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	644 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	645 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	646 }
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	647 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	648
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	649 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	650 if (c.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	651 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	652 System.out.println(content);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	653 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	654 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	655
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	656 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	657 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	658 File tf = File.createTempFile("hg4j-bundle-", null);
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	659 FileOutputStream fos = new FileOutputStream(tf);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	660 fos.write(header.getBytes());
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	661 int r;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	662 byte[] buf = new byte[8*1024];
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	663 while ((r = zipStream.read(buf)) != -1) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	664 fos.write(buf, 0, r);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	665 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	666 fos.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	667 zipStream.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	668 return tf;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	669 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	670
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	671
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	672 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	673 /**
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	674 * 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	675 */
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	676 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	677 /**
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	678 * 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	679 */
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	680 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	681
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	682 /**
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	683 * @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	684 * @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	685 */
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	686 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	687 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	688 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	689 }
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	690 }
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	691
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	692 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	693 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	694
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	695 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	696 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	697 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	698 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	699 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	700 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	701
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	702 @Override
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	703 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	704 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	705 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	706 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	707 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	708 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	709 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	710 RemoteBranch o = (RemoteBranch) obj;
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	711 // 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	712 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	713 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	714 }
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	715 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 648:690e71d29bf6