Changeset 344

Timestamp:

22-05-08 21:48:59 (5 years ago)

Author:

thomas

Message:

• moap/vcs/vcs.py: Add getPropertyChanges() to get paths that have changed properties.
• moap/test/test_vcs_svn.py:
• moap/vcs/svn.py: Implement it for svn.
• moap/command/cl.py: Use it in moap cl prep so that we allow commenting on property changes. Fixes #286.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/command/cl.py (modified) (4 diffs)
• moap/test/test_vcs_svn.py (modified) (1 diff)
• moap/vcs/svn.py (modified) (1 diff)
• moap/vcs/vcs.py (modified) (1 diff, 1 prop)

trunk/ChangeLog

@@ +1 @@
+2008-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/vcs/vcs.py:
+          Add getPropertyChanges() to get paths that have changed properties.
+        * moap/test/test_vcs_svn.py:
+        * moap/vcs/svn.py:
+          Implement it for svn.
+        * moap/command/cl.py:
+          Use it in moap cl prep so that we allow commenting on property
+          changes.
+          Fixes #286.
+
 2008-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/command/cl.py

@@ -433 +433 @@
 
     def do(self, args):
+        def filePathRelative(vcsPath, filePath):
+            # the paths are absolute because we asked for an absolute path
+            # diff strip them to be relative
+            if filePath.startswith(vcsPath):
+                filePath = filePath[len(vcsPath) + 1:]
+            return filePath
+
+        def writeLine(about):
+            line = "\t* %s:\n" % about
+            # wrap to maximum 72 characters, and keep tabs
+            lines = textwrap.wrap(line, 72, expand_tabs=False,
+                replace_whitespace=False,
+                subsequent_indent="\t  ")
+            os.write(fd, "\n".join(lines) + '\n')
+
+
         clPath = self.parentCommand.clPath
         if args:
@@ -454 +470 @@
         self.stdout.write('Finding changes.\n')
         changes = v.getChanges(vcsPath)
+        propertyChanges = v.getPropertyChanges(vcsPath)
 
         # filter out the ChangeLog we're preparing
@@ -459 +476 @@
             del changes[os.path.abspath(clPath)]
 
-        if not changes:
+        if not (changes or propertyChanges):
             self.stdout.write('No changes detected.\n')
             return 0
 
-        files = changes.keys()
-        files.sort()
-
-        ct = ctags.CTags()
-        if self.options.ctags:
-            # run ctags only on files that aren't deleted
-            ctagsFiles = files[:]
-            for f in files:
-                if not os.path.exists(f):
-                    ctagsFiles.remove(f)
-
-            # get the tags for all the files we're looking at
-            binary = None
-            for candidate in ["ctags", "exuberant-ctags", "ctags-exuberant"]:
-                self.debug('Checking for existence of %s' % candidate)
-                if os.system('which %s > /dev/null 2>&1' % candidate) == 0:
-                    self.debug('Checking for exuberance of %s' % candidate)
-                    output = commands.getoutput("%s --version" % candidate)
-                    if output.startswith("Exuberant"):
-                        binary = candidate
-                        break
-
-            if not binary:
-                self.stderr.write('Warning: no exuberant ctags found.\n')
-                from moap.util import deps
-                deps.handleMissingDependency(deps.ctags())
-                self.stderr.write('\n')
-            else:
-                self.stdout.write('Extracting affected tags from source.\n')
-                command = "%s -u --fields=+nlS -f - %s" % (
-                    binary, " ".join(ctagsFiles))
-                self.debug('Running command %s' % command)
-                output = commands.getoutput(command)
-                ct.addString(output)
+        if changes:
+            files = changes.keys()
+            files.sort()
+
+            ct = ctags.CTags()
+            if self.options.ctags:
+                # run ctags only on files that aren't deleted
+                ctagsFiles = files[:]
+                for f in files:
+                    if not os.path.exists(f):
+                        ctagsFiles.remove(f)
+
+                # get the tags for all the files we're looking at
+                binary = None
+                for candidate in ["ctags", "exuberant-ctags", "ctags-exuberant"]:
+                    self.debug('Checking for existence of %s' % candidate)
+                    if os.system('which %s > /dev/null 2>&1' % candidate) == 0:
+                        self.debug('Checking for exuberance of %s' % candidate)
+                        output = commands.getoutput("%s --version" % candidate)
+                        if output.startswith("Exuberant"):
+                            binary = candidate
+                            break
+
+                if not binary:
+                    self.stderr.write('Warning: no exuberant ctags found.\n')
+                    from moap.util import deps
+                    deps.handleMissingDependency(deps.ctags())
+                    self.stderr.write('\n')
+                else:
+                    self.stdout.write('Extracting affected tags from source.\n')
+                    command = "%s -u --fields=+nlS -f - %s" % (
+                        binary, " ".join(ctagsFiles))
+                    self.debug('Running command %s' % command)
+                    output = commands.getoutput(command)
+                    ct.addString(output)
 
         # prepare header for entry
