This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4060

changegroup: move ellipsisdata() from narrow
ClosedPublic

Authored by indygreg on Aug 2 2018, 5:15 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGee1ea96cf9c9: changegroup: move ellipsisdata() from narrow
Summary

This is a pretty straightforward copy of the function.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Aug 2 2018, 5:15 PM
pulkit accepted this revision.Aug 3 2018, 5:57 PM
Closed by commit rHGee1ea96cf9c9: changegroup: move ellipsisdata() from narrow (authored by indygreg). · Explain WhyAug 6 2018, 2:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9941

hgext/narrow/narrowchangegroup.py

# narrowchangegroup.py - narrow clone changegroup creation and consumption # narrowchangegroup.py - narrow clone changegroup creation and consumption
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
changegroup, changegroup,
error, error,
extensions, extensions,
mdiff,
node, node,
pycompat, pycompat,
revlog,
util, util,
) )
def setup(): def setup():
def generatefiles(orig, self, changedfiles, linknodes, commonrevs, def generatefiles(orig, self, changedfiles, linknodes, commonrevs,
source): source):
changedfiles = list(filter(self._filematcher, changedfiles)) changedfiles = list(filter(self._filematcher, changedfiles))
links[fnode] = min(links[fnode], lr, key=clrev) links[fnode] = min(links[fnode], lr, key=clrev)
elif fnode: elif fnode:
links[fnode] = lr links[fnode] = lr
return links return links
return orig(self, changedfiles, linknodes, commonrevs, source) return orig(self, changedfiles, linknodes, commonrevs, source)
extensions.wrapfunction( extensions.wrapfunction(
changegroup.cg1packer, 'generatefiles', generatefiles) changegroup.cg1packer, 'generatefiles', generatefiles)
def ellipsisdata(packer, rev, revlog_, p1, p2, data, linknode):
n = revlog_.node(rev)
p1n, p2n = revlog_.node(p1), revlog_.node(p2)
flags = revlog_.flags(rev)
flags |= revlog.REVIDX_ELLIPSIS
meta = packer.builddeltaheader(
n, p1n, p2n, node.nullid, linknode, flags)
# TODO: try and actually send deltas for ellipsis data blocks
diffheader = mdiff.trivialdiffheader(len(data))
l = len(meta) + len(diffheader) + len(data)
return ''.join((changegroup.chunkheader(l),
meta,
diffheader,
data))
def close(orig, self): def close(orig, self):
getattr(self, 'clrev_to_localrev', {}).clear() getattr(self, 'clrev_to_localrev', {}).clear()
if getattr(self, 'next_clrev_to_localrev', {}): if getattr(self, 'next_clrev_to_localrev', {}):
self.clrev_to_localrev = self.next_clrev_to_localrev self.clrev_to_localrev = self.next_clrev_to_localrev
del self.next_clrev_to_localrev del self.next_clrev_to_localrev
self.changelog_done = True self.changelog_done = True
return orig(self) return orig(self)
extensions.wrapfunction(changegroup.cg1packer, 'close', close) extensions.wrapfunction(changegroup.cg1packer, 'close', close)
revlog.parentrevs(rev) == (node.nullrev, node.nullrev)): revlog.parentrevs(rev) == (node.nullrev, node.nullrev)):
p1, p2 = node.nullrev, node.nullrev p1, p2 = node.nullrev, node.nullrev
elif len(linkparents) == 1: elif len(linkparents) == 1:
p1, = sorted(local(p) for p in linkparents) p1, = sorted(local(p) for p in linkparents)
p2 = node.nullrev p2 = node.nullrev
else: else:
p1, p2 = sorted(local(p) for p in linkparents) p1, p2 = sorted(local(p) for p in linkparents)
n = revlog.node(rev) n = revlog.node(rev)
yield ellipsisdata( yield changegroup.ellipsisdata(
self, rev, revlog, p1, p2, revlog.revision(n), linknode) self, rev, revlog, p1, p2, revlog.revision(n), linknode)
extensions.wrapfunction(changegroup.cg1packer, 'revchunk', revchunk) extensions.wrapfunction(changegroup.cg1packer, 'revchunk', revchunk)
def deltaparent(orig, self, revlog, rev, p1, p2, prev): def deltaparent(orig, self, revlog, rev, p1, p2, prev):
if util.safehasattr(self, 'full_nodes'): if util.safehasattr(self, 'full_nodes'):
# TODO: send better deltas when in narrow mode. # TODO: send better deltas when in narrow mode.
# #
# changegroup.group() loops over revisions to send, # changegroup.group() loops over revisions to send,

mercurial/changegroup.py

# changegroup.py - Mercurial changegroup manipulation functions # changegroup.py - Mercurial changegroup manipulation functions
# #
# Copyright 2006 Matt Mackall <mpm@selenic.com> # Copyright 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import struct import struct
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid,
nullrev, nullrev,
short, short,
) )
from . import ( from . import (
dagutil, dagutil,
error, error,
manifest, manifest,
match as matchmod, match as matchmod,
mdiff, mdiff,
phases, phases,
pycompat, pycompat,
repository, repository,
revlog,
util, util,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
_CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s" _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
def read(self, n): def read(self, n):
if self._h: if self._h:
d, self._h = self._h[:n], self._h[n:] d, self._h = self._h[:n], self._h[n:]
if len(d) < n: if len(d) < n:
d += readexactly(self._fh, n - len(d)) d += readexactly(self._fh, n - len(d))
return d return d
return readexactly(self._fh, n) return readexactly(self._fh, n)
def ellipsisdata(packer, rev, revlog_, p1, p2, data, linknode):
n = revlog_.node(rev)
p1n, p2n = revlog_.node(p1), revlog_.node(p2)
flags = revlog_.flags(rev)
flags |= revlog.REVIDX_ELLIPSIS
meta = packer.builddeltaheader(
n, p1n, p2n, nullid, linknode, flags)
# TODO: try and actually send deltas for ellipsis data blocks
diffheader = mdiff.trivialdiffheader(len(data))
l = len(meta) + len(diffheader) + len(data)
return ''.join((chunkheader(l),
meta,
diffheader,
data))
class cg1packer(object): class cg1packer(object):
deltaheader = _CHANGEGROUPV1_DELTA_HEADER deltaheader = _CHANGEGROUPV1_DELTA_HEADER
version = '01' version = '01'
def __init__(self, repo, filematcher, bundlecaps=None): def __init__(self, repo, filematcher, bundlecaps=None):
"""Given a source repo, construct a bundler. """Given a source repo, construct a bundler.
filematcher is a matcher that matches on files to include in the filematcher is a matcher that matches on files to include in the
changegroup. Used to facilitate sparse changegroups. changegroup. Used to facilitate sparse changegroups.