Mercurial > jhg
annotate src/org/tmatesoft/hg/internal/BundleGenerator.java @ 646:3b7d51ed4c65
Push: phase3 - update matching remote bookmarks
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 21 Jun 2013 18:30:35 +0200 | 
| parents | 14dac192aa26 | 
| children | 6e98d34eaca8 | 
| rev | line source | 
|---|---|
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 1 /* | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 2 * Copyright (c) 2013 TMate Software Ltd | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 3 * | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 4 * This program is free software; you can redistribute it and/or modify | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 5 * it under the terms of the GNU General Public License as published by | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 7 * | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 8 * This program is distributed in the hope that it will be useful, | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 11 * GNU General Public License for more details. | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 12 * | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 13 * For information on how to redistribute this software under | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 14 * the terms of a license other than GNU General Public License | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 17 package org.tmatesoft.hg.internal; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 19 import static org.tmatesoft.hg.repo.HgRepository.NO_REVISION; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 20 import static org.tmatesoft.hg.repo.HgRepository.TIP; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 21 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 22 import java.io.File; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 23 import java.io.FileOutputStream; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 24 import java.io.IOException; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 25 import java.util.ArrayList; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 26 import java.util.Arrays; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 27 import java.util.Collection; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 28 import java.util.Collections; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 29 import java.util.Comparator; | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 30 import java.util.HashSet; | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 31 import java.util.List; | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 32 import java.util.Set; | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 33 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 34 import org.tmatesoft.hg.core.HgIOException; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 35 import org.tmatesoft.hg.core.Nodeid; | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 36 import org.tmatesoft.hg.internal.DataSerializer.OutputStreamSerializer; | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 37 import org.tmatesoft.hg.internal.Patch.PatchDataSource; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 38 import org.tmatesoft.hg.repo.HgBundle; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 39 import org.tmatesoft.hg.repo.HgChangelog; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 40 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 import org.tmatesoft.hg.repo.HgDataFile; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 42 import org.tmatesoft.hg.repo.HgInternals; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 import org.tmatesoft.hg.repo.HgInvalidControlFileException; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 44 import org.tmatesoft.hg.repo.HgLookup; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 45 import org.tmatesoft.hg.repo.HgManifest; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 import org.tmatesoft.hg.repo.HgRepository; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 import org.tmatesoft.hg.repo.HgRuntimeException; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 49 /** | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 50 * @see http://mercurial.selenic.com/wiki/BundleFormat | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 51 * @author Artem Tikhomirov | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 52 * @author TMate Software Ltd. | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 */ | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 54 public class BundleGenerator { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 55 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 private final Internals repo; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 57 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 58 public BundleGenerator(Internals hgRepo) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 59 repo = hgRepo; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 60 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 61 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 62 public File create(List<Nodeid> changesets) throws HgIOException, IOException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 63 final HgChangelog clog = repo.getRepo().getChangelog(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 64 final HgManifest manifest = repo.getRepo().getManifest(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 65 IntVector clogRevsVector = new IntVector(changesets.size(), 0); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 66 for (Nodeid n : changesets) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 67 clogRevsVector.add(clog.getRevisionIndex(n)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 68 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 69 clogRevsVector.sort(true); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 70 final int[] clogRevs = clogRevsVector.toArray(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 71 System.out.printf("Changelog: %s\n", Arrays.toString(clogRevs)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 72 final IntMap<Nodeid> clogMap = new IntMap<Nodeid>(changesets.size()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 73 final IntVector manifestRevs = new IntVector(changesets.size(), 0); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 74 final List<HgDataFile> files = new ArrayList<HgDataFile>(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 75 clog.range(new HgChangelog.Inspector() { | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 76 private Set<String> seenFiles = new HashSet<String>(); | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 77 public void next(int revisionIndex, Nodeid nodeid, RawChangeset cset) throws HgRuntimeException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 78 clogMap.put(revisionIndex, nodeid); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 79 manifestRevs.add(manifest.getRevisionIndex(cset.manifest())); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 80 for (String f : cset.files()) { | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 81 if (seenFiles.contains(f)) { | 
| 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 82 continue; | 
| 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 83 } | 
| 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 84 seenFiles.add(f); | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 85 HgDataFile df = repo.getRepo().getFileNode(f); | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 86 files.add(df); | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 87 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 88 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 89 }, clogRevs); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 90 manifestRevs.sort(true); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 91 System.out.printf("Manifest: %s\n", Arrays.toString(manifestRevs.toArray(true))); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 92 /////////////// | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 93 for (HgDataFile df : sortedByName(files)) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 94 RevlogStream s = repo.getImplAccess().getStream(df); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 95 final IntVector fileRevs = new IntVector(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 96 s.iterate(0, TIP, false, new RevlogStream.Inspector() { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 97 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 98 public void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) throws HgRuntimeException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 99 if (Arrays.binarySearch(clogRevs, linkRevision) >= 0) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 100 fileRevs.add(revisionIndex); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 101 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 102 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 103 }); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 104 fileRevs.sort(true); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 105 System.out.printf("%s: %s\n", df.getPath(), Arrays.toString(fileRevs.toArray(true))); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 106 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 107 if (Boolean.FALSE.booleanValue()) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 108 return null; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 109 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 110 /////////////// | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 111 // | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 112 final File bundleFile = File.createTempFile("hg4j-", "bundle"); | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 113 final FileOutputStream osBundle = new FileOutputStream(bundleFile); | 
| 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 114 final OutputStreamSerializer outRaw = new OutputStreamSerializer(osBundle); | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 115 outRaw.write("HG10UN".getBytes(), 0, 6); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 116 // | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 117 RevlogStream clogStream = repo.getImplAccess().getChangelogStream(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 118 new ChunkGenerator(outRaw, clogMap).iterate(clogStream, clogRevs); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 119 outRaw.writeInt(0); // null chunk for changelog group | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 120 // | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 121 RevlogStream manifestStream = repo.getImplAccess().getManifestStream(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 122 new ChunkGenerator(outRaw, clogMap).iterate(manifestStream, manifestRevs.toArray(true)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 123 outRaw.writeInt(0); // null chunk for manifest group | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 124 // | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 125 for (HgDataFile df : sortedByName(files)) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 126 RevlogStream s = repo.getImplAccess().getStream(df); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 127 final IntVector fileRevs = new IntVector(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 128 s.iterate(0, TIP, false, new RevlogStream.Inspector() { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 129 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 130 public void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) throws HgRuntimeException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 131 if (Arrays.binarySearch(clogRevs, linkRevision) >= 0) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 132 fileRevs.add(revisionIndex); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 133 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 134 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 135 }); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 136 fileRevs.sort(true); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 137 if (!fileRevs.isEmpty()) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 138 // although BundleFormat page says "filename length, filename" for a file, | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 139 // in fact there's a sort of 'filename chunk', i.e. filename length field includes | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 140 // not only length of filename, but also length of the field itseld, i.e. filename.length+sizeof(int) | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 141 byte[] fnameBytes = df.getPath().toString().getBytes(); // FIXME check encoding in native hg (and fix accordingly in HgBundle) | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 142 outRaw.writeInt(fnameBytes.length + 4); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 143 outRaw.writeByte(fnameBytes); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 144 new ChunkGenerator(outRaw, clogMap).iterate(s, fileRevs.toArray(true)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 145 outRaw.writeInt(0); // null chunk for file group | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 146 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 147 } | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 148 outRaw.writeInt(0); // null chunk to indicate no more files (although BundleFormat page doesn't mention this) | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 149 outRaw.done(); | 
| 645 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 150 osBundle.flush(); | 
| 
14dac192aa26
Push: phase2 - upload bundle with changes to remote server
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
644diff
changeset | 151 osBundle.close(); | 
| 644 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 152 //return new HgBundle(repo.getSessionContext(), repo.getDataAccess(), bundleFile); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 153 return bundleFile; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 154 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 155 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 156 private static Collection<HgDataFile> sortedByName(List<HgDataFile> files) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 157 Collections.sort(files, new Comparator<HgDataFile>() { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 158 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 159 public int compare(HgDataFile o1, HgDataFile o2) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 160 return o1.getPath().compareTo(o2.getPath()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 161 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 162 }); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 163 return files; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 164 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 165 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 166 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 167 public static void main(String[] args) throws Exception { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 168 final HgLookup hgLookup = new HgLookup(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 169 HgRepository hgRepo = hgLookup.detectFromWorkingDir(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 170 BundleGenerator bg = new BundleGenerator(HgInternals.getImplementationRepo(hgRepo)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 171 ArrayList<Nodeid> l = new ArrayList<Nodeid>(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 172 l.add(Nodeid.fromAscii("9ef1fab9f5e3d51d70941121dc27410e28069c2d")); // 640 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 173 l.add(Nodeid.fromAscii("2f33f102a8fa59274a27ebbe1c2903cecac6c5d5")); // 639 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 174 l.add(Nodeid.fromAscii("d074971287478f69ab0a64176ce2284d8c1e91c3")); // 638 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 175 File bundleFile = bg.create(l); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 176 HgBundle b = hgLookup.loadBundle(bundleFile); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 177 // Bundle.dump(b); // FIXME dependency from dependant code | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 178 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 179 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 180 private static class ChunkGenerator implements RevlogStream.Inspector { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 181 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 182 private final DataSerializer ds; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 183 private final IntMap<Nodeid> parentMap; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 184 private final IntMap<Nodeid> clogMap; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 185 private byte[] prevContent; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 186 private int startParent; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 187 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 188 public ChunkGenerator(DataSerializer dataSerializer, IntMap<Nodeid> clogNodeidMap) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 189 ds = dataSerializer; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 190 parentMap = new IntMap<Nodeid>(clogNodeidMap.size());; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 191 clogMap = clogNodeidMap; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 192 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 193 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 194 public void iterate(RevlogStream s, int[] revisions) throws HgRuntimeException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 195 int[] p = s.parents(revisions[0], new int[2]); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 196 startParent = p[0]; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 197 int[] revs2read; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 198 if (startParent == NO_REVISION) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 199 revs2read = revisions; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 200 prevContent = new byte[0]; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 201 } else { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 202 revs2read = new int[revisions.length + 1]; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 203 revs2read[0] = startParent; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 204 System.arraycopy(revisions, 0, revs2read, 1, revisions.length); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 205 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 206 s.iterate(revs2read, true, this); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 207 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 208 | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 209 public void next(int revisionIndex, int actualLen, int baseRevision, int linkRevision, int parent1Revision, int parent2Revision, byte[] nodeid, DataAccess data) throws HgRuntimeException { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 210 try { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 211 parentMap.put(revisionIndex, Nodeid.fromBinary(nodeid, 0)); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 212 byte[] nextContent = data.byteArray(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 213 data.done(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 214 if (revisionIndex == startParent) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 215 prevContent = nextContent; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 216 return; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 217 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 218 Patch p = GeneratePatchInspector.delta(prevContent, nextContent); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 219 prevContent = nextContent; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 220 nextContent = null; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 221 PatchDataSource pds = p.new PatchDataSource(); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 222 int len = pds.serializeLength() + 84; | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 223 ds.writeInt(len); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 224 ds.write(nodeid, 0, Nodeid.SIZE); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 225 // TODO assert parents match those in previous group elements | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 226 if (parent1Revision != NO_REVISION) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 227 ds.writeByte(parentMap.get(parent1Revision).toByteArray()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 228 } else { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 229 ds.writeByte(Nodeid.NULL.toByteArray()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 230 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 231 if (parent2Revision != NO_REVISION) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 232 ds.writeByte(parentMap.get(parent2Revision).toByteArray()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 233 } else { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 234 ds.writeByte(Nodeid.NULL.toByteArray()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 235 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 236 ds.writeByte(clogMap.get(linkRevision).toByteArray()); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 237 pds.serialize(ds); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 238 } catch (IOException ex) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 239 // XXX odd to have object with IOException to use where no checked exception is allowed | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 240 throw new HgInvalidControlFileException(ex.getMessage(), ex, null); | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 241 } catch (HgIOException ex) { | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 242 throw new HgInvalidControlFileException(ex, true); // XXX any way to refactor ChunkGenerator not to get checked exception here? | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 243 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 244 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 245 } | 
| 
1deea2f33218
Push: phase1 - prepare bundle with changes
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 246 } | 
