From guido at codespeak.net  Thu Jun 14 15:32:55 2007
From: guido at codespeak.net (guido at codespeak.net)
Date: Thu, 14 Jun 2007 15:32:55 +0200 (CEST)
Subject: [py-svn] r44248 - in py/trunk/py/path/svn: . testing
Message-ID: <20070614133255.01F94824B@code0.codespeak.net>

Author: guido
Date: Thu Jun 14 15:32:55 2007
New Revision: 44248

Modified:
   py/trunk/py/path/svn/testing/test_wccommand.py
   py/trunk/py/path/svn/wccommand.py
Log:
Fixed problem with calling .remove() on wcpaths of non-versioned files.


Modified: py/trunk/py/path/svn/testing/test_wccommand.py
==============================================================================
--- py/trunk/py/path/svn/testing/test_wccommand.py	(original)
+++ py/trunk/py/path/svn/testing/test_wccommand.py	Thu Jun 14 15:32:55 2007
@@ -156,6 +156,15 @@
         finally:
             notexisting.remove()
 
+    def test_nonversioned_remove(self):
+        assert self.root.check(versioned=1)
+        somefile = self.root.join('nonversioned/somefile')
+        nonwc = py.path.local(somefile)
+        nonwc.ensure()
+        assert somefile.check()
+        assert not somefile.check(versioned=True)
+        somefile.remove() # this used to fail because it tried to 'svn rm'
+
     def test_properties(self):
         try:
             self.root.propset('gaga', 'this')

Modified: py/trunk/py/path/svn/wccommand.py
==============================================================================
--- py/trunk/py/path/svn/wccommand.py	(original)
+++ py/trunk/py/path/svn/wccommand.py	Thu Jun 14 15:32:55 2007
@@ -180,6 +180,10 @@
             underlying svn semantics.
         """
         assert rec, "svn cannot remove non-recursively"
+        if not self.check(versioned=True):
+            # not added to svn (anymore?), just remove
+            py.path.local(self).remove()
+            return
         flags = []
         if force:
             flags.append('--force')


From py-svn at codespeak.net  Fri Jun 22 15:54:05 2007
From: py-svn at codespeak.net (py-svn at codespeak.net)
Date: Fri, 22 Jun 2007 15:54:05 +0200 (CEST)
Subject: [py-svn] Men's sale ending soon! Don't miss out!!
Message-ID: <20070622055437.49801.qmail@ALamentin-104-1-40-31.w80-8.abo.wanadoo.fr>

An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pytest-commit/attachments/20070622/560f3af5/attachment.html>

From py-svn at codespeak.net  Fri Jun 29 17:01:09 2007
From: py-svn at codespeak.net (py-svn at codespeak.net)
Date: Fri, 29 Jun 2007 17:01:09 +0200 (CEST)
Subject: [py-svn] Cool Summer Deals
Message-ID: <20070629040314.11617.qmail@cpc2-leic2-0-0-cust614.lei3.cable.ntl.com>

An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pytest-commit/attachments/20070629/40544ae2/attachment.html>