Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 22296:650b5b6e75ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: use None value for missing files instead of overloading IOError The internal API used IOError to indicate that a file should be marked as removed. There is some correlation between IOError (especially with ENOENT) and files that should be removed, but using IOErrors to represent file removal internally required some hacks. Instead, use the value None to indicate that the file not is present. Before, spurious IO errors could cause commits that silently removed files. They will now be reported like all other IO errors so the root cause can be fixed.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Aug 2014 22:03:32 +0200
parents ffaaa80fa724
children bdc0e04df243
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Aug 27 12:30:28 2014 +0200
+++ b/mercurial/cmdutil.py	Tue Aug 26 22:03:32 2014 +0200
@@ -2130,7 +2130,7 @@
                                                   copied=copied.get(path))
                         return mctx
                     except KeyError:
-                        raise IOError
+                        return None
             else:
                 ui.note(_('copying changeset %s to %s\n') % (old, base))
 
@@ -2139,7 +2139,7 @@
                     try:
                         return old.filectx(path)
                     except KeyError:
-                        raise IOError
+                        return None
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()