rpms/trac-bazaar-plugin/FC-6 trac-bazaar-escape.patch, NONE, 1.1 trac-bazaar-extra-return.patch, NONE, 1.1 trac-bazaar-timestamp.patch, NONE, 1.1 trac-bazaar-plugin.spec, 1.2, 1.3

Toshio Ernie Kuratomi (toshio) fedora-extras-commits at redhat.com
Sat Sep 22 19:51:51 UTC 2007 

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/FC-6

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bazaar-escape.patch trac-bazaar-extra-return.patch 
	trac-bazaar-timestamp.patch 
Log Message:
* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
- Patches to fix RSS feed in timeline view.


trac-bazaar-escape.patch:

--- NEW FILE trac-bazaar-escape.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:48:32 +0000
+++ tracbzr/backend.py	2007-09-22 18:42:58 +0000
@@ -154,7 +154,7 @@
         """
         if branch is None:
             # No "safe" chars (make sure "/" is escaped)
-            return self._escape(revid)
+            return self._escape(revid, ':')
         relpath = self.branch_path(branch)
         try:
             return '%s,%s' % (urllib.quote(relpath, ':'),
@@ -170,8 +170,8 @@
                 return self._escape(revid, ':')
 
     @staticmethod
-    def _escape(string):
-        return urllib.quote(string, '')
+    def _escape(string, safe=''):
+        return urllib.quote(string, safe)
 
     @staticmethod
     def _string_rev_revid(relpath, revid):
@@ -1080,7 +1080,8 @@
                 neighbor_revid = bzr_repo.next_rev(revid)
             neighbor = bzr_repo.get_changeset(neighbor_revid).revision
             self.revision.timestamp = neighbor.timestamp
-            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+            versioncontrol.Changeset.__init__(self, bzr_repo.string_rev(
+                                              branch, revid),
                                               '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)


trac-bazaar-extra-return.patch:

--- NEW FILE trac-bazaar-extra-return.patch ---
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2007-09-22 17:26:55 +0000
+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
@@ -231,7 +231,6 @@
         revid = urllib.unquote(rev)
         if revid in ('current:', 'null:'):
             return None, revid
-        return None, revid
         if self.repo.has_revision(revid):
             return None, revid
 


trac-bazaar-timestamp.patch:

--- NEW FILE trac-bazaar-timestamp.patch ---
# Bazaar revision bundle v0.9
#
# message:
#   * Set timestamp on 'current:' and 'null:' changesets to their nearest
#     neighbors.  This keeps RSS feeds of timeline from having a new entry every
#     time it's loaded.  Partial fix of launchpad bug #116659.
#   
# committer: Toshio Kuratomi <badger at Clingman>
# date: Sat 2007-09-22 10:26:55.203999996 -0700

=== modified file tracbzr/backend.py
--- tracbzr/backend.py
+++ tracbzr/backend.py
@@ -1069,13 +1069,20 @@
         self.log = log
         self.bzr_repo = bzr_repo
         if branch is None:
-            if revid in ('current:', 'null:'):
-                self.revision = revision.Revision(revid, committer='', 
-                                                  message='', timezone='')
-                versioncontrol.Changeset.__init__(self, urllib.quote(revid),
-                                                  '', '', time.time())
-            else:
+            if revid not in ('current:', 'null:'):
                 raise errors.NoSuchRevision(None, revid)
+
+            self.revision = revision.Revision(revid, committer='', 
+                                              message='', timezone='')
+            # Get a neighboring revision so we can submit a real timestamp
+            if revid == 'current:':
+                neighbor_revid = bzr_repo.previous_rev(revid)
+            else:
+                neighbor_revid = bzr_repo.next_rev(revid)
+            neighbor = bzr_repo.get_changeset(neighbor_revid).revision
+            self.revision.timestamp = neighbor.timestamp
+            versioncontrol.Changeset.__init__(self, urllib.quote(revid),
+                                              '', '', self.revision.timestamp)
         else:
             self.revision = bzr_repo.get_branch_cache(branch).get_revision(revid)
             versioncontrol.Changeset.__init__(self,

=== modified directory  // last-changed:badger at clingman-20070922172655-wewiwy4h
... 6lf191wk
# revision id: badger at clingman-20070922172655-wewiwy4h6lf191wk
# sha1: 496f1f81dab7c8dd8ddfaeb044177ae01be7b398
# inventory sha1: 7074183389cb4e01d0729a322f8937d6f54a4e95
# parent ids:
#   aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# base id: aaron.bentley at utoronto.ca-20070829221812-uwanjrj5pe5he33j
# properties:
#   branch-nick: trac+bzr



Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/FC-6/trac-bazaar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac-bazaar-plugin.spec	29 Aug 2007 23:15:03 -0000	1.2
+++ trac-bazaar-plugin.spec	22 Sep 2007 19:51:19 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        4.20070829bzr%{bzrrev}%{?dist}
+Release:        5.20070829bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -16,6 +16,11 @@
 #   python setup.py sdist --formats gztar
 # tarball lands in trac+bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
+# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
+Patch0: trac-bazaar-timestamp.patch
+Patch1: trac-bazaar-escape.patch
+# Communicated this directly with author
+Patch2: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +39,9 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -55,6 +62,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
+- Patches to fix RSS feed in timeline view.
+
 * Wed Aug 29 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-4.20070829bzr182
 - Update license tag to reflect GPLv2+.
 - New update from upstream that clarifies license and makes setuptools build

More information about the fedora-extras-commits mailing list