Mercurial > jhg
comparison src/org/tmatesoft/hg/core/HgPushCommand.java @ 670:52af7f62e731
AIOOBE in BundleGenerator.ChunkGenerator.iterate when there are no outgoing changes on push
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 12 Jul 2013 15:27:43 +0200 |
| parents | d25f0324a27a |
| children | 002ed1b2baad |
comparison
equal
deleted
inserted
replaced
| 669:b1a3a056d7e6 | 670:52af7f62e731 |
|---|---|
| 85 RevisionSet secret = phaseHelper.allSecret(); | 85 RevisionSet secret = phaseHelper.allSecret(); |
| 86 outgoing = new RevisionSet(l).subtract(secret); | 86 outgoing = new RevisionSet(l).subtract(secret); |
| 87 } else { | 87 } else { |
| 88 outgoing = new RevisionSet(l); | 88 outgoing = new RevisionSet(l); |
| 89 } | 89 } |
| 90 // | 90 if (!outgoing.isEmpty()) { |
| 91 // prepare bundle | 91 // |
| 92 BundleGenerator bg = new BundleGenerator(implRepo); | 92 // prepare bundle |
| 93 File bundleFile = bg.create(outgoing.asList()); | 93 BundleGenerator bg = new BundleGenerator(implRepo); |
| 94 progress.worked(20); | 94 File bundleFile = bg.create(outgoing.asList()); |
| 95 HgBundle b = new HgLookup(repo.getSessionContext()).loadBundle(bundleFile); | 95 progress.worked(20); |
| 96 // | 96 HgBundle b = new HgLookup(repo.getSessionContext()).loadBundle(bundleFile); |
| 97 // send changes | 97 // |
| 98 remoteRepo.unbundle(b, comparator.getRemoteHeads()); | 98 // send changes |
| 99 remoteRepo.unbundle(b, comparator.getRemoteHeads()); | |
| 100 } // update phase information nevertheless | |
| 99 progress.worked(20); | 101 progress.worked(20); |
| 100 // | 102 // |
| 101 // update phase information | 103 // update phase information |
| 102 if (phaseHelper.isCapableOfPhases()) { | 104 if (phaseHelper.isCapableOfPhases()) { |
| 103 HgRemoteRepository.Phases remotePhases = remoteRepo.getPhases(); | 105 HgRemoteRepository.Phases remotePhases = remoteRepo.getPhases(); |
