rpms/trac-bazaar-plugin/devel trac-bzr-get-ancestry.patch, NONE, 1.1 trac-bzr-no-repo.patch, NONE, 1.1 trac-bazaar-plugin.spec, 1.5, 1.6 trac-bazaar-extra-return.patch, 1.2, NONE

Toshio くらとみ toshio at fedoraproject.org
Fri Sep 26 21:08:53 UTC 2008 

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv928

Modified Files:
	trac-bazaar-plugin.spec 
Added Files:
	trac-bzr-get-ancestry.patch trac-bzr-no-repo.patch 
Removed Files:
	trac-bazaar-extra-return.patch 
Log Message:

* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
- Patches to fix: lp:274609, lp:263300, lp:267700


trac-bzr-get-ancestry.patch:

--- NEW FILE trac-bzr-get-ancestry.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926194447-\
#   p1clsut84zvu2kfo
# target_branch: bzr+ssh://toshio@bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 53b461068e37868f49da2b65cedc34da8e8d5208
# timestamp: 2008-09-26 13:56:31 -0700
# base_revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-09-26 17:34:32 +0000
+++ tracbzr/backend.py	2008-09-26 19:44:47 +0000
@@ -693,13 +693,12 @@
 
     def _merging_history(self):
         """Iterate through history revisions that merged changes to this node
-        
+
         This includes all revisions in which the revision_id changed.
         It may also include a few revisions in which the revision_id did not
         change, if the modification was subsequently undone.
         """
-        weave = self.tree._get_weave(self.entry.file_id)
-        file_ancestry = weave.get_ancestry(self.entry.revision)
+        file_ancestry = self.repo.get_ancestry(self.entry.revision)
         # Can't use None here, because it's a legitimate revision id.
         last_yielded = 'bogus:'
         for num, revision_id, depth, revno, eom in \

# Begin bundle
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

trac-bzr-no-repo.patch:

--- NEW FILE trac-bzr-no-repo.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: toshio at fedoraproject.org-20080926193207-\
#   a1bosfhjpm7hgpgw
# target_branch: bzr+ssh://toshio@bazaar.launchpad.net/%7Etrac-bzr-\
#   team/trac-bzr/trunk/
# testament_sha1: 0fc78cc950867e4ff69212179ba985319da19ccc
# timestamp: 2008-09-26 13:55:31 -0700
# base_revision_id: jelmer at samba.org-20080831143707-uh5nrs0ld4eg235t
# 
# Begin patch
=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2008-08-21 10:24:43 +0000
+++ tracbzr/backend.py	2008-09-26 17:34:32 +0000
@@ -133,6 +133,7 @@
     def __init__(self, location, log):
         versioncontrol.Repository.__init__(self, location, None, log)
         self.root_transport = transport.get_transport(location)
+        self.repo = bzrdir.BzrDir.open_from_transport(self.root_transport).open_repository()
         self._tree_cache = {}
         self._locked_branches = []
         self._branch_cache = {}
