D6015: largefiles: migrate to new method for getting copy info
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Feb 23 17:09:05 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6015
AFFECTED FILES
hgext/largefiles/lfcommands.py
CHANGE DETAILS
diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py
+++ b/hgext/largefiles/lfcommands.py
@@ -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':
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list