Rev 4358: (Jelmer) Use utility function to check for control filename rather in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4358
revision-id: pqm at pqm.ubuntu.com-20090513171628-zmtijps3xl06nr9j
parent: pqm at pqm.ubuntu.com-20090513155150-vgm0k98ojzcl9keb
parent: jelmer at samba.org-20090502100034-v3557g29soypzkr0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-05-13 18:16:28 +0100
message:
  (Jelmer) Use utility function to check for control filename rather
  	than assuming it is '.bzr'.
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 4324.5.1
    revision-id: jelmer at samba.org-20090502100034-v3557g29soypzkr0
    parent: pqm at pqm.ubuntu.com-20090502005030-s11zizqqgrf3s3k2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Sat 2009-05-02 12:00:34 +0200
    message:
      Use utility function to check for control filename rather than assuming it is '.bzr.'
    modified:
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2009-05-07 05:08:46 +0000
+++ b/bzrlib/workingtree.py	2009-05-13 17:16:28 +0000
@@ -1642,7 +1642,7 @@
 
             fl = []
             for subf in os.listdir(dirabs):
-                if subf == '.bzr':
+                if self.bzrdir.is_control_filename(subf):
                     continue
                 if subf not in dir_entry.children:
                     try:
@@ -2374,7 +2374,8 @@
                     bzrdir_loc = bisect_left(cur_disk_dir_content,
                         ('.bzr', '.bzr'))
                     if (bzrdir_loc < len(cur_disk_dir_content)
-                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
+                        and self.bzrdir.is_control_filename(
+                            cur_disk_dir_content[bzrdir_loc][0])):
                         # we dont yield the contents of, or, .bzr itself.
                         del cur_disk_dir_content[bzrdir_loc]
             if inv_finished: