equal
deleted
inserted
replaced
144 # if the file isn't in the manifest then it was removed |
144 # if the file isn't in the manifest then it was removed |
145 # or renamed, raise IOError to indicate this |
145 # or renamed, raise IOError to indicate this |
146 try: |
146 try: |
147 fctx = ctx.filectx(lfutil.standin(f)) |
147 fctx = ctx.filectx(lfutil.standin(f)) |
148 except error.LookupError: |
148 except error.LookupError: |
149 raise IOError |
149 return None |
150 renamed = fctx.renamed() |
150 renamed = fctx.renamed() |
151 if renamed: |
151 if renamed: |
152 renamed = lfutil.splitstandin(renamed[0]) |
152 renamed = lfutil.splitstandin(renamed[0]) |
153 |
153 |
154 hash = fctx.data().strip() |
154 hash = fctx.data().strip() |
246 # or renamed, raise IOError to indicate this |
246 # or renamed, raise IOError to indicate this |
247 srcfname = lfutil.splitstandin(f) |
247 srcfname = lfutil.splitstandin(f) |
248 try: |
248 try: |
249 fctx = ctx.filectx(srcfname) |
249 fctx = ctx.filectx(srcfname) |
250 except error.LookupError: |
250 except error.LookupError: |
251 raise IOError |
251 return None |
252 renamed = fctx.renamed() |
252 renamed = fctx.renamed() |
253 if renamed: |
253 if renamed: |
254 # standin is always a largefile because largefile-ness |
254 # standin is always a largefile because largefile-ness |
255 # doesn't change after rename or copy |
255 # doesn't change after rename or copy |
256 renamed = lfutil.standin(renamed[0]) |
256 renamed = lfutil.standin(renamed[0]) |
296 # Get memfilectx for a normal file |
296 # Get memfilectx for a normal file |
297 def _getnormalcontext(repo, ctx, f, revmap): |
297 def _getnormalcontext(repo, ctx, f, revmap): |
298 try: |
298 try: |
299 fctx = ctx.filectx(f) |
299 fctx = ctx.filectx(f) |
300 except error.LookupError: |
300 except error.LookupError: |
301 raise IOError |
301 return None |
302 renamed = fctx.renamed() |
302 renamed = fctx.renamed() |
303 if renamed: |
303 if renamed: |
304 renamed = renamed[0] |
304 renamed = renamed[0] |
305 |
305 |
306 data = fctx.data() |
306 data = fctx.data() |