← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-06-21 06:10:18 UTC
  • Revision ID: mbp@sourcefrog.net-20050621061017-12e8f0ff45228338
- move whitebox/blackbox modules into bzrlib.selftest subdirectory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
80
80
        moved_path = self.add_suffix(target, ".moved")
81
81
        self.conflict("Moved existing %s to %s" % (target, moved_path))
82
82
 
83
 
    def rmdir_non_empty(self, filename):
84
 
        """Handle the case where the dir to be removed still has contents"""
85
 
        self.conflict("Directory %s not removed because it is not empty"\
86
 
            % filename)
87
 
        return "skip"
88
 
 
89
83
    def finalize(self):
90
84
        if not self.ignore_zero:
91
85
            print "%d conflicts encountered.\n" % self.conflicts
127
121
def inventory_map(tree):
128
122
    inventory = {}
129
123
    for file_id in tree.inventory:
 
124
        if not file_exists(tree, file_id):
 
125
            continue
130
126
        path = abspath(tree, file_id)
131
127
        inventory[path] = SourceFile(path, file_id)
132
128
    return inventory
146
142
        self.cached = {}
147
143
 
148
144
    def readonly_path(self, id):
149
 
        if id not in self.tree:
150
 
            return None
151
145
        if self.root is not None:
152
146
            return self.tree.abspath(self.tree.id2path(id))
153
147
        else: