[Pkg-bazaar-commits] ./bzr-svn/unstable r304: Import final 0.4.10.
Jelmer Vernooij
jelmer at samba.org
Sun May 11 23:49:46 UTC 2008
------------------------------------------------------------
revno: 304
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-05-12 01:49:46 +0200
message:
Import final 0.4.10.
modified:
NEWS
__init__.py
config.py
debian/changelog
fileids.py
logwalker.py
remote.py
tests/test_commit.py
tests/test_config.py
transport.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.145
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 22:03:21 +0200
message:
Fix parsing of override-svn-revprops configuration option.
modified:
config.py
tests/test_config.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.146
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 23:53:46 +0200
message:
Remove unused import.
modified:
remote.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.147
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 23:54:28 +0200
message:
Simplify handling of ascending iter_changes.
modified:
logwalker.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.148
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 23:55:31 +0200
message:
Add extra progress bar when finding changes required for file ids.
modified:
fileids.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.149
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 23:56:46 +0200
message:
Fix workaround for bug in http ra backend.
modified:
NEWS
transport.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.150
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-11 23:58:17 +0200
message:
Avoid unused second connection to svn repository.
modified:
transport.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.151
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-05-12 00:38:36 +0200
message:
Fix import.
modified:
tests/test_commit.py
------------------------------------------------------------
revno: 220.1.182.1.258.1.346.1.152
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-05-12 01:32:19 +0200
message:
Release 0.4.10.
modified:
NEWS
__init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-05-11 19:29:26 +0000
+++ b/NEWS 2008-05-11 23:49:46 +0000
@@ -1,4 +1,4 @@
-bzr-svn 0.4.10 UNRELEASED
+bzr-svn 0.4.10 2008-05-12
CHANGES
@@ -28,7 +28,8 @@
* Support credentials in URLs. (#181534)
- * Allow usage without on-disk cache. (#131008)
+ * Allow usage without on-disk cache. This option is still
+ experimental. (#131008)
PERFORMANCE
=== modified file '__init__.py'
--- a/__init__.py 2008-05-11 19:29:26 +0000
+++ b/__init__.py 2008-05-11 23:49:46 +0000
@@ -31,7 +31,7 @@
# versions ending in 'exp' mean experimental mappings
# versions ending in 'dev' mean development version
# versions ending in 'final' mean release (well tested, etc)
-version_info = (0, 4, 10, 'exp', 0)
+version_info = (0, 4, 10, 'final', 0)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
=== modified file 'config.py'
--- a/config.py 2008-05-06 02:45:49 +0000
+++ b/config.py 2008-05-11 20:03:21 +0000
@@ -123,7 +123,10 @@
return [svn.core.SVN_PROP_REVISION_DATE, svn.core.SVN_PROP_REVISION_AUTHOR]
return []
except ValueError:
- return parser.get_value(section, "override-svn-revprops")
+ val = parser.get_value(section, "override-svn-revprops")
+ if not isinstance(val, list):
+ return [val]
+ return val
except KeyError:
return None
ret = get_list(self._get_parser(), self.uuid)
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-03-24 04:18:48 +0000
+++ b/debian/changelog 2008-05-11 23:49:46 +0000
@@ -1,3 +1,9 @@
+bzr-svn (0.4.10-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org> Mon, 12 May 2008 01:49:35 +0200
+
bzr-svn (0.4.9-1) unstable; urgency=low
* New upstream release. (Closes: #472133)
=== modified file 'fileids.py'
--- a/fileids.py 2008-05-11 19:29:26 +0000
+++ b/fileids.py 2008-05-11 23:49:46 +0000
@@ -222,16 +222,21 @@
next_parent_revs = []
# No history -> empty map
- for revmeta in self.repos.iter_reverse_branch_changes(branch, revnum, mapping):
- revid = revmeta.get_revision_id(mapping)
- try:
- map = self.load(revid)
- # found the nearest cached map
- next_parent_revs = [revid]
- break
- except RevisionNotPresent:
- todo.append(revmeta)
-
+ try:
+ pb = ui.ui_factory.nested_progress_bar()
+ for revmeta in self.repos.iter_reverse_branch_changes(branch, revnum, mapping):
+ pb.update("fetching changes for file ids", revnum-revmeta.revnum, revnum)
+ revid = revmeta.get_revision_id(mapping)
+ try:
+ map = self.load(revid)
+ # found the nearest cached map
+ next_parent_revs = [revid]
+ break
+ except RevisionNotPresent:
+ todo.append(revmeta)
+ finally:
+ pb.finished()
+
# target revision was present
if len(todo) == 0:
return map
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-05-11 19:29:26 +0000
+++ b/logwalker.py 2008-05-11 23:49:46 +0000
@@ -146,7 +146,7 @@
return row[0]
def iter_changes(self, paths, from_revnum, to_revnum=0, limit=0, pb=None):
- """Return iterator over all the revisions between revnum and 0 named path or inside path.
+ """Return iterator over all the revisions between from_revnum and to_revnum named path or inside path.
:param paths: Paths to report about.
:param from_revnum: Start revision.
@@ -157,9 +157,11 @@
"""
assert from_revnum >= 0 and to_revnum >= 0
+ ascending = (to_revnum > from_revnum)
+
revnum = from_revnum
- self.mutter("iter changes %r:%r" % (paths, revnum))
+ self.mutter("iter changes %r->%r (%r)" % (from_revnum, to_revnum, paths))
if paths is None:
path = ""
@@ -171,14 +173,14 @@
i = 0
- while ((from_revnum >= to_revnum and revnum >= to_revnum) or
- (to_revnum > from_revnum and revnum <= to_revnum)):
+ while ((not ascending and revnum >= to_revnum) or
+ (ascending and revnum <= to_revnum)):
if pb is not None:
pb.update("determining changes", from_revnum-revnum, from_revnum)
assert revnum > 0 or path == "", "Inconsistent path,revnum: %r,%r" % (revnum, path)
revpaths = self._get_revision_paths(revnum)
- if from_revnum < to_revnum:
+ if ascending:
next = (path, revnum+1)
else:
next = changes.find_prev_location(revpaths, path, revnum)
=== modified file 'remote.py'
--- a/remote.py 2008-05-11 19:29:26 +0000
+++ b/remote.py 2008-05-11 23:49:46 +0000
@@ -27,7 +27,7 @@
from errors import NoSvnRepositoryPresent
from format import get_rich_root_format, SvnRemoteFormat
from repository import SvnRepository
-from transport import SvnRaTransport, bzr_to_svn_url, get_svn_ra_transport
+from transport import bzr_to_svn_url, get_svn_ra_transport
class SvnRemoteAccess(BzrDir):
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-05-11 19:29:26 +0000
+++ b/tests/test_commit.py 2008-05-11 23:49:46 +0000
@@ -29,7 +29,7 @@
from copy import copy
from errors import RevpropChangeFailed
import os
-from remote import SvnRaTransport
+from transport import SvnRaTransport
from tests import TestCaseWithSubversionRepository
from svn.core import svn_time_to_cstring
=== modified file 'tests/test_config.py'
--- a/tests/test_config.py 2008-05-02 18:37:05 +0000
+++ b/tests/test_config.py 2008-05-11 20:03:21 +0000
@@ -69,8 +69,10 @@
self.assertEquals(["svn:date", "svn:author"], c.get_override_svn_revprops())
c.set_user_option("override-svn-revprops", "False")
self.assertEquals([], c.get_override_svn_revprops())
- c.set_user_option("override-svn-revprops", "svn:author,svn:date")
+ c.set_user_option("override-svn-revprops", ["svn:author", "svn:date"])
self.assertEquals(["svn:author","svn:date"], c.get_override_svn_revprops())
+ c.set_user_option("override-svn-revprops", ["svn:author"])
+ self.assertEquals(["svn:author"], c.get_override_svn_revprops())
def test_get_append_revisions_only(self):
c = SvnRepositoryConfig("blabla2")
=== modified file 'transport.py'
--- a/transport.py 2008-05-11 19:29:26 +0000
+++ b/transport.py 2008-05-11 23:49:46 +0000
@@ -411,8 +411,8 @@
discover_changed_paths, strict_node_history, revprops, rcvr,
pool=None):
if paths is None:
- paths = [""]
- self.mutter('svn log %r:%r %r' % (from_revnum, to_revnum, paths))
+ paths = ["/"]
+ self.mutter('svn log %r:%r %r (limit: %r)' % (from_revnum, to_revnum, paths, limit))
if hasattr(svn.ra, 'get_log2'):
return svn.ra.get_log2(self._ra, paths,
from_revnum, to_revnum, limit,
@@ -502,12 +502,12 @@
if pool is None:
self.connections = ConnectionPool()
+
+ # Make sure that the URL is valid by connecting to it.
+ self.connections.add(self.connections.get(self._backing_url))
else:
self.connections = pool
- # Make sure that the URL is valid by connecting to it.
- self.connections.add(self.connections.get(self._backing_url))
-
from bzrlib.plugins.svn import lazy_check_versions
lazy_check_versions()
@@ -578,11 +578,10 @@
from threading import Thread, Semaphore
class logfetcher(Thread):
- def __init__(self, transport, *args, **kwargs):
+ def __init__(self, transport, **kwargs):
Thread.__init__(self)
self.setDaemon(True)
self.transport = transport
- self.args = args
self.kwargs = kwargs
self.pending = []
self.conn = None
@@ -593,7 +592,7 @@
ret = self.pending.pop(0)
if ret is None:
self.transport.add_connection(self.conn)
- if isinstance(ret, Exception):
+ elif isinstance(ret, Exception):
self.transport.add_connection(self.conn)
raise ret
return ret
@@ -604,7 +603,7 @@
self.semaphore.release()
self.conn = self.transport.get_connection()
try:
- self.conn.get_log(rcvr=rcvr, *self.args, **self.kwargs)
+ self.conn.get_log(rcvr=rcvr, **self.kwargs)
self.pending.append(None)
except Exception, e:
self.pending.append(e)
@@ -615,7 +614,7 @@
else:
newpaths = [self._request_path(path) for path in paths]
- fetcher = logfetcher(self, paths, from_revnum, to_revnum, limit, discover_changed_paths, strict_node_history, revprops)
+ fetcher = logfetcher(self, paths=newpaths, from_revnum=from_revnum, to_revnum=to_revnum, limit=limit, discover_changed_paths=discover_changed_paths, strict_node_history=strict_node_history, revprops=revprops)
fetcher.start()
return iter(fetcher.next, None)
@@ -665,9 +664,10 @@
def _request_path(self, relpath):
if self._backing_url == self.svn_url:
return relpath.strip("/")
- newrelpath = urlutils.join(
- urlutils.relative_url(self._backing_url+"/", self.svn_url+"/"),
- relpath).strip("/")
+ newsvnurl = urlutils.join(self.svn_url, relpath)
+ if newsvnurl == self._backing_url:
+ return ""
+ newrelpath = urlutils.relative_url(self._backing_url+"/", newsvnurl+"/").strip("/")
self.mutter('request path %r -> %r' % (relpath, newrelpath))
return newrelpath
More information about the Pkg-bazaar-commits
mailing list