This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3807

convert: use progress helper
ClosedPublic

Authored by martinvonz on Jun 18 2018, 8:45 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG65d1d7da63d1: convert: use progress helper
Summary

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

martinvonz created this revision.Jun 18 2018, 8:45 PM
pulkit accepted this revision.Jun 19 2018, 7:05 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/convert/convcmd.py
524

This can be progress.increment().

Closed by commit rHG65d1d7da63d1: convert: use progress helper (authored by martinvonz). · Explain WhyJun 19 2018, 7:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/convcmd.py (24 lines)
Mhgext/convert/subversion.py (7 lines)

Diff 9223

hgext/convert/convcmd.py

except MissingTool as inst: except MissingTool as inst:
raise error.Abort('%s\n' % inst) raise error.Abort('%s\n' % inst)
raise error.Abort(_('%s: unknown repository type') % path) raise error.Abort(_('%s: unknown repository type') % path)
class progresssource(object): class progresssource(object):
def __init__(self, ui, source, filecount): def __init__(self, ui, source, filecount):
self.ui = ui self.ui = ui
self.source = source self.source = source
self.filecount = filecount self.progress = ui.makeprogress(_('getting files'), unit=_('files'),
self.retrieved = 0 total=filecount)
def getfile(self, file, rev): def getfile(self, file, rev):
self.retrieved += 1 self.progress.increment(item=file)
self.ui.progress(_('getting files'), self.retrieved,
item=file, total=self.filecount, unit=_('files'))
return self.source.getfile(file, rev) return self.source.getfile(file, rev)
def targetfilebelongstosource(self, targetfilename): def targetfilebelongstosource(self, targetfilename):
return self.source.targetfilebelongstosource(targetfilename) return self.source.targetfilebelongstosource(targetfilename)
def lookuprev(self, rev): def lookuprev(self, rev):
return self.source.lookuprev(rev) return self.source.lookuprev(rev)
def close(self): def close(self):
self.ui.progress(_('getting files'), None) self.progress.complete()
class converter(object): class converter(object):
def __init__(self, ui, source, dest, revmapfile, opts): def __init__(self, ui, source, dest, revmapfile, opts):
self.source = source self.source = source
self.dest = dest self.dest = dest
self.ui = ui self.ui = ui
self.opts = opts self.opts = opts
def walktree(self, heads): def walktree(self, heads):
'''Return a mapping that identifies the uncommitted parents of every '''Return a mapping that identifies the uncommitted parents of every
uncommitted changeset.''' uncommitted changeset.'''
visit = list(heads) visit = list(heads)
known = set() known = set()
parents = {} parents = {}
numcommits = self.source.numcommits() numcommits = self.source.numcommits()
progress = self.ui.makeprogress(_('scanning'), unit=_('revisions'),
total=numcommits)
while visit: while visit:
n = visit.pop(0) n = visit.pop(0)
if n in known: if n in known:
continue continue
if n in self.map: if n in self.map:
m = self.map[n] m = self.map[n]
if m == SKIPREV or self.dest.hascommitfrommap(m): if m == SKIPREV or self.dest.hascommitfrommap(m):
continue continue
known.add(n) known.add(n)
self.ui.progress(_('scanning'), len(known), unit=_('revisions'), progress.update(len(known))
total=numcommits)
commit = self.cachecommit(n) commit = self.cachecommit(n)
parents[n] = [] parents[n] = []
for p in commit.parents: for p in commit.parents:
parents[n].append(p) parents[n].append(p)
visit.append(p) visit.append(p)
self.ui.progress(_('scanning'), None) progress.complete()
return parents return parents
def mergesplicemap(self, parents, splicemap): def mergesplicemap(self, parents, splicemap):
"""A splicemap redefines child/parent relationships. Check the """A splicemap redefines child/parent relationships. Check the
map contains valid revision identifiers and merge the new map contains valid revision identifiers and merge the new
links in the source graph. links in the source graph.
""" """
parents = self.walktree(heads) parents = self.walktree(heads)
self.mergesplicemap(parents, self.splicemap) self.mergesplicemap(parents, self.splicemap)
self.ui.status(_("sorting...\n")) self.ui.status(_("sorting...\n"))
t = self.toposort(parents, sortmode) t = self.toposort(parents, sortmode)
num = len(t) num = len(t)
c = None c = None
self.ui.status(_("converting...\n")) self.ui.status(_("converting...\n"))
progress = self.ui.makeprogress(_('converting'),
unit=_('revisions'), total=len(t))
for i, c in enumerate(t): for i, c in enumerate(t):
num -= 1 num -= 1
desc = self.commitcache[c].desc desc = self.commitcache[c].desc
if "\n" in desc: if "\n" in desc:
desc = desc.splitlines()[0] desc = desc.splitlines()[0]
# convert log message to local encoding without using # convert log message to local encoding without using
# tolocal() because the encoding.encoding convert() # tolocal() because the encoding.encoding convert()
# uses is 'utf-8' # uses is 'utf-8'
self.ui.status("%d %s\n" % (num, recode(desc))) self.ui.status("%d %s\n" % (num, recode(desc)))
self.ui.note(_("source: %s\n") % recode(c)) self.ui.note(_("source: %s\n") % recode(c))
self.ui.progress(_('converting'), i, unit=_('revisions'), progress.update(i)
pulkitUnsubmitted
Not Done

This can be progress.increment().

pulkit: This can be progress.increment().
total=len(t))
self.copy(c) self.copy(c)
self.ui.progress(_('converting'), None) progress.complete()
if not self.ui.configbool('convert', 'skiptags'): if not self.ui.configbool('convert', 'skiptags'):
tags = self.source.gettags() tags = self.source.gettags()
ctags = {} ctags = {}
for k in tags: for k in tags:
v = tags[k] v = tags[k]
if self.map.get(v, SKIPREV) != SKIPREV: if self.map.get(v, SKIPREV) != SKIPREV:
ctags[k] = self.map[v] ctags[k] = self.map[v]

