Changeset 1240 in tailor for vcpx/changes.py

Timestamp:

08/15/06 00:06:40 (7 years ago)

Author:

lele@…

Hash name:

20060814220640-97f81-474004f226c2aac669620f030133a03ce0ad6cd3

Message:

Respect the order of entries in the textual representation of Changeset

File:

• vcpx/changes.py (modified) (2 diffs)

vcpx/changes.py

@@ -42 +42 @@
 
     def __str__(self):
+        s = self.name + '(' + self.action_kind
         if self.action_kind == self.ADDED:
-            return '%s (new at %s)' % (self.name, self.new_revision)
-        elif self.action_kind == self.DELETED:
-            return '%s (deleted)' % self.name
+            if self.new_revision:
+                s += ' at ' + self.new_revision
         elif self.action_kind == self.UPDATED:
-            return "%s (update to %s)" % (self.name,
-                                          self.new_revision)
+            if self.new_revision:
+                s += ' to ' + self.new_revision
         else:
-            return '%s (rename from %s)' % (self.name, self.old_name)
+            s += ' from ' + self.old_name
+        s += ')'
+        return s
 
 
@@ -167 +169 @@
         s.append('Date: %s' % str(self.date))
         s.append('Author: %s' % self.author)
-        for ak in ['Modified', 'Removed', 'Renamed', 'Added']:
-            entries = getattr(self, ak.lower()+'Entries')()
-            if entries:
-                if ak == 'Renamed':
-                    entries = ['%s (from %s)' % (e.name, e.old_name)
-                               for e in entries]
-                else:
-                    entries = [e.name for e in entries]
-                s.append('%s: %s' % (ak, ','.join(entries)))
+        s.append('Entries: %s' % ', '.join([str(x) for x in self.entries]))
         s.append('Log: %s' % self.log)
         s = '\n'.join(s)