Comments
Patch
@@ -207,10 +207,14 @@ def _lfconvert_addchangeset(rsrc, rdst,
# If this file was renamed or copied then copy
# the largefile-ness of its predecessor
if f in ctx.manifest():
fctx = ctx.filectx(f)
renamed = fctx.renamed()
+ if renamed is None:
+ # the code below assumes renamed to be a boolean or a list
+ # and won't quite work with the value None
+ renamed = False
renamedlfile = renamed and renamed[0] in lfiles
islfile |= renamedlfile
if 'l' in fctx.flags():
if renamedlfile:
raise error.Abort(
@@ -1050,11 +1050,11 @@ class filectx(basefilectx):
or both changeset parents contain different file revisions.
"""
renamed = self._filelog.renamed(self._filenode)
if not renamed:
- return renamed
+ return None
if self.rev() == self.linkrev():
return renamed
name = self.path()