changeset 178:53ef6f725598

make sure commit_import_ctx works with latest hg
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Wed, 03 Jun 2009 19:29:44 +0100
parents 88fdcb23294e
children c5c63783ace0
files hgrepo.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgrepo.py
+++ b/hgrepo.py
@@ -54,7 +54,10 @@
                 try:
                     fctx = wctx.filectx(f)
                     newflags = fctx.flags()
-                    new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
+                    try:
+                        new[f] = self.filecommit(fctx, m1, m2, linkrev, trp, changed)
+                    except AttributeError:
+                        new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, changed)
                     if ((not changed or changed[-1] != f) and
                         m2.get(f) != new[f]):
                         # mention the file in the changelog if some