equal
deleted
inserted
replaced
127 # if the file isn't in the manifest then it was removed |
127 # if the file isn't in the manifest then it was removed |
128 # or renamed, raise IOError to indicate this |
128 # or renamed, raise IOError to indicate this |
129 try: |
129 try: |
130 fctx = ctx.filectx(lfutil.standin(f)) |
130 fctx = ctx.filectx(lfutil.standin(f)) |
131 except error.LookupError: |
131 except error.LookupError: |
132 raise IOError() |
132 raise IOError |
133 renamed = fctx.renamed() |
133 renamed = fctx.renamed() |
134 if renamed: |
134 if renamed: |
135 renamed = lfutil.splitstandin(renamed[0]) |
135 renamed = lfutil.splitstandin(renamed[0]) |
136 |
136 |
137 hash = fctx.data().strip() |
137 hash = fctx.data().strip() |
227 # or renamed, raise IOError to indicate this |
227 # or renamed, raise IOError to indicate this |
228 srcfname = lfutil.splitstandin(f) |
228 srcfname = lfutil.splitstandin(f) |
229 try: |
229 try: |
230 fctx = ctx.filectx(srcfname) |
230 fctx = ctx.filectx(srcfname) |
231 except error.LookupError: |
231 except error.LookupError: |
232 raise IOError() |
232 raise IOError |
233 renamed = fctx.renamed() |
233 renamed = fctx.renamed() |
234 if renamed: |
234 if renamed: |
235 # standin is always a largefile because largefile-ness |
235 # standin is always a largefile because largefile-ness |
236 # doesn't change after rename or copy |
236 # doesn't change after rename or copy |
237 renamed = lfutil.standin(renamed[0]) |
237 renamed = lfutil.standin(renamed[0]) |
276 # Get memfilectx for a normal file |
276 # Get memfilectx for a normal file |
277 def _getnormalcontext(ui, ctx, f, revmap): |
277 def _getnormalcontext(ui, ctx, f, revmap): |
278 try: |
278 try: |
279 fctx = ctx.filectx(f) |
279 fctx = ctx.filectx(f) |
280 except error.LookupError: |
280 except error.LookupError: |
281 raise IOError() |
281 raise IOError |
282 renamed = fctx.renamed() |
282 renamed = fctx.renamed() |
283 if renamed: |
283 if renamed: |
284 renamed = renamed[0] |
284 renamed = renamed[0] |
285 |
285 |
286 data = fctx.data() |
286 data = fctx.data() |