← 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-07-07 08:02:16 UTC
  • Revision ID: mbp@sourcefrog.net-20050707080216-4e4d884bcf89eb8d
- Merge merge updates from aaron

  aaron.bentley@utoronto.ca-20050706170931-9d2551019af3578d

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
 
83
89
    def finalize(self):
84
90
        if not self.ignore_zero:
85
91
            print "%d conflicts encountered.\n" % self.conflicts
121
127
def inventory_map(tree):
122
128
    inventory = {}
123
129
    for file_id in tree.inventory:
124
 
        if not file_exists(tree, file_id):
125
 
            continue
126
130
        path = abspath(tree, file_id)
127
131
        inventory[path] = SourceFile(path, file_id)
128
132
    return inventory
142
146
        self.cached = {}
143
147
 
144
148
    def readonly_path(self, id):
 
149
        if id not in self.tree:
 
150
            return None
145
151
        if self.root is not None:
146
152
            return self.tree.abspath(self.tree.id2path(id))
147
153
        else: