comparison mercurial/localrepo.py @ 15650:5b26667fc4d3

phases: exchange phase boundaries on pull

Add an extra argument to addchangegroup to all phase code to execute before the
lock is released.

15649:ca7c4254a21a

            tmp = discovery.findcommonincoming(self, remote, heads=heads,
                                               force=force)
            common, fetch, rheads = tmp
            if not fetch:
                self.ui.status(_("no changes found\n"))
                result = 0
            else:
                if heads is None and list(common) == [nullid]:
                    self.ui.status(_("requesting all changes\n"))
                elif heads is None and remote.capable('changegroupsubset'):

                    raise util.Abort(_("partial pull cannot be done because "
                                           "other repository doesn't support "
                                           "changegroupsubset."))
                else:
                    cg = remote.changegroupsubset(fetch, heads, 'pull')
                result = self.addchangegroup(cg, 'pull', remote.url())
            phases.advanceboundary(self, 0, common)
        finally:
            lock.release()

        return result

15650:5b26667fc4d3

            tmp = discovery.findcommonincoming(self, remote, heads=heads,
                                               force=force)
            common, fetch, rheads = tmp
            if not fetch:
                self.ui.status(_("no changes found\n"))
                added = []
                result = 0
            else:
                if heads is None and list(common) == [nullid]:
                    self.ui.status(_("requesting all changes\n"))
                elif heads is None and remote.capable('changegroupsubset'):

                    raise util.Abort(_("partial pull cannot be done because "
                                           "other repository doesn't support "
                                           "changegroupsubset."))
                else:
                    cg = remote.changegroupsubset(fetch, heads, 'pull')
                clstart = len(self.changelog)
                result = self.addchangegroup(cg, 'pull', remote.url())
                clend = len(self.changelog)
                added = [self.changelog.node(r) for r in xrange(clstart, clend)]


            # Get remote phases data from remote
            remotephases = remote.listkeys('phases')
            publishing = bool(remotephases.get('publishing', False))
            if remotephases and not publishing:
                # remote is new and unpublishing
                subset = common + added
                rheads, rroots = phases.analyzeremotephases(self, subset,
                                                            remotephases)
                for phase, boundary in enumerate(rheads):
                    phases.advanceboundary(self, phase, boundary)
            else:
                # Remote is old or publishing all common changesets
                # should be seen as public
                phases.advanceboundary(self, 0, common + added)
        finally:
            lock.release()

        return result