Mercurial > hg
changeset 41775:a86e22007b54
largefiles: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6015
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 27 Dec 2017 22:32:27 -0800 |
| parents | 2e2076c8c25f |
| children | 322ce0bca19d |
| files | hgext/largefiles/lfcommands.py |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfcommands.py Wed Dec 27 22:31:24 2017 -0800 +++ b/hgext/largefiles/lfcommands.py Wed Dec 27 22:32:27 2017 -0800 @@ -207,12 +207,12 @@ # the largefile-ness of its predecessor if f in ctx.manifest(): fctx = ctx.filectx(f) - renamed = fctx.renamed() + renamed = fctx.copysource() 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 + renamedlfile = renamed and renamed in lfiles islfile |= renamedlfile if 'l' in fctx.flags(): if renamedlfile: @@ -232,8 +232,8 @@ if f in ctx.manifest(): fctx = ctx.filectx(f) if 'l' in fctx.flags(): - renamed = fctx.renamed() - if renamed and renamed[0] in lfiles: + renamed = fctx.copysource() + if renamed and renamed in lfiles: raise error.Abort(_('largefile %s becomes symlink') % f) # largefile was modified, update standins @@ -259,11 +259,11 @@ fctx = ctx.filectx(srcfname) except error.LookupError: return None - renamed = fctx.renamed() + renamed = fctx.copysource() if renamed: # standin is always a largefile because largefile-ness # doesn't change after rename or copy - renamed = lfutil.standin(renamed[0]) + renamed = lfutil.standin(renamed) return context.memfilectx(repo, memctx, f, lfiletohash[srcfname] + '\n', @@ -308,9 +308,7 @@ fctx = ctx.filectx(f) except error.LookupError: return None - renamed = fctx.renamed() - if renamed: - renamed = renamed[0] + renamed = fctx.copysource() data = fctx.data() if f == '.hgtags':