make the V1_6_X branch the trunk

1 files changed, 30 insertions, 6 deletions

diff --git a/RepSys/commands/rpmlog.py b/RepSys/commands/rpmlog.py
index 7ea1ac0..11fe36d 100644
--- a/RepSys/commands/rpmlog.py
+++ b/RepSys/commands/rpmlog.py
@@ -3,23 +3,33 @@
 # This program will convert the output of "svn log" to be suitable
 # for usage in an rpm %changelog session.
 #
-from RepSys import Error
+from RepSys import Error, layout
 from RepSys.command import *
-from RepSys.log import svn2rpm
+from RepSys.svn import SVN
+from RepSys.log import get_changelog, split_spec_changelog
+from cStringIO import StringIO
 import getopt
+import os
 import sys
 
 HELP = """\
 Usage: repsys rpmlog [OPTIONS] REPPKGDIRURL
 
+Prints the RPM changelog of a given package.
+
 Options:
     -r REV   Collect logs from given revision to revision 0
     -n NUM   Output only last NUM entries
     -T FILE  %changelog template file to be used
+    -o       Append old package changelog
+    -p       Append changelog found in .spec file
+    -s       Sort changelog entries, even from the old log
+    -M       Do not use the mirror (use the main repository)
     -h       Show this message
 
 Examples:
-    repsys rpmlog https://repos/snapshot/python
+    repsys rpmlog python
+    repsys rpmlog http://svn.mandriva.com/svn/packages/cooker/python
 """
 
 def parse_options():
@@ -27,14 +37,28 @@ def parse_options():
     parser.add_option("-r", dest="revision")
     parser.add_option("-n", dest="size", type="int")
     parser.add_option("-T", "--template", dest="template", type="string")
+    parser.add_option("-o", dest="oldlog", default=False,
+            action="store_true")
+    parser.add_option("-p", dest="usespec", default=False,
+            action="store_true")
+    parser.add_option("-s", dest="sort", default=False,
+            action="store_true")
     opts, args = parser.parse_args()
     if len(args) != 1:
         raise Error, "invalid arguments"
-    opts.pkgdirurl = default_parent(args[0])
+    opts.pkgdirurl = layout.package_url(args[0])
     return opts
 
-def rpmlog(pkgdirurl, revision, size, template):
-    sys.stdout.write(svn2rpm(pkgdirurl, revision, size, template=template))
+def rpmlog(pkgdirurl, revision, size, template, oldlog, usespec, sort):
+    another = None
+    if usespec:
+        svn = SVN()
+        specurl = layout.package_spec_url(pkgdirurl)
+        rawspec = svn.cat(specurl, rev=revision)
+        spec, another = split_spec_changelog(StringIO(rawspec))
+    newlog = get_changelog(pkgdirurl, another=another, rev=revision,
+            size=size, sort=sort, template=template, oldlog=oldlog)
+    sys.stdout.writelines(newlog)
 
 def main():
     do_command(parse_options, rpmlog)