equal
deleted
inserted
replaced
259 if renamed: |
259 if renamed: |
260 # standin is always a largefile because largefile-ness |
260 # standin is always a largefile because largefile-ness |
261 # doesn't change after rename or copy |
261 # doesn't change after rename or copy |
262 renamed = lfutil.standin(renamed[0]) |
262 renamed = lfutil.standin(renamed[0]) |
263 |
263 |
264 return context.memfilectx(repo, f, lfiletohash[srcfname] + '\n', |
264 return context.memfilectx(repo, memctx, f, |
|
265 lfiletohash[srcfname] + '\n', |
265 'l' in fctx.flags(), 'x' in fctx.flags(), |
266 'l' in fctx.flags(), 'x' in fctx.flags(), |
266 renamed) |
267 renamed) |
267 else: |
268 else: |
268 return _getnormalcontext(repo, ctx, f, revmap) |
269 return _getnormalcontext(repo, ctx, f, revmap) |
269 |
270 |
311 renamed = renamed[0] |
312 renamed = renamed[0] |
312 |
313 |
313 data = fctx.data() |
314 data = fctx.data() |
314 if f == '.hgtags': |
315 if f == '.hgtags': |
315 data = _converttags (repo.ui, revmap, data) |
316 data = _converttags (repo.ui, revmap, data) |
316 return context.memfilectx(repo, f, data, 'l' in fctx.flags(), |
317 return context.memfilectx(repo, ctx, f, data, 'l' in fctx.flags(), |
317 'x' in fctx.flags(), renamed) |
318 'x' in fctx.flags(), renamed) |
318 |
319 |
319 # Remap tag data using a revision map |
320 # Remap tag data using a revision map |
320 def _converttags(ui, revmap, data): |
321 def _converttags(ui, revmap, data): |
321 newdata = [] |
322 newdata = [] |