@@ -237,7 +238,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
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUYC7ksAAoFfgAQQUWP//14I
FAC//9/wUAV4vWwCpaIhoKpCSSnqeqemRHqbBoptCehNNGgDQYYaGgAAA0AAAAAJEhDSYkxT2qY1
A9QeoPU0NPUb1T0hhoaAAADQAAAAAkoCNNNBMgamTJlPEk2JAHqekbMcu29n60NDbv3RtLRQmlkN
b3jqcTW9gZ/S3tmRg5U67lZ+DHMPtsba6UDSU7FjCxZJtZhrPDIr75UeA5u7Z+9ZUvtkpLTSVdVn
5n4phpZA8oCKy/nl3+2Y4FZX2w0PraT7bDHsuEPf1E9pjEHI1mZp/HK7Kd0CoEbTV1CPPaazjAXd
BjDJz6chnbBcxMQnrmfgiWBdA8zikd9uDnRkVbDMUa2HUUoE9xDdcOxXlhZBcpBMVZAiaVyaFbNW
xBy2i++CCbcYWDzZ8XQFbiUORcX/Z8CZYxkTRNoJl42Iwmgt/H3PORAJXEyEEplhicrRGyszSQ0c
GNRmM6i4mZfA+UFdhkhcaObMXMxj5Daiu8W3GCCoLo3ZkUFo4TC0nIWY9pjskbSq0sGG6Q4taoki
JQfNqBoqFarIlTISPuHYGrUsBSQY23NbwChfOrpQxHEdRW9xDoSyM9cSJqMxhkcBYi1MITYMwQmD
ybpFpmF5Iw1U2W0ETwmSSgwpRBEjsKTLzZbghprPkKXX3A4rBEx7UquRUQkYTJherTAkTDDkY5Yg
GF4Q5sLiDMyGcSliuL2AxakOJLIUIG8PYWF/RyR7jBbrz3KwbfUOKxCgOTD1cWzkegkWEEmTsIJl
Fkkr7xTxYxjb6cdfYWUkRU1XVhKBMNXHKjfB17hUTGvsHEsJ9PBDefWG+aYW2czEIi9UD/HKAtYZ
EKlkYQbJhFVTA55jN5u1FBtJBYiOti2BUVngYBSpVm0bo/zFnWdTub/Vi0m00rcMViPJ4A1mcWwG
q3AgbhPB6GGoyK5oHGZZ4O5B3BcK0lCnp68sM+MWuwPR3oTePvh1OAwzNZ1oGARmwrKPFuMMH5v9
JVc6WmSWm2KuGiK8lFKP9ExaJkj+ZT2VFguyaURnB4omRAapAeWqs0l5cXkSBYcTSYFC5JKGdUh6
7KFUyOfAsEjIKchSI8jaG9fhoDuG14m4i4l0gcgNYQPjLsg5DQlkLEzQbu3aIdVRf24NCAp/1wGj
zegMkBZ8+qA75QBgK4a72SXwaBvmHjmgct7FbuFZNH5PYXZfPcmO6DhdiR2COV6GiawHimaFgQNg
eaBoehWZrcgtoOcIyYh8Acl2DhUFQ6ET8Q+V2J4CgSAqYgYLjn1cb24/wQgkuBuQFVRo9QQH5Imo
YIiLoknCRuoiagI9w+hqScF+0pu1mzoM4nE4odBfzIFuD7hoaF7Qp5JKhRDFib0Go2qLtCQ1gDCN
wtiampKY/qsqvKwRPlAjeeB2AxJytEj3J3FbxN1JLhbBwjDIVRWDGCYIuM1sFaUJgx7w5i7+vOLw
axUIDuQDCLka87y0KmFYns2wZKPUwORgxCsHmo7kgun5lthTeVKFprKjLsQgVxUWS1DYdTgcwe0Z
BaeK9Y4rlm0KMRc86lxAWiDv0XoLkRM7/ouqOyVhJA0vFwQHbBBxC3FAx6B5BGKMlNrBkJnZQofN
BkeQ/+LuSKcKEgjAXclg


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac-bazaar-plugin.spec	26 Sep 2008 00:42:59 -0000	1.5
+++ trac-bazaar-plugin.spec	26 Sep 2008 21:08:23 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        6.20080925bzr%{bzrrev}%{?dist}
+Release:        7.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
@@ -17,7 +17,11 @@
 # tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
 # https://bugs.launchpad.net/trac-bzr/+bug/274609
-Patch0: trac-bazaar-extra-return.patch
+# and
+# https://bugs.launchpad.net/trac-bzr/+bug/267700
+Patch0: trac-bzr-no-repo.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/263300
+Patch1: trac-bzr-get-ancestry.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,7 +40,8 @@
 
 %prep
 %setup -n TracBzr-%{version} -q
-%patch0 -p0
+%patch0 -p0 -b .norepo
+%patch1 -p0 -b .ancestor
 
 %build
 %{__python} setup.py build
@@ -56,6 +61,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Fri Sep 26 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-7.20080925bzr49
+- Patches to fix: lp:274609, lp:263300, lp:267700
+
 * Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
 - New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
   trac-0.11.


--- trac-bazaar-extra-return.patch DELETED ---

More information about the fedora-extras-commits mailing list