Merge branch 'release/1.0.2' into 1.0_master

Author: ScottDuckworth

anyvcs/__init__.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-anyvcs.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 def create(path, vcs):
   from common import UnknownVCSType

anyvcs/git.py

@@ -104,7 +104,7 @@ def cat(self, rev, path):
     path = type(self).cleanPath(path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'f':
+    if ls[0].get('type') != 'f':
       raise BadFileType(rev, path)
     cmd = [GIT, 'cat-file', 'blob', '%s:%s' % (rev, path)]
     return self._command(cmd)
@@ -117,7 +117,7 @@ def readlink(self, rev, path):
     path = type(self).cleanPath(path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'l':
+    if ls[0].get('type') != 'l':
       raise BadFileType(rev, path)
     return self._readlink(rev, path)
 

anyvcs/hg.py

@@ -110,7 +110,7 @@ def cat(self, rev, path):
     path = type(self).cleanPath(path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'f':
+    if ls[0].get('type') != 'f':
       raise BadFileType(rev, path)
     cmd = [HG, 'cat', '-r', str(rev), path]
     return self._command(cmd)
@@ -119,7 +119,7 @@ def readlink(self, rev, path):
     path = type(self).cleanPath(path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'l':
+    if ls[0].get('type') != 'l':
       raise BadFileType(rev, path)
     return self._cat(str(rev), path)
 

anyvcs/svn.py

@@ -184,7 +184,7 @@ def cat(self, rev, path):
     path = type(self).cleanPath(prefix + path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'f':
+    if ls[0].get('type') != 'f':
       raise BadFileType(rev, path)
     return self._cat(str(rev), path)
 
@@ -199,7 +199,7 @@ def readlink(self, rev, path):
     path = type(self).cleanPath(prefix + path)
     ls = self.ls(rev, path, directory=True)
     assert len(ls) == 1
-    if ls[0].type != 'l':
+    if ls[0].get('type') != 'l':
       raise BadFileType(rev, path)
     return self._readlink(str(rev), path)
 
@@ -217,7 +217,7 @@ def _heads(self, globs):
     results = []
     def match(n, path):
       for d in self.ls(youngest, path):
-        if d.type == 'd':
+        if d.get('type') == 'd':
           for k, v in n.iteritems():
             if fnmatch.fnmatchcase(d.name, k):
               if path:

tests.py

@@ -678,6 +678,9 @@ def test_cat_error3(self):
   def test_cat_error4(self):
     self.assertRaises(BadFileType, self.repo.cat, self.main_branch, '/c')
 
+  def test_cat_error5(self):
+    self.assertRaises(BadFileType, self.repo.cat, self.main_branch, '/')
+
   def test_readlink1(self):
     result = self.repo.readlink(self.main_branch, 'b')
     correct = 'a'
@@ -710,6 +713,9 @@ def test_readlink_error3(self):
   def test_readlink_error4(self):
     self.assertRaises(BadFileType, self.repo.readlink, self.main_branch, '/c')
 
+  def test_readlink_error5(self):
+    self.assertRaises(BadFileType, self.repo.readlink, self.main_branch, '/')
+
   def test_log_head(self):
     result = self.repo.log(revrange=self.main_branch)
     self.assertIsInstance(result, CommitLogEntry)