Changeset 1319 in tailor

Timestamp:

02/27/07 02:12:34 (6 years ago)

Author:

John Goerzen <jgoerzen@…>

Hash name:

20070227011234-c2a52-70b7d80b21ab1b080b176c138479bee55bd28764

Message:

Generalize directory filtering and add it to commit
Without this, tailor was crashing whenever it tried to commit a changeset
from darcs that added an empty directory

File:

• vcpx/repository/hg.py (modified) (2 diffs)

vcpx/repository/hg.py

@@ -242 +242 @@
             entry.old_name = normpath(self.repository.encode(entry.old_name))
 
+    def _removeDirs(self, names):
+        from os.path import isdir, join, normpath
+        """Remove the names that reference a directory."""
+        return [n for n in names
+                if not isdir(join(self.repository.basedir, normpath(n)))]
+        return notdirs
+
     def _addPathnames(self, names):
-        from os.path import join, isdir, normpath
-
-        notdirs = [n for n in names
-                   if not isdir(join(self.repository.basedir, normpath(n)))]
+        from os.path import join
+
+        notdirs = self._removeDirs(names)
         if notdirs:
             self.log.info('Adding %s...', ', '.join(notdirs))
@@ -275 +281 @@
         opts['user'] = encode(author)
         opts['date'] =  '%d %d' % (timestamp, -timezone) # note the minus sign!
-        self._hgCommand('commit', *[encode(n) for n in names], **opts)
+        notdirs = self._removeDirs(names)
+        self._hgCommand('commit', *[encode(n) for n in notdirs], **opts)
 
     def _tag(self, tag):