Submitter | phabricator |
---|---|
Date | Dec. 11, 2017, 5:47 p.m. |
Message ID | <differential-rev-PHID-DREV-5bnw4swqvlzvd56utesf-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/26218/ |
State | Superseded |
Headers | show |
Comments
yuja requested changes to this revision. yuja added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > synthrepo.py:453 > if path not in changes: > changes[path] = None > break Perhaps filectxfn() should return None in this case. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1656 To: martinvonz, #hg-reviewers, durin42, yuja Cc: yuja, mercurial-devel
martinvonz marked an inline comment as done. martinvonz added inline comments. INLINE COMMENTS > yuja wrote in synthrepo.py:453 > Perhaps filectxfn() should return None in this case. Oops, good catch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1656 To: martinvonz, #hg-reviewers, durin42, yuja Cc: yuja, mercurial-devel
durin42 added a comment. Crud. I had an old version of this queued, and failed to drop it. Fixing now... REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1656 To: martinvonz, #hg-reviewers, durin42, yuja Cc: yuja, mercurial-devel
Patch
diff --git a/contrib/synthrepo.py b/contrib/synthrepo.py --- a/contrib/synthrepo.py +++ b/contrib/synthrepo.py @@ -369,14 +369,14 @@ while not validpath(path): path = pickpath() data = '%s contents\n' % path - files[path] = context.memfilectx(repo, path, data) + files[path] = data dir = os.path.dirname(path) while dir and dir not in dirs: dirs.add(dir) dir = os.path.dirname(dir) def filectxfn(repo, memctx, path): - return files[path] + return context.memfilectx(repo, path, files[path]) ui.progress(_synthesizing, None) message = 'synthesized wide repo with %d files' % (len(files),)