Mercurial > hg
diff hgext/narrow/narrowchangegroup.py @ 36090:9445a3141501
narrow: move from ELLIPSIS_NODE_FLAG to revlog.REVIDX_ELLIPSIS
We should have been using this value all along. Sigh.
Differential Revision: https://phab.mercurial-scm.org/D2008
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 02 Feb 2018 10:37:29 -0500 |
parents | 8c31187b6717 |
children | f85e32a5e5c8 |
line wrap: on
line diff
--- a/hgext/narrow/narrowchangegroup.py Fri Feb 02 10:28:57 2018 -0500 +++ b/hgext/narrow/narrowchangegroup.py Fri Feb 02 10:37:29 2018 -0500 @@ -15,12 +15,12 @@ manifest, mdiff, node, + revlog, util, ) from . import ( narrowrepo, - narrowrevlog, ) def setup(): @@ -83,11 +83,11 @@ extensions.wrapfunction( 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 |= narrowrevlog.ELLIPSIS_NODE_FLAG + 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