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

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 649:e79cf9a8130b

Push: phase4 - update local and remote phase information

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 26 Jun 2013 20:52:38 +0200
parents	3b7d51ed4c65
children	3b275cc2d2aa

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;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	69 import org.tmatesoft.hg.util.Outcome;
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	70 import org.tmatesoft.hg.util.Pair;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	71 import org.tmatesoft.hg.util.LogFacility.Severity;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	72 import org.tmatesoft.hg.util.Outcome.Kind;
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	73
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 * 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	76 *
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 * @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	78 * @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	79 *
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 * @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	81 * @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	82 */
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	83 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	84
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	85 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	86 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	87 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	88 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	89 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	90 private final SessionContext sessionContext;
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	91 private Set<String> remoteCapabilities;
ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	92
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	93 static {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	94 URLConnection.setContentHandlerFactory(new ContentHandlerFactory() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	95
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	96 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	97 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	98 return new ContentHandler() {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	99
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	100 @Override
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	101 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	102 if (urlc.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	103 ByteArrayOutputStream bos = new ByteArrayOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	104 InputStream is = urlc.getInputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	105 int r;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	106 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	107 bos.write(r);
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 new String(bos.toByteArray());
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 return "<empty>";
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 };
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 return null;
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 });
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	118 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	119
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	120 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	121 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	122 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	123 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	124 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	125 sessionContext = ctx;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	126 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	127 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	128 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	129 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	130 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	131 public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	132 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	133 System.out.println("checkClientTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	134 }
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	135 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	136 public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	137 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	138 System.out.println("checkServerTrusted:" + authType);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	139 }
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	140 }
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 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	142 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	143 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	144 };
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	145 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	146 } 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	147 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	148 }
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 } 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	150 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	151 }
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 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	153 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	154 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	155 // 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	156 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	157 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	158 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	159 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	160 } catch (BackingStoreException ex) {
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 441 diff changeset	161 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	162 // 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	163 }
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 = 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	165 } 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	166 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	167 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	168 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	169
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	170 public boolean isInvalid() throws HgRemoteConnectionException {
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	171 initCapabilities();
428 ead6c67f3319 Actual 'hello' check of the remote server/connection Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	172 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	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
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 * @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	177 */
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 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	179 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	180 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	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	182 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	183 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	184 } 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	185 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	186 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 179 diff changeset	187 }
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	188
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 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	190 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	191 }
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	192
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	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200 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	201 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	202 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	203 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	204 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	205 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	206 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	207 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	208 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	209 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	210 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	211 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	212 } 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	213 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	214 } 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	215 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	216 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	217 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	218 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	219 }
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	220 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	221 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	222
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	223 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	224 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	225 // 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	226 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	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
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	229 /**
e10225daface Use POST for long between queries. Batch between queries (pass multiple pairs to a server) to minimize number thereof Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 176 diff changeset	230 * @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	231 * @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	232 * @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 */
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	234 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	235 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	236 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	237 }
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 // 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	239 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	240 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	241 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	242 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	243 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	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 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	246 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	247 }
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 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	249 // 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	250 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	251 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	252 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	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261 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	262 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	263 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	264 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	265 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	266 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	267 } 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	268 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	269 }
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	270 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	271 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	272 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	273 }
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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285 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	286 // 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	287 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	288 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	289 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	290 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	291 }
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 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	293 } 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	294 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	295 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	296 }
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 // 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	298 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	299 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	300 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	301 }
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 } 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	303 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	304 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	305 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	306 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	307 }
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 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	309 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	310 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	311 }
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 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	313 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	314 }
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	315 }
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 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	317 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	318 } 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	319 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	320 } 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	321 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	322 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	323 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	324 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	325 }
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	326 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	327 }
a8df7162ec75 Extracting complete branch using remote between call to detect incoming changes is done. Arguments reorderd in remote repo to better match Hg server ideology, not my mental convenience Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 172 diff changeset	328
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	329 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	330 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	331 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	332 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	333 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	334 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	335 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	336 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	337 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	338 }
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 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	340 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	341 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	342 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	343 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	344 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	345 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	346 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	347 }
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 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	349 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	350 }
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 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	352 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	353 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	354 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	355 }
62665d8f0686 Complete logic to discover all branches missing locally. Most of wire protocol in HgRemoteRepository Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 177 diff changeset	356 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	357 } 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	358 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	359 } 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	360 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	361 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	362 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	363 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	364 }
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	365 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	366 }
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	367
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	368 /*
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	369 * 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	370 * 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	371 *
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	372 * 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	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 * 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	375
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 * 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	377 * 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	378 * 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	379 *
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 * 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	381 * (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	382 * 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	383 */
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	384 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	385 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	386 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	387 HttpURLConnection c = null;
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	388 try {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	389 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	390 c = setupConnection(u.openConnection());
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	391 c.connect();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	392 if (debug) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	393 dumpResponseHeader(u, c);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	394 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	395 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	396 if (debug) {
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 207 diff changeset	397 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	398 }
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	399 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	400 } 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	401 // 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	402 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	403 } 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	404 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	405 } catch (HgRepositoryNotFoundException ex) {
48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	406 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	407 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	408 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	409 c.disconnect();
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 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	412 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	413
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	414 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	415 if (remoteHeads == null) {
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	416 // 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	417 // 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	418 // 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	419 throw Internals.notImplemented();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	420 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	421 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	422
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	423 HttpURLConnection c = null;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	424 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	425 try {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	426 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	427 c = setupConnection(u.openConnection());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	428 c.setRequestMethod("POST");
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	429 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	430 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	431 c.setDoOutput(true);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	432 c.connect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	433 OutputStream os = c.getOutputStream();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	434 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	435 os.flush();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	436 os.close();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	437 if (debug) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	438 dumpResponseHeader(u, c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	439 dumpResponse(c);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	440 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	441 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	442 } catch (MalformedURLException 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("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	444 } catch (IOException 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 } catch (HgIOException ex) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	447 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	448 } finally {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	449 if (c != null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	450 c.disconnect();
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	451 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	452 }
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	453 }
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	454
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	455 public Bookmarks getBookmarks() throws HgRemoteConnectionException, HgRuntimeException {
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	456 final String actionName = "Get remote bookmarks";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	457 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	458 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	459 for (Pair<String, String> l : values) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	460 if (l.second().length() != Nodeid.SIZE_ASCII) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	461 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	462 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	463 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	464 Nodeid n = Nodeid.fromAscii(l.second());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	465 String bm = new String(l.first());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	466 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	467 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	468 return new Bookmarks(rv);
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	469 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	470
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	471 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	472 final String namespace = "bookmarks";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	473 HttpURLConnection c = null;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	474 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	475 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	476 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	477 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	478 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	479 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	480 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	481 checkResponseOk(c, "Update remote bookmark", "pushkey");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	482 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	483 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	484 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	485 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	486 } finally {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	487 if (c != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	488 c.disconnect();
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 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	492
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	493 public Phases getPhases() throws HgRemoteConnectionException, HgRuntimeException {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	494 initCapabilities();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	495 if (!remoteCapabilities.contains("pushkey")) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	496 // old server defaults to publishing
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	497 return new Phases(true, Collections.<Nodeid>emptyList());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	498 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	499 final List<Pair<String, String>> values = listkeys("phases", "Get remote phases");
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	500 boolean publishing = true;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	501 ArrayList<Nodeid> draftRoots = new ArrayList<Nodeid>();
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	502 for (Pair<String, String> l : values) {
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	503 if ("publishing".equalsIgnoreCase(l.first())) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	504 publishing = Boolean.parseBoolean(l.second());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	505 continue;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	506 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	507 Nodeid root = Nodeid.fromAscii(l.first());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	508 int ph = Integer.parseInt(l.second());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	509 if (ph == HgPhase.Draft.mercurialOrdinal()) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	510 draftRoots.add(root);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	511 } else {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	512 assert false;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	513 sessionContext.getLog().dump(getClass(), Severity.Error, "Unexpected phase value %d for revision %s", ph, root);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	514 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	515 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	516 return new Phases(publishing, draftRoots);
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	517 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	518
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	519 public Outcome updatePhase(HgPhase from, HgPhase to, Nodeid n) throws HgRemoteConnectionException, HgRuntimeException {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	520 if (pushkey("phases", n.toString(), String.valueOf(from.mercurialOrdinal()), String.valueOf(to.mercurialOrdinal()))) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	521 return new Outcome(Kind.Success, String.format("Phase of %s updated to %s", n.shortNotation(), to.name()));
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	522 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	523 return new Outcome(Kind.Failure, String.format("Phase update (%s: %s -> %s) failed", n.shortNotation(), from.name(), to.name()));
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	524 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	525
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	526
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	527 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	528 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	529 if (r.isInvalid()) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	530 return;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	531 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	532 System.out.println(r.remoteCapabilities);
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	533 r.getPhases();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	534 final Iterable<Pair<String, Nodeid>> bm = r.getBookmarks();
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	535 for (Pair<String, Nodeid> pair : bm) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	536 System.out.println(pair);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	537 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	538 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	539
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	540 @Override
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	541 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	542 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	543 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	544
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	545
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	546 private void initCapabilities() throws HgRemoteConnectionException {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	547 if (remoteCapabilities == null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	548 remoteCapabilities = new HashSet<String>();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	549 // say hello to server, check response
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	550 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	551 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	552 HttpURLConnection c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	553 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	554 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	555 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	556 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	557 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	558 String line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	559 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	560 final String capsPrefix = "capabilities:";
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	561 if (line == null \|\| !line.startsWith(capsPrefix)) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	562 // 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	563 // but respond to 'capabilities' instead. Try it.
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	564 // TODO [post-1.0] tests needed
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	565 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	566 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	567 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	568 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	569 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	570 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	571 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	572 line = r.readLine();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	573 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	574 if (line == null \|\| line.trim().length() == 0) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	575 return;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	576 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	577 } else {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	578 line = line.substring(capsPrefix.length()).trim();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	579 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	580 String[] caps = line.split("\\s");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	581 remoteCapabilities.addAll(Arrays.asList(caps));
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	582 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	583 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	584 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	585 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	586 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	587 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	588 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	589 }
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	590
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	591 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	592 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	593 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	594 }
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	595 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	596 }
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	597
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	598 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	599 HttpURLConnection c = null;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	600 try {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	601 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	602 c = setupConnection(u.openConnection());
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	603 c.connect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	604 if (debug) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	605 dumpResponseHeader(u, c);
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	606 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	607 checkResponseOk(c, actionName, "listkeys");
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	608 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	609 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	610 String l;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	611 while ((l = r.readLine()) != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	612 int sep = l.indexOf('\t');
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	613 if (sep == -1) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	614 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	615 continue;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	616 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	617 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	618 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	619 r.close();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	620 return rv;
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	621 } catch (MalformedURLException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	622 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	623 } catch (IOException ex) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	624 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	625 } finally {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	626 if (c != null) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	627 c.disconnect();
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	628 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	629 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	630 }
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	631
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	632 private boolean pushkey(String namespace, String key, String oldValue, String newValue) throws HgRemoteConnectionException, HgRuntimeException {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	633 HttpURLConnection c = null;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	634 try {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	635 final String p = String.format("%s?cmd=pushkey&namespace=%s&key=%s&old=%s&new=&s", url.getPath(), namespace, key, oldValue, newValue);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	636 URL u = new URL(url, p);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	637 c = setupConnection(u.openConnection());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	638 c.connect();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	639 if (debug) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	640 dumpResponseHeader(u, c);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	641 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	642 checkResponseOk(c, key, "pushkey");
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	643 final InputStream is = c.getInputStream();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	644 int rv = is.read();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	645 if (is.read() != -1) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	646 sessionContext.getLog().dump(getClass(), Severity.Error, "Unexpected data in response to pushkey");
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	647 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	648 is.close();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	649 return rv == '1';
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	650 } catch (MalformedURLException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	651 throw new HgRemoteConnectionException("Bad URL", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	652 } catch (IOException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	653 throw new HgRemoteConnectionException("Communication failure", ex).setRemoteCommand("pushkey").setServerInfo(getLocation());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	654 } finally {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	655 if (c != null) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	656 c.disconnect();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	657 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	658 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	659 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	660
646 3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	661 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	662 if (c.getResponseCode() != 200) {
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	663 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	664 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	665 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	666 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	667 }
3b7d51ed4c65 Push: phase3 - update matching remote bookmarks Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 645 diff changeset	668
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	669 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	670 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	671 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	672 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	673 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	674 }
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 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	676 ((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	677 }
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	678 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	679 }
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	680
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	681 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	682 if (sb == null) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	683 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	684 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	685 sb.append(key);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	686 sb.append('=');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	687 for (Nodeid n : values) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	688 sb.append(n.toString());
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	689 sb.append('+');
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	690 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	691 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	692 // strip last space
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	693 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	694 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	695 return sb;
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	696 }
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	697
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	698 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	699 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	700 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	701 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	702 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	703 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	704 }
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	705 }
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	706
645 14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	707 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	708 if (c.getContentLength() > 0) {
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	709 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	710 System.out.println(content);
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	711 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	712 }
14dac192aa26 Push: phase2 - upload bundle with changes to remote server Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	713
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	714 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	715 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	716 File tf = File.createTempFile("hg4j-bundle-", null);
179 da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	717 FileOutputStream fos = new FileOutputStream(tf);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	718 fos.write(header.getBytes());
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	719 int r;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	720 byte[] buf = new byte[8*1024];
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	721 while ((r = zipStream.read(buf)) != -1) {
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	722 fos.write(buf, 0, r);
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	723 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	724 fos.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	725 zipStream.close();
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	726 return tf;
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	727 }
da426c2fe1ec Support for changegroup wire command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 178 diff changeset	728
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	729
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	730 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	731 /**
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	732 * 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	733 */
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	734 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	735 /**
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	736 * 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	737 */
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	738 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	739
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	740 /**
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	741 * @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	742 * @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	743 */
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	744 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	745 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	746 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	747 }
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	748 }
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	749
171 2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	750 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	751 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	752
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	753 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	754 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	755 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	756 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	757 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	758 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	759
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	760 @Override
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	761 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	762 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	763 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	764 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	765 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	766 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	767 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	768 RemoteBranch o = (RemoteBranch) obj;
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	769 // 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	770 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	771 }
2c3e96674e2a Towards outgoing changes - initial detection logic, get connected with remote repo stub Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 170 diff changeset	772 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	773
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	774 public static final class Bookmarks implements Iterable<Pair<String, Nodeid>> {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	775 private final List<Pair<String, Nodeid>> bm;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	776
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	777 private Bookmarks(List<Pair<String, Nodeid>> bookmarks) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	778 bm = bookmarks;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	779 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	780
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	781 public Iterator<Pair<String, Nodeid>> iterator() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	782 return bm.iterator();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	783 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	784 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	785
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	786 public static final class Phases {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	787 private final boolean pub;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	788 private final List<Nodeid> droots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	789
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	790 private Phases(boolean publishing, List<Nodeid> draftRoots) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	791 pub = publishing;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	792 droots = draftRoots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	793 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	794
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	795 /**
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	796 * Non-publishing servers may (shall?) respond with a list of draft roots.
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	797 * This method doesn't make sense when {@link #isPublishingServer()} is <code>true</code>
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	798 *
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	799 * @return list of draft roots on remote server
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	800 */
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	801 public List<Nodeid> draftRoots() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	802 assert !pub;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	803 return droots;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	804 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	805
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	806 /**
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	807 * @return <code>true</code> if revisions on remote server shall be deemed published (either
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	808 * old server w/o explicit setting, or a new one with <code>phases.publish == true</code>)
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	809 */
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	810 public boolean isPublishingServer() {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	811 return pub;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	812 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 646 diff changeset	813 }
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	814 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 649:e79cf9a8130b