@@ -523 +541 @@
         os.write(fd, "\n")
 
-        for filePath in files:
-            lines = changes[filePath]
-            tags = []
-            for oldLine, oldCount, newLine, newCount in lines:
-                self.log("Looking in file %s, newLine %r, newCount %r" % (
-                    filePath, newLine, newCount))
-                try:
-                    for t in ct.getTags(filePath, newLine, newCount):
-                        # we want unique tags, not several hits for one
-                        if not t in tags:
-                            tags.append(t)
-                except KeyError:
-                    pass
-
-            # the paths are absolute because we asked for an absolute path diff
-            # strip them to be relative
-            if filePath.startswith(vcsPath):
-                filePath = filePath[len(vcsPath) + 1:]
-            tagPart = ""
-            if tags:
-                parts = []
-                for tag in tags:
-                    if tag.klazz:
-                        parts.append('%s.%s' % (tag.klazz, tag.name))
-                    else:
-                        parts.append(tag.name)
-                tagPart = " (" + ", ".join(parts) + ")"
-            line =  "\t* %s%s:\n" % (filePath, tagPart)
-            # wrap to maximum 72 characters, and keep tabs
-            lines = textwrap.wrap(line, 72, expand_tabs=False,
-                replace_whitespace=False,
-                subsequent_indent="\t  ")
-            os.write(fd, "\n".join(lines) + '\n')
+        if changes:
+            for filePath in files:
+                lines = changes[filePath]
+                tags = []
+                for oldLine, oldCount, newLine, newCount in lines:
+                    self.log("Looking in file %s, newLine %r, newCount %r" % (
+                        filePath, newLine, newCount))
+                    try:
+                        for t in ct.getTags(filePath, newLine, newCount):
+                            # we want unique tags, not several hits for one
+                            if not t in tags:
+                                tags.append(t)
+                    except KeyError:
+                        pass
+
+                filePath = filePathRelative(vcsPath, filePath)
+                tagPart = ""
+                if tags:
+                    parts = []
+                    for tag in tags:
+                        if tag.klazz:
+                            parts.append('%s.%s' % (tag.klazz, tag.name))
+                        else:
+                            parts.append(tag.name)
+                    tagPart = " (" + ", ".join(parts) + ")"
+                writeLine(filePath + tagPart)
+
+        if propertyChanges:
+            for filePath in propertyChanges:
+                filePath = filePathRelative(vcsPath, filePath)
+                writeLine("%s (property)" % filePath)
 
         os.write(fd, "\n")

trunk/moap/test/test_vcs_svn.py

@@ -179 +179 @@
             (1, 1, 1, 1),
         ])
+
+class TestChangeProperties(SVNTestCase):
+
+    def testGetPropertyChanges(self):
+        v = svn.VCSClass(self.livedir) 
+        self.failUnless(v)
+
+        # create a file
+        path = self.liveWriteFile('test', "test\n")
+        path2 = self.liveWriteFile('test2', "test\n")
+
+        # add it
+        os.system('svn add %s' % path)
+        os.system('svn add %s' % path2)
+        os.system('svn commit -m "test" %s' % self.livedir)
+        
+        # change property on it
+        os.system('svn ps property value %s' % path)
+        os.system('svn ps property value %s' % path2)
+
+        # now get changes
+        c = v.getPropertyChanges(self.livedir)
+        self.assertEquals(c, [path, path2])

trunk/moap/vcs/svn.py

@@ -125 +125 @@
         return reo.sub('', output)
 
+    def getPropertyChanges(self, path):
+        ret = []
+
+        cmd = "LANG=C svn diff %s" % path
+        output = commands.getoutput(cmd)
+        reo = re.compile('^Property changes on: (.*)$')
+        for line in output.split('\n'):
+            matcher = reo.match(line)
+            if matcher:
+                ret.append(matcher.expand('\\1'))
+
+        return ret
+
     def update(self, path):
         cmd = "svn update %s" % path

trunk/moap/vcs/vcs.py

@@ -242 +242 @@
         return changes
 
+    def getPropertyChanges(self, path):
+        """
+        Get a list of property changes for the given path and subpaths.
+        These are metadata changes to files, not content changes.
+
+        @returns: list of path
+        """
+        log.info('vcs', 
+            "subclass %r should implement getPropertyChanges" % self.__class__)
+ 
     def update(self, path):
         """