← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-16 22:00:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1942.
  • Revision ID: john@arbash-meinel.com-20060816220019-541cb90093258ac3
Using real utf8 and cache_utf8 has similar performance, 272ms, and 363ms

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
1
# Copyright (C) 2006 Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
507
507
                        self.tree_kind(t) == 'directory'])
508
508
        for trans_id in self._removed_id:
509
509
            file_id = self.tree_file_id(trans_id)
510
 
            if self._tree.inventory[file_id].kind in ('directory', 
511
 
                                                      'root_directory'):
 
510
            if self._tree.inventory[file_id].kind == 'directory':
512
511
                parents.append(trans_id)
513
512
 
514
513
        for parent_id in parents:
1071
1070
        contents_mod = True
1072
1071
        meta_mod = False
1073
1072
    if has_contents is True:
1074
 
        real_e_kind = entry.kind
1075
 
        if real_e_kind == 'root_directory':
1076
 
            real_e_kind = 'directory'
1077
 
        if real_e_kind != working_kind:
 
1073
        if entry.kind != working_kind:
1078
1074
            contents_mod, meta_mod = True, False
1079
1075
        else:
1080
1076
            cur_entry._read_tree_state(working_tree.id2path(file_id),