← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-01 09:30:22 UTC
  • mfrom: (4496.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090701093022-20c1efogz7l7clwm
(igc) Improve paths are not versioned reporting (Benoît PIERRE)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
2049
2049
        state._read_dirblocks_if_needed()
2050
2050
        if require_versioned:
2051
2051
            # -- check all supplied paths are versioned in a search tree. --
2052
 
            all_versioned = True
 
2052
            not_versioned = []
2053
2053
            for path in specific_files:
2054
2054
                path_entries = state._entries_for_path(path)
2055
2055
                if not path_entries:
2056
2056
                    # this specified path is not present at all: error
2057
 
                    all_versioned = False
2058
 
                    break
 
2057
                    not_versioned.append(path)
 
2058
                    continue
2059
2059
                found_versioned = False
2060
2060
                # for each id at this path
2061
2061
                for entry in path_entries:
2068
2068
                if not found_versioned:
2069
2069
                    # none of the indexes was not 'absent' at all ids for this
2070
2070
                    # path.
2071
 
                    all_versioned = False
2072
 
                    break
2073
 
            if not all_versioned:
2074
 
                raise errors.PathsNotVersionedError(specific_files)
 
2071
                    not_versioned.append(path)
 
2072
            if len(not_versioned) > 0:
 
2073
                raise errors.PathsNotVersionedError(not_versioned)
2075
2074
        # -- remove redundancy in supplied specific_files to prevent over-scanning --
2076
2075
        search_specific_files = osutils.minimum_path_selection(specific_files)
2077
2076