[Python-apps-commits] r3369 - in packages/hg-git/trunk/debian (3 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Tuesday, August 4, 2009 @ 15:31:33
  Author: jwilk-guest
Revision: 3369

Fix compatibility with Mercurial 1.3.

Added:
  packages/hg-git/trunk/debian/patches/mercurial-1.3.diff
  packages/hg-git/trunk/debian/patches/series
Modified:
  packages/hg-git/trunk/debian/changelog

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2009-08-04 14:53:31 UTC (rev 3368)
+++ packages/hg-git/trunk/debian/changelog	2009-08-04 15:31:33 UTC (rev 3369)
@@ -1,6 +1,7 @@
 hg-git (0+hg20090603-2) UNRELEASED; urgency=low
 
   * Use quilt to manage patches.
+  * Fix compatiblity with Mercurial 1.3.
 
  -- Jakub Wilk <ubanus at users.sf.net>  Tue, 04 Aug 2009 16:49:54 +0200
 

Added: packages/hg-git/trunk/debian/patches/mercurial-1.3.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/mercurial-1.3.diff	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/mercurial-1.3.diff	2009-08-04 15:31:33 UTC (rev 3369)
@@ -0,0 +1,20 @@
+Description: Fix compatibility with Mercurial 1.3.
+Origin: http://bitbucket.org/abderrahim/hg-git/changeset/53ef6f725598/
+Author: Abderrahim Kitouni <a.kitouni at gmail.com>
+
+diff --git a/hgrepo.py b/hgrepo.py
+--- 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
+

Added: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/series	2009-08-04 15:31:33 UTC (rev 3369)
@@ -0,0 +1 @@
+mercurial-1.3.diff