~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

• browse files at revision 2643
• compare with another revision
• compare with revision 3343
• download diff
• download tarball
• view history from revision 2643

Show diffs side-by-side

added

removed

bzrlib/workingtree_4.py

1688

1688

        """

1689

1689

        utf8_decode = cache_utf8._utf8_decode

1690

1690

        _minikind_to_kind = dirstate.DirState._minikind_to_kind

 

1691

        cmp_by_dirs = dirstate.cmp_by_dirs

1691

1692

        # NB: show_status depends on being able to pass in non-versioned files

1692

1693

        # and report them as unknown

1693

1694

        # TODO: handle extra trees in the dirstate.

2174

2175

                   current_block is not None):

2175

2176

                if (current_dir_info and current_block

2176

2177

                    and current_dir_info[0][0] != current_block[0]):

2177

 

                    if current_dir_info[0][0].split('/') < current_block[0].split('/'):

 

2178

                    if cmp_by_dirs(current_dir_info[0][0], current_block[0]) < 0:

2178

2179

                        # filesystem data refers to paths not covered by the dirblock.

2179

2180

                        # this has two possibilities:

2180

2181

                        # A) it is versioned but empty, so there is no block for it

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1