# HG changeset patch
# User FUJIWARA Katsunori <fo...@lares.dti.ne.jp>
# Date 1490361203 -32400
# Fri Mar 24 22:13:23 2017 +0900
# Node ID 1f1ed3058fa829550b52110f35c65b4f79c92d10
# Parent e8bd005c0af791a87903de339482692db1137ff0
misc: update descriptions about removed file for filectxfn
Since 650b5b6e75ed, filectxfn for memctx should return None for
removed file instead of raising IOError.
diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py
+++ b/hgext/largefiles/lfcommands.py
@@ -246,7 +246,7 @@ def _lfconvert_addchangeset(rsrc, rdst,
def getfilectx(repo, memctx, f):
if lfutil.isstandin(f):
# if the file isn't in the manifest then it was removed
- # or renamed, raise IOError to indicate this
+ # or renamed, return None to indicate this
srcfname = lfutil.splitstandin(f)
try:
fctx = ctx.filectx(srcfname)
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1864,8 +1864,8 @@ class memctx(committablectx):
commit function for every file in 'files', but calls order is
undefined. If the file is available in the revision being
committed (updated or added), filectxfn returns a memfilectx
- object. If the file was removed, filectxfn raises an
- IOError. Moved files are represented by marking the source file
+ object. If the file was removed, filectxfn return None for recent
+ Mercurial. Moved files are represented by marking the source file
removed and the new file added with copy information (see
memfilectx).
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
