This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1656

synthrepo: create filectx instance in 'filectxfn' callback
ClosedPublic

Authored by martinvonz on Dec 11 2017, 12:47 PM.

Details

Reviewers
durin42
yuja
Group Reviewers
hg-reviewers
Commits
rHG304179b21bff: synthrepo: create filectx instance in 'filectxfn' callback
Summary

I would like to pass the memctx to the memfilectx constructor, but
it's not available where we currently create the memfilectx. It is
available in the 'filectxfn' callback, so let's create the memfilectx
there instead. A later patch will start actually passing the memctx.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 11 2017, 12:47 PM
durin42 accepted this revision.Dec 11 2017, 1:14 PM
This revision is now accepted and ready to land.Dec 11 2017, 1:14 PM
martinvonz updated this revision to Diff 4364.Dec 11 2017, 3:33 PM
yuja requested changes to this revision.Dec 12 2017, 8:35 AM
yuja added a subscriber: yuja.
yuja added inline comments.
contrib/synthrepo.py
452–453

Perhaps filectxfn() should return None in this case.

This revision now requires changes to proceed.Dec 12 2017, 8:35 AM
martinvonz updated this revision to Diff 4380.Dec 12 2017, 2:34 PM
martinvonz marked an inline comment as done.Dec 12 2017, 2:34 PM
martinvonz added inline comments.
contrib/synthrepo.py
452–453

Oops, good catch.

martinvonz marked an inline comment as done.Dec 12 2017, 5:15 PM
Closed by commit rHG304179b21bff: synthrepo: create filectx instance in 'filectxfn' callback (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Dec 12 2017, 5:16 PM

Crud. I had an old version of this queued, and failed to drop it. Fixing now...

martinvonz updated this revision to Diff 4392.Dec 12 2017, 5:18 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/synthrepo.py (14 lines)

Diff 4392

contrib/synthrepo.py

for i in xrange(0, initcount): for i in xrange(0, initcount):
ui.progress(_synthesizing, i, unit=_files, total=initcount) ui.progress(_synthesizing, i, unit=_files, total=initcount)
path = pickpath() path = pickpath()
while not validpath(path): while not validpath(path):
path = pickpath() path = pickpath()
data = '%s contents\n' % path data = '%s contents\n' % path
files[path] = context.memfilectx(repo, path, data) files[path] = data
dir = os.path.dirname(path) dir = os.path.dirname(path)
while dir and dir not in dirs: while dir and dir not in dirs:
dirs.add(dir) dirs.add(dir)
dir = os.path.dirname(dir) dir = os.path.dirname(dir)
def filectxfn(repo, memctx, path): def filectxfn(repo, memctx, path):
return files[path] return context.memfilectx(repo, path, files[path])
ui.progress(_synthesizing, None) ui.progress(_synthesizing, None)
message = 'synthesized wide repo with %d files' % (len(files),) message = 'synthesized wide repo with %d files' % (len(files),)
mc = context.memctx(repo, [pctx.node(), nullid], message, mc = context.memctx(repo, [pctx.node(), nullid], message,
files.iterkeys(), filectxfn, ui.username(), files.iterkeys(), filectxfn, ui.username(),
'%d %d' % util.makedate()) '%d %d' % util.makedate())
initnode = mc.commit() initnode = mc.commit()
if ui.debugflag: if ui.debugflag:
add, remove = pick(lineschanged) add, remove = pick(lineschanged)
for __ in xrange(remove): for __ in xrange(remove):
if not lines: if not lines:
break break
del lines[random.randrange(0, len(lines))] del lines[random.randrange(0, len(lines))]
for __ in xrange(add): for __ in xrange(add):
lines.insert(random.randint(0, len(lines)), makeline()) lines.insert(random.randint(0, len(lines)), makeline())
path = fctx.path() path = fctx.path()
changes[path] = context.memfilectx(repo, path, changes[path] = '\n'.join(lines) + '\n'
'\n'.join(lines) + '\n')
for __ in xrange(pick(filesremoved)): for __ in xrange(pick(filesremoved)):
path = random.choice(mfk) path = random.choice(mfk)
for __ in xrange(10): for __ in xrange(10):
path = random.choice(mfk) path = random.choice(mfk)
if path not in changes: if path not in changes:
changes[path] = None
break break
yujaUnsubmitted
Done

Perhaps filectxfn() should return None in this case.

yuja: Perhaps filectxfn() should return None in this case.
martinvonzAuthorUnsubmitted
Not Done

Oops, good catch.

martinvonz: Oops, good catch.
if filesadded: if filesadded:
dirs = list(pctx.dirs()) dirs = list(pctx.dirs())
dirs.insert(0, '') dirs.insert(0, '')
for __ in xrange(pick(filesadded)): for __ in xrange(pick(filesadded)):
pathstr = '' pathstr = ''
while pathstr in dirs: while pathstr in dirs:
path = [random.choice(dirs)] path = [random.choice(dirs)]
if pick(dirsadded): if pick(dirsadded):
path.append(random.choice(words)) path.append(random.choice(words))
path.append(random.choice(words)) path.append(random.choice(words))
pathstr = '/'.join(filter(None, path)) pathstr = '/'.join(filter(None, path))
data = '\n'.join(makeline() data = '\n'.join(makeline()
for __ in xrange(pick(linesinfilesadded))) + '\n' for __ in xrange(pick(linesinfilesadded))) + '\n'
changes[pathstr] = context.memfilectx(repo, pathstr, data) changes[pathstr] = data
def filectxfn(repo, memctx, path): def filectxfn(repo, memctx, path):
return changes[path] if path not in changes:
return None
return context.memfilectx(repo, path, changes[path])
if not changes: if not changes:
continue continue
if revs: if revs:
date = repo['tip'].date()[0] + pick(interarrival) date = repo['tip'].date()[0] + pick(interarrival)
else: else:
date = time.time() - (86400 * count) date = time.time() - (86400 * count)
# dates in mercurial must be positive, fit in 32-bit signed integers. # dates in mercurial must be positive, fit in 32-bit signed integers.
date = min(0x7fffffff, max(0, date)) date = min(0x7fffffff, max(0, date))