Show More
@@ -209,6 +209,10 b' def _lfconvert_addchangeset(rsrc, rdst, ' | |||||
209 | if f in ctx.manifest(): |
|
209 | if f in ctx.manifest(): | |
210 | fctx = ctx.filectx(f) |
|
210 | fctx = ctx.filectx(f) | |
211 | renamed = fctx.renamed() |
|
211 | renamed = fctx.renamed() | |
|
212 | if renamed is None: | |||
|
213 | # the code below assumes renamed to be a boolean or a list | |||
|
214 | # and won't quite work with the value None | |||
|
215 | renamed = False | |||
212 | renamedlfile = renamed and renamed[0] in lfiles |
|
216 | renamedlfile = renamed and renamed[0] in lfiles | |
213 | islfile |= renamedlfile |
|
217 | islfile |= renamedlfile | |
214 | if 'l' in fctx.flags(): |
|
218 | if 'l' in fctx.flags(): |
@@ -1052,7 +1052,7 b' class filectx(basefilectx):' | |||||
1052 |
|
1052 | |||
1053 | renamed = self._filelog.renamed(self._filenode) |
|
1053 | renamed = self._filelog.renamed(self._filenode) | |
1054 | if not renamed: |
|
1054 | if not renamed: | |
1055 |
return |
|
1055 | return None | |
1056 |
|
1056 | |||
1057 | if self.rev() == self.linkrev(): |
|
1057 | if self.rev() == self.linkrev(): | |
1058 | return renamed |
|
1058 | return renamed |
General Comments 0
You need to be logged in to leave comments.
Login now