723 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
723 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
724 islink='l' in flags, |
724 islink='l' in flags, |
725 isexec='x' in flags, |
725 isexec='x' in flags, |
726 copied=copied.get(path)) |
726 copied=copied.get(path)) |
727 return mctx |
727 return mctx |
728 raise IOError() |
728 return None |
729 |
729 |
730 message = cmdutil.logmessage(repo.ui, commitopts) |
730 message = cmdutil.logmessage(repo.ui, commitopts) |
731 if not message: |
731 if not message: |
732 message = old.description() |
732 message = old.description() |
733 |
733 |
1379 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
1379 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
1380 islink='l' in flags, |
1380 islink='l' in flags, |
1381 isexec='x' in flags, |
1381 isexec='x' in flags, |
1382 copied=copied.get(path)) |
1382 copied=copied.get(path)) |
1383 return mctx |
1383 return mctx |
1384 raise IOError() |
1384 return None |
1385 text = 'bumped update to %s:\n\n' % prec |
1385 text = 'bumped update to %s:\n\n' % prec |
1386 text += bumped.description() |
1386 text += bumped.description() |
1387 |
1387 |
1388 new = context.memctx(repo, |
1388 new = context.memctx(repo, |
1389 parents=[prec.node(), node.nullid], |
1389 parents=[prec.node(), node.nullid], |
1812 if dst in files) |
1812 if dst in files) |
1813 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=newcontent): |
1813 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=newcontent): |
1814 if path in redirect: |
1814 if path in redirect: |
1815 return filectxfn(repo, memctx, path, contentctx=target, redirect=()) |
1815 return filectxfn(repo, memctx, path, contentctx=target, redirect=()) |
1816 if path not in contentctx: |
1816 if path not in contentctx: |
1817 raise IOError() |
1817 return None |
1818 fctx = contentctx[path] |
1818 fctx = contentctx[path] |
1819 flags = fctx.flags() |
1819 flags = fctx.flags() |
1820 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
1820 mctx = memfilectx(repo, fctx.path(), fctx.data(), |
1821 islink='l' in flags, |
1821 islink='l' in flags, |
1822 isexec='x' in flags, |
1822 isexec='x' in flags, |