This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5195

changegroup: introduce an explicit linear sorting
ClosedPublic

Authored by lothiraldan on Oct 30 2018, 12:28 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG256b1f0c24e8: changegroup: introduce an explicit linear sorting
Summary

We still need to linearize the revisions in some cases, introduce an explicit
linear sorting before changing back the default order.

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

lothiraldan created this revision.Oct 30 2018, 12:28 PM
yuja added a subscriber: yuja.Oct 31 2018, 7:59 AM
We still need to linearize the revisions in some cases, introduce an explicit
`linear` sorting before changing back the default order.

I'm a little confused about this. We do introduce nodesorder='linear', but
there seems no user of that option. Are there unsent patches?

lothiraldan added a comment.Oct 31 2018, 8:37 AM
In D5195#77638, @yuja wrote:
We still need to linearize the revisions in some cases, introduce an explicit
`linear` sorting before changing back the default order.

I'm a little confused about this. We do introduce nodesorder='linear', but
there seems no user of that option. Are there unsent patches?

The message should have said We **may** still need to. There is no user of that option yet so we can drop it.

I think we should at least keep the option in storageutil.emitrevision so we can experiment around doing a DAG sort for various operations, @indygreg seems to have some perf improvements on the firefox repo with it

yuja added a comment.Oct 31 2018, 9:51 AM
> >   We still need to linearize the revisions in some cases, introduce an explicit
> >   `linear` sorting before changing back the default order.
>
> I'm a little confused about this. We do introduce `nodesorder='linear'`, but
>  there seems no user of that option. Are there unsent patches?
The message should have said `We **may** still need to`. There is no user of that option yet so we can drop it.
I think we should at least keep the option in `storageutil.emitrevision` so we can experiment around doing a DAG sort for various operations, @indygreg seems to have some perf improvements on the firefox repo with it

Got it, thanks. The series looks good, but I leave it to indygreg as he
might have a better idea.

indygreg accepted this revision.Oct 31 2018, 2:59 PM

Yeah, I'm OK with this. There is tons of room to experiment with different ordering techniques - including making it end-user configurable. Having this code in place is a step in the right direction.

This revision is now accepted and ready to land.Oct 31 2018, 2:59 PM
Closed by commit rHG256b1f0c24e8: changegroup: introduce an explicit linear sorting (authored by lothiraldan). · Explain WhyOct 31 2018, 3:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/sqlitestore.py (2 lines)
Mmercurial/revlog.py (2 lines)

Diff 12353

hgext/sqlitestore.py

def renamed(self, node): def renamed(self, node):
return storageutil.filerevisioncopied(self, node) return storageutil.filerevisioncopied(self, node)
def cmp(self, node, fulltext): def cmp(self, node, fulltext):
return not storageutil.filedataequivalent(self, node, fulltext) return not storageutil.filedataequivalent(self, node, fulltext)
def emitrevisions(self, nodes, nodesorder=None, revisiondata=False, def emitrevisions(self, nodes, nodesorder=None, revisiondata=False,
assumehaveparentrevisions=False, deltaprevious=False): assumehaveparentrevisions=False, deltaprevious=False):
if nodesorder not in ('nodes', 'storage', None): if nodesorder not in ('nodes', 'storage', 'linear', None):
raise error.ProgrammingError('unhandled value for nodesorder: %s' % raise error.ProgrammingError('unhandled value for nodesorder: %s' %
nodesorder) nodesorder)
nodes = [n for n in nodes if n != nullid] nodes = [n for n in nodes if n != nullid]
if not nodes: if not nodes:
return return

mercurial/revlog.py

def files(self): def files(self):
res = [self.indexfile] res = [self.indexfile]
if not self._inline: if not self._inline:
res.append(self.datafile) res.append(self.datafile)
return res return res
def emitrevisions(self, nodes, nodesorder=None, revisiondata=False, def emitrevisions(self, nodes, nodesorder=None, revisiondata=False,
assumehaveparentrevisions=False, deltaprevious=False): assumehaveparentrevisions=False, deltaprevious=False):
if nodesorder not in ('nodes', 'storage', None): if nodesorder not in ('nodes', 'storage', 'linear', None):
raise error.ProgrammingError('unhandled value for nodesorder: %s' % raise error.ProgrammingError('unhandled value for nodesorder: %s' %
nodesorder) nodesorder)
if nodesorder is None and not self._generaldelta: if nodesorder is None and not self._generaldelta:
nodesorder = 'storage' nodesorder = 'storage'
return storageutil.emitrevisions( return storageutil.emitrevisions(
self, nodes, nodesorder, revlogrevisiondelta, self, nodes, nodesorder, revlogrevisiondelta,