[73500] trunk/dports/python/py26-hgsubversion

[easieste at macports.org]

Revision: 73500
          http://trac.macports.org/changeset/73500
Author:   easieste at macports.org
Date:     2010-11-15 05:22:22 -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.

Modified Paths:
--------------
    trunk/dports/python/py26-hgsubversion/Portfile

Added Paths:
-----------
    trunk/dports/python/py26-hgsubversion/files/
    trunk/dports/python/py26-hgsubversion/files/patch-hgsubversion-wrappers.py.diff

Modified: trunk/dports/python/py26-hgsubversion/Portfile
===================================================================
--- trunk/dports/python/py26-hgsubversion/Portfile	2010-11-15 12:56:19 UTC (rev 73499)
+++ trunk/dports/python/py26-hgsubversion/Portfile	2010-11-15 13:22:22 UTC (rev 73500)
@@ -6,6 +6,7 @@
 
 name                    py26-hgsubversion
 version                 1.1.2
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             akitada openmaintainer
@@ -21,3 +22,4 @@
                         rmd160  217a4db198cc987683d21420aa153e3915b18ad9
 depends_lib             port:mercurial \
                         port:subversion-python26bindings
+patchfiles              patch-hgsubversion-wrappers.py.diff

Added: trunk/dports/python/py26-hgsubversion/files/patch-hgsubversion-wrappers.py.diff
===================================================================
--- trunk/dports/python/py26-hgsubversion/files/patch-hgsubversion-wrappers.py.diff	                        (rev 0)
+++ trunk/dports/python/py26-hgsubversion/files/patch-hgsubversion-wrappers.py.diff	2010-11-15 13:22:22 UTC (rev 73500)
@@ -0,0 +1,14 @@
+--- hgsubsversion/wrappers.py.orig
++++ hgsubversion/wrappers.py
+@@ -306,7 +306,10 @@ def pull(repo, source, heads=[], force=F
+                             msg = util.default_commit_msg
+                         else:
+                             msg = [s.strip() for s in msg.splitlines() if s][0]
+-                        w = hgutil.termwidth()
++                        if getattr(ui, 'termwidth', False):
++                            w = ui.termwidth()
++                        else:
++                            w = hgutil.termwidth()
+                         bits = (r.revnum, r.author, msg)
+                         ui.status(('[r%d] %s: %s' % bits)[:w] + '\n')
+                         util.progress(ui, 'pull', r.revnum - start, total=total)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101115/abb98f1b/attachment.html>