Changeset 460

Timestamp:

08-01-10 18:02:07 (3 years ago)

Author:

thomas

Message:

patch by: Jan Urbanski

• moap/command/cl.py: Add options to moap changelog prepare for --no-date, --no-reviewer, --no-update. Revised patch for spelling and removing double negative logic. Fixes #414.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/command/cl.py (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2010-01-08  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        patch by: Jan Urbanski
+
+        * moap/command/cl.py:
+          Add options to moap changelog prepare for
+          --no-date, --no-reviewer, --no-update.
+          Revised patch for spelling and removing double negative logic.
+          Fixes #414.
+
 2010-01-08  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/command/cl.py

@@ -513 +513 @@
             action="store_true", dest="ctags", default=False,
             help="Use ctags to extract and add changed tags to ChangeLog entry")
+        self.parser.add_option('-d', '--no-date',
+            action="store_false", dest="date", default=True,
+            help="Don't prefix the ChangeLog entry with a date")
+        self.parser.add_option('-r', '--no-reviewer',
+            action="store_false", dest="reviewer", default=True,
+            help="Don't prefix the ChangeLog entry with patch-by "
+                 "and reviewed-by fields")
+        self.parser.add_option('-u', '--no-update',
+            action="store_false", dest="update", default=True,
+            help="Don't update the ChangeLog from VCS")
 
     def do(self, args):
@@ -540 +550 @@
             return 3
 
-        self.stdout.write('Updating %s from %s repository.\n' % (clPath,
-            v.name))
-        try:
-            v.update(clPath)
-        except vcs.VCSException, e:
-            self.stderr.write('Could not update %s:\n%s\n' % (
-                clPath, e.args[0]))
-            return 3
+        if self.options.update:
+            self.stdout.write('Updating %s from %s repository.\n' % (clPath,
+                v.name))
+            try:
+                v.update(clPath)
+            except vcs.VCSException, e:
+                self.stderr.write('Could not update %s:\n%s\n' % (
+                    clPath, e.args[0]))
+                return 3
 
         self.stdout.write('Finding changes.\n')
@@ -608 +619 @@
         self.stdout.write('Editing %s.\n' % clPath)
         (fd, tmpPath) = tempfile.mkstemp(suffix='.moap')
-        os.write(fd, "%s  %s  <%s>\n\n" % (date, name, mail))
-        os.write(fd, "\treviewed by: %s\n" % _defaultReviewer);
-        os.write(fd, "\tpatch by: %s\n" % _defaultPatcher);
-        os.write(fd, "\n")
+        if self.options.date:
+            os.write(fd, "%s  %s  <%s>\n\n" % (date, name, mail))
+        if self.options.reviewer:
+            os.write(fd, "\treviewed by: %s\n" % _defaultReviewer);
+            os.write(fd, "\tpatch by: %s\n" % _defaultPatcher);
+            os.write(fd, "\n")
 
         if changes: