[73593] trunk/dports/python/py26-hgsvn

[easieste at macports.org]

Revision: 73593
          http://trac.macports.org/changeset/73593
Author:   easieste at macports.org
Date:     2010-11-19 07:26:29 -0800 (Fri, 19 Nov 2010)
Log Message:
-----------
Fix for hgimportsvn failure complaining about untracked files.

c.f. http://bitbucket.org/andialbrecht/hgsvn/issue/90.

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

Added Paths:
-----------
    trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff

Modified: trunk/dports/python/py26-hgsvn/Portfile
===================================================================
--- trunk/dports/python/py26-hgsvn/Portfile	2010-11-19 15:26:08 UTC (rev 73592)
+++ trunk/dports/python/py26-hgsvn/Portfile	2010-11-19 15:26:29 UTC (rev 73593)
@@ -5,7 +5,7 @@
 
 name                    py26-hgsvn
 version                 0.1.8
-revision                1
+revision                2
 categories              python devel
 platforms               darwin
 maintainers             snc openmaintainer
@@ -25,7 +25,8 @@
                         port:subversion \
                         port:py26-distribute
 
-patchfiles              patch-hgsvn-ui.py.diff
+patchfiles              patch-hgsvn-ui.py.diff \
+                        patch-hgsvn-run-hgpullsvn.py.diff
 
 post-extract            { file copy ${filespath}/ez_setup.py ${worksrcpath} }
 

Added: trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff
===================================================================
--- trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff	                        (rev 0)
+++ trunk/dports/python/py26-hgsvn/files/patch-hgsvn-run-hgpullsvn.py.diff	2010-11-19 15:26:29 UTC (rev 73593)
@@ -0,0 +1,18 @@
+diff -r affc710ef4f9 hgsvn/run/hgpullsvn.py
+--- hgsvn/run/hgpullsvn.py	Sun May 25 21:58:16 2008 +0200
++++ hgsvn/run/hgpullsvn.py	Fri Nov 19 15:19:49 2010 +0100
+@@ -161,7 +161,13 @@
+                         raise
+                     run_hg(["add"], [new])
+             if removed_paths:
+-                run_hg(["remove", "-A"], removed_paths)
++                try: 
++                    run_hg(["remove", "-A"], removed_paths)
++                except (ExternalCommandFailed), e:
++                    if str(e).find("file is untracked") > 0:
++                        ui.status("Ignoring warnings about untracked files: '%s'" % str(e), level=ui.VERBOSE)
++                    else:
++                        raise
+             hg_commit_from_svn_log_entry(log_entry)
+         elif unrelated_paths:
+             detect_overwritten_svn_branch(wc_url, svn_rev)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101119/8e735c54/attachment.html>