[73501] trunk/dports/python/py25-hgsvn

[easieste at macports.org]

Revision: 73501
          http://trac.macports.org/changeset/73501
Author:   easieste at macports.org
Date:     2010-11-15 05:34:21 -0800 (Mon, 15 Nov 2010)
Log Message:
-----------
Fix losing hgsubversion output for mercurial-1.7.

Will be fixed in next hgsubversion release, at which time
this patch should be backed out.

c.f. http://bitbucket.org/durin42/hgsubversion/changeset/ec52205e5ed1.

Declare dependencies on mercurial and subversion.

Modified Paths:
--------------
    trunk/dports/python/py25-hgsvn/Portfile

Added Paths:
-----------
    trunk/dports/python/py25-hgsvn/files/patch-hgsvn-ui.py.diff

Modified: trunk/dports/python/py25-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py25-hgsvn/Portfile	2010-11-15 13:22:22 UTC (rev 73500)
+++ trunk/dports/python/py25-hgsvn/Portfile	2010-11-15 13:34:21 UTC (rev 73501)
@@ -6,6 +6,7 @@
 
 name                    py25-hgsvn
 version                 0.1.8
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             saispo
@@ -21,7 +22,12 @@
                         sha1    029eeb5646228194d4677d2f4e3e33bc41da44cc \
                         rmd160  af056571b2d25110b61cffbf5512cb35967a7c1f
 
-depends_lib-append      port:py25-distribute
+depends_lib             port:mercurial \
+                        port:subversion \
+                        port:py25-distribute
+
+patchfiles              patch-hgsvn-ui.py.diff
+
 post-extract            { file copy ${filespath}/ez_setup.py ${worksrcpath} }
 
 post-destroot   {

Added: trunk/dports/python/py25-hgsvn/files/patch-hgsvn-ui.py.diff
===================================================================
--- trunk/dports/python/py25-hgsvn/files/patch-hgsvn-ui.py.diff	                        (rev 0)
+++ trunk/dports/python/py25-hgsvn/files/patch-hgsvn-ui.py.diff	2010-11-15 13:34:21 UTC (rev 73501)
@@ -0,0 +1,16 @@
+diff -r 02f257a83bbe hgsvn/ui.py
+--- hgsvn/ui.py	Mon Nov 15 10:10:07 2010 +0100
++++ hgsvn/ui.py	Mon Nov 15 11:07:21 2010 +0100
+@@ -7,7 +7,11 @@
+ 
+ try:
+     # First try to import the Mercurial implementation.
+-    from mercurial.util import termwidth
++    import mercurial.ui
++    if getattr(mercurial.ui.ui(), 'termwidth', False):
++        termwidth = mercurial.ui.ui().termwidth 
++    else:
++        from mercurial.util import termwidth
+ except ImportError:
+     # Fallback to local copy of Mercurial's implementation.
+     def termwidth():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101115/5882b4c1/attachment.html>