At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------ revno: 2259 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: 0.5 timestamp: Sat 2008-12-13 04:21:53 +0100 message: merge upstream. modified: NEWS news-20061231030336-h9fhq245ie0de8bs-1 config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1 layout/__init__.py layout.py-20080323165407-y9qw8nx4oykvoe1k-1 layout/standard.py standard.py-20080909185308-vfoi9po1pzy6u4le-2 revids.py revids.py-20070416220458-36vfa0730cchevp1-1 ------------------------------------------------------------ revno: 2257.1.2 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: 0.5 timestamp: Wed 2008-12-10 03:57:38 +0100 message: Fix return value for in-memory revid cache. modified: revids.py revids.py-20070416220458-36vfa0730cchevp1-1 ------------------------------------------------------------ revno: 2257.1.1 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: 0.5 timestamp: Wed 2008-12-10 03:47:56 +0100 message: Fix handling of custom layouts, which used unicode internally. modified: NEWS news-20061231030336-h9fhq245ie0de8bs-1 config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1 layout/__init__.py layout.py-20080323165407-y9qw8nx4oykvoe1k-1 layout/standard.py standard.py-20080909185308-vfoi9po1pzy6u4le-2 === modified file 'NEWS' --- a/NEWS 2008-12-08 20:48:20 +0000 +++ b/NEWS 2008-12-10 02:47:56 +0000 @@ -16,6 +16,8 @@ * Deal with newly appearing file ids correctly in dpush(). (#300979) + * Fix handling of custom layouts, which used unicode internally. (#306629) + bzr-svn 0.5.0~rc1 2008-12-08 CHANGES === modified file 'config.py' --- a/config.py 2008-12-07 21:50:49 +0000 +++ b/config.py 2008-12-10 02:47:56 +0000 @@ -83,13 +83,13 @@ branches_str = self._get_user_option("branches", use_global=False) if branches_str is None: return None - return filter(lambda b: b != "", branches_str.split(";")) + return [b.encode("utf-8") for b in branches_str.split(";") if b != ""] def get_tags(self): tags_str = self._get_user_option("tags", use_global=False) if tags_str is None: return None - return filter(lambda b: b != "", tags_str.split(";")) + return [t.encode("utf-8") for t in tags_str.split(";") if t != ""] def _get_user_option(self, name, use_global=True): try: === modified file 'layout/__init__.py' --- a/layout/__init__.py 2008-12-05 15:14:10 +0000 +++ b/layout/__init__.py 2008-12-10 02:47:56 +0000 @@ -213,6 +213,7 @@ return [d for d in dirents if dirents[d]['kind'] == subvertpy.NODE_DIR] for idx, pattern in enumerate(itemlist): + assert isinstance(pattern, str) if pb is not None: pb.update("finding branches", idx, len(itemlist)) for bp in expand_branch_pattern([], pattern.strip("/").split("/"), check_path, === modified file 'layout/standard.py' --- a/layout/standard.py 2008-12-07 20:36:39 +0000 +++ b/layout/standard.py 2008-12-10 02:47:56 +0000 @@ -294,6 +294,7 @@ def __init__(self, branches=[], tags=[]): self.branches = [b.strip("/") for b in branches] self.tags = [t.strip("/") for t in tags] + assert all([isinstance(b, str) for b in self.branches + self.tags]) def supports_tags(self): return (self.tags != []) @@ -336,7 +337,7 @@ def is_branch(self, path, project=None): for bp in self.branches: - if wildcard_matches(path, bp): + if wildcard_matches(path, bp): return True return False @@ -349,8 +350,8 @@ def parse(self, path): """Parse a path. - :return: Tuple with type ('tag', 'branch'), project name, branch path and path - inside the branch + :return: Tuple with type ('tag', 'branch'), project name, branch path + and path inside the branch """ path = path.strip("/") parts = path.split("/") === modified file 'revids.py' --- a/revids.py 2008-12-08 02:15:01 +0000 +++ b/revids.py 2008-12-10 02:57:38 +0000 @@ -164,6 +164,7 @@ raise else: self._cache[revid] = ret + return ret class DiskCachingRevidMap(object): -- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