hgext/convert/subversion.py

changed, removed = set(), set() changed, removed = set(), set()
copies = {} copies = {}
new_module, revnum = revsplit(rev)[1:] new_module, revnum = revsplit(rev)[1:]
if new_module != self.module: if new_module != self.module:
self.module = new_module self.module = new_module
self.reparent(self.module) self.reparent(self.module)
progress = self.ui.makeprogress(_('scanning paths'), unit=_('paths'),
total=len(paths))
for i, (path, ent) in enumerate(paths): for i, (path, ent) in enumerate(paths):
self.ui.progress(_('scanning paths'), i, item=path, progress.update(i, item=path)
total=len(paths), unit=_('paths'))
entrypath = self.getrelpath(path) entrypath = self.getrelpath(path)
kind = self._checkpath(entrypath, revnum) kind = self._checkpath(entrypath, revnum)
if kind == svn.core.svn_node_file: if kind == svn.core.svn_node_file:
changed.add(self.recode(entrypath)) changed.add(self.recode(entrypath))
if not ent.copyfrom_path or not parents: if not ent.copyfrom_path or not parents:
continue continue
# Copy sources not in parent revisions cannot be # Copy sources not in parent revisions cannot be
for childpath in children: for childpath in children:
childpath = self.getrelpath("/" + childpath, pmodule) childpath = self.getrelpath("/" + childpath, pmodule)
if not childpath: if not childpath:
continue continue
copytopath = path + childpath[len(copyfrompath):] copytopath = path + childpath[len(copyfrompath):]
copytopath = self.getrelpath(copytopath) copytopath = self.getrelpath(copytopath)
copies[self.recode(copytopath)] = self.recode(childpath) copies[self.recode(copytopath)] = self.recode(childpath)
self.ui.progress(_('scanning paths'), None) progress.complete()
changed.update(removed) changed.update(removed)
return (list(changed), removed, copies) return (list(changed), removed, copies)
def _fetch_revisions(self, from_revnum, to_revnum): def _fetch_revisions(self, from_revnum, to_revnum):
if from_revnum < to_revnum: if from_revnum < to_revnum:
from_revnum, to_revnum = to_revnum, from_revnum from_revnum, to_revnum = to_revnum, from_revnum
self.child_cset = None self.child_cset = None