Rev 2305: Remove another 2.5-ism. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5
Jelmer Vernooij
jelmer at samba.org
Wed Jan 14 19:07:23 GMT 2009
At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------
revno: 2305
revision-id: jelmer at samba.org-20090114190721-xlqju568hnxeqhfk
parent: jelmer at samba.org-20090114185515-tk0yliyszgie9c2j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Wed 2009-01-14 20:07:21 +0100
message:
Remove another 2.5-ism.
modified:
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py 2009-01-14 16:30:15 +0000
+++ b/workingtree.py 2009-01-14 19:07:21 +0000
@@ -328,6 +328,7 @@
:param relpath: Optional subpath to search in
:return: Yields all copies
"""
+ ret = []
wc = self._get_wc(relpath)
try:
entries = wc.entries_read(False)
@@ -337,13 +338,14 @@
if ((entry.copyfrom_url == url or entry.url == url) and
not (entry.schedule in (SCHEDULE_DELETE,
SCHEDULE_REPLACE))):
- yield os.path.join(
+ ret.append(os.path.join(
self.branch.get_branch_path().strip("/"),
- subrelpath)
+ subrelpath))
else:
find_copies(subrelpath)
finally:
wc.close()
+ return ret
def find_ids(entry, rootwc):
relpath = urllib.unquote(entry.url[len(entry.repos):].strip("/"))
More information about the bazaar-commits
mailing list