~bzr-pqm/bzr/bzr.dev

1110 by Martin Pool
- merge aaron's merge improvements:
1
# Copyright (C) 2005 Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
18
import os
1113 by Martin Pool
- fix is_ancestor import problem in merge
19
import tempfile
20
import shutil
21
import errno
22
23
import bzrlib.osutils
24
import bzrlib.revision
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
27
from bzrlib.changeset import Inventory, Diff3Merge, ReplaceContents
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
28
from bzrlib.branch import Branch
974.1.80 by Aaron Bentley
Improved merge error handling and testing
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
from bzrlib.errors import NoCommits
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
31
from bzrlib.delta import compare_trees
1113 by Martin Pool
- fix is_ancestor import problem in merge
32
from bzrlib.trace import mutter, warning
1390 by Robert Collins
pair programming worx... merge integration and weave
33
from bzrlib.fetch import greedy_fetch, fetch
1116 by Martin Pool
- fix a few errors in new merge code
34
from bzrlib.revision import is_ancestor
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
35
from bzrlib.osutils import rename
1390 by Robert Collins
pair programming worx... merge integration and weave
36
from bzrlib.revision import common_ancestor, MultipleRevisionSources
37
from bzrlib.errors import NoSuchRevision
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
38
1393.1.10 by Martin Pool
- factor out stereotyped use of merge to build working dir
39
# TODO: build_working_dir can be built on something simpler than merge()
40
41
# FIXME: merge() parameters seem oriented towards the command line
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
42
43
# comments from abentley on irc: merge happens in two stages, each
44
# of which generates a changeset object
45
46
# stage 1: generate OLD->OTHER,
47
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
48
493 by Martin Pool
- Merge aaron's merge command
49
class MergeConflictHandler(ExceptionConflictHandler):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
50
    """Handle conflicts encountered while merging.
51
52
    This subclasses ExceptionConflictHandler, so that any types of
53
    conflict that are not explicitly handled cause an exception and
54
    terminate the merge.
55
    """
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
56
    def __init__(self, this_tree, base_tree, other_tree, ignore_zero=False):
974.1.83 by Aaron Bentley
Removed unused dir parameter from ExceptionConflictHandler
57
        ExceptionConflictHandler.__init__(self)
622 by Martin Pool
Updated merge patch from Aaron
58
        self.conflicts = 0
59
        self.ignore_zero = ignore_zero
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
60
        self.this_tree = this_tree
61
        self.base_tree = base_tree
62
        self.other_tree = other_tree
622 by Martin Pool
Updated merge patch from Aaron
63
493 by Martin Pool
- Merge aaron's merge command
64
    def copy(self, source, dest):
65
        """Copy the text and mode of a file
66
        :param source: The path of the file to copy
67
        :param dest: The distination file to create
68
        """
69
        s_file = file(source, "rb")
70
        d_file = file(dest, "wb")
71
        for line in s_file:
72
            d_file.write(line)
73
        os.chmod(dest, 0777 & os.stat(source).st_mode)
74
974.1.23 by Aaron Bentley
Avoided unnecessary temp files
75
    def dump(self, lines, dest):
76
        """Copy the text and mode of a file
77
        :param source: The path of the file to copy
78
        :param dest: The distination file to create
79
        """
80
        d_file = file(dest, "wb")
81
        for line in lines:
82
            d_file.write(line)
83
493 by Martin Pool
- Merge aaron's merge command
84
    def add_suffix(self, name, suffix, last_new_name=None):
85
        """Rename a file to append a suffix.  If the new name exists, the
86
        suffix is added repeatedly until a non-existant name is found
87
88
        :param name: The path of the file
89
        :param suffix: The suffix to append
90
        :param last_new_name: (used for recursive calls) the last name tried
91
        """
92
        if last_new_name is None:
93
            last_new_name = name
94
        new_name = last_new_name+suffix
95
        try:
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
96
            rename(name, new_name)
622 by Martin Pool
Updated merge patch from Aaron
97
            return new_name
493 by Martin Pool
- Merge aaron's merge command
98
        except OSError, e:
99
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
100
                raise
622 by Martin Pool
Updated merge patch from Aaron
101
            return self.add_suffix(name, suffix, last_new_name=new_name)
102
103
    def conflict(self, text):
104
        warning(text)
105
        self.conflicts += 1
106
        
493 by Martin Pool
- Merge aaron's merge command
107
974.1.23 by Aaron Bentley
Avoided unnecessary temp files
108
    def merge_conflict(self, new_file, this_path, base_lines, other_lines):
493 by Martin Pool
- Merge aaron's merge command
109
        """
110
        Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER.  The
111
        main file will be a version with diff3 conflicts.
112
        :param new_file: Path to the output file with diff3 markers
113
        :param this_path: Path to the file text for the THIS tree
114
        :param base_path: Path to the file text for the BASE tree
115
        :param other_path: Path to the file text for the OTHER tree
116
        """
117
        self.add_suffix(this_path, ".THIS")
974.1.23 by Aaron Bentley
Avoided unnecessary temp files
118
        self.dump(base_lines, this_path+".BASE")
119
        self.dump(other_lines, this_path+".OTHER")
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
120
        rename(new_file, this_path)
622 by Martin Pool
Updated merge patch from Aaron
121
        self.conflict("Diff3 conflict encountered in %s" % this_path)
493 by Martin Pool
- Merge aaron's merge command
122
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
123
    def new_contents_conflict(self, filename, other_contents):
124
        """Conflicting contents for newly added file."""
125
        self.copy(other_contents, filename + ".OTHER")
126
        self.conflict("Conflict in newly added file %s" % filename)
127
    
128
493 by Martin Pool
- Merge aaron's merge command
129
    def target_exists(self, entry, target, old_path):
130
        """Handle the case when the target file or dir exists"""
622 by Martin Pool
Updated merge patch from Aaron
131
        moved_path = self.add_suffix(target, ".moved")
132
        self.conflict("Moved existing %s to %s" % (target, moved_path))
133
850 by Martin Pool
- Merge merge updates from aaron
134
    def rmdir_non_empty(self, filename):
135
        """Handle the case where the dir to be removed still has contents"""
136
        self.conflict("Directory %s not removed because it is not empty"\
137
            % filename)
138
        return "skip"
139
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
140
    def rem_contents_conflict(self, filename, this_contents, base_contents):
141
        base_contents(filename+".BASE", self, False)
142
        this_contents(filename+".THIS", self, False)
1185.10.9 by Aaron Bentley
Added conflict message
143
        self.conflict("Other branch deleted locally modified file %s" %
144
                      filename)
1185.10.8 by Aaron Bentley
Conflict handling where OTHER is deleted
145
        return ReplaceContents(this_contents, None)
146
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
147
    def abs_this_path(self, file_id):
148
        """Return the absolute path for a file_id in the this tree."""
149
        relpath = self.this_tree.id2path(file_id)
150
        return self.this_tree.tree.abspath(relpath)
151
152
    def add_missing_parents(self, file_id, tree):
153
        """If some of the parents for file_id are missing, add them."""
154
        entry = tree.tree.inventory[file_id]
155
        if entry.parent_id not in self.this_tree:
156
            return self.create_all_missing(entry.parent_id, tree)
157
        else:
158
            return self.abs_this_path(entry.parent_id)
159
160
    def create_all_missing(self, file_id, tree):
161
        """Add contents for a file_id and all its parents to a tree."""
162
        entry = tree.tree.inventory[file_id]
163
        if entry.parent_id is not None and entry.parent_id not in self.this_tree:
164
            abspath = self.create_all_missing(entry.parent_id, tree)
165
        else:
166
            abspath = self.abs_this_path(entry.parent_id)
167
        entry_path = os.path.join(abspath, entry.name)
168
        if not os.path.isdir(entry_path):
169
            self.create(file_id, entry_path, tree)
170
        return entry_path
171
172
    def create(self, file_id, path, tree, reverse=False):
173
        """Uses tree data to create a filesystem object for the file_id"""
174
        from merge_core import get_id_contents
175
        get_id_contents(file_id, tree)(path, self, reverse)
176
177
    def missing_for_merge(self, file_id, other_path):
178
        """The file_id doesn't exist in THIS, but does in OTHER and BASE"""
179
        self.conflict("Other branch modified locally deleted file %s" %
180
                      other_path)
181
        parent_dir = self.add_missing_parents(file_id, self.other_tree)
182
        stem = os.path.join(parent_dir, os.path.basename(other_path))
183
        self.create(file_id, stem+".OTHER", self.other_tree)
184
        self.create(file_id, stem+".BASE", self.base_tree)
185
622 by Martin Pool
Updated merge patch from Aaron
186
    def finalize(self):
187
        if not self.ignore_zero:
188
            print "%d conflicts encountered.\n" % self.conflicts
493 by Martin Pool
- Merge aaron's merge command
189
            
974.1.32 by aaron.bentley at utoronto
Made merge do greedy fetching.
190
def get_tree(treespec, temp_root, label, local_branch=None):
622 by Martin Pool
Updated merge patch from Aaron
191
    location, revno = treespec
1185.8.5 by Aaron Bentley
Fixed non-tree-root bug in branch, revert, merge
192
    branch = Branch.open_containing(location)
493 by Martin Pool
- Merge aaron's merge command
193
    if revno is None:
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
194
        revision = None
195
    elif revno == -1:
1241 by Martin Pool
- rename last_patch to last_revision
196
        revision = branch.last_revision()
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
197
    else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
198
        revision = branch.get_rev_id(revno)
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
199
    return branch, get_revid_tree(branch, revision, temp_root, label,
200
                                  local_branch)
201
202
def get_revid_tree(branch, revision, temp_root, label, local_branch):
203
    if revision is None:
493 by Martin Pool
- Merge aaron's merge command
204
        base_tree = branch.working_tree()
205
    else:
974.1.32 by aaron.bentley at utoronto
Made merge do greedy fetching.
206
        if local_branch is not None:
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
207
            greedy_fetch(local_branch, branch, revision)
974.1.32 by aaron.bentley at utoronto
Made merge do greedy fetching.
208
            base_tree = local_branch.revision_tree(revision)
209
        else:
210
            base_tree = branch.revision_tree(revision)
493 by Martin Pool
- Merge aaron's merge command
211
    temp_path = os.path.join(temp_root, label)
212
    os.mkdir(temp_path)
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
213
    return MergeTree(base_tree, temp_path)
493 by Martin Pool
- Merge aaron's merge command
214
215
216
def file_exists(tree, file_id):
217
    return tree.has_filename(tree.id2path(file_id))
218
    
219
220
class MergeTree(object):
221
    def __init__(self, tree, tempdir):
222
        object.__init__(self)
223
        if hasattr(tree, "basedir"):
224
            self.root = tree.basedir
225
        else:
226
            self.root = None
227
        self.tree = tree
228
        self.tempdir = tempdir
229
        os.mkdir(os.path.join(self.tempdir, "texts"))
1092.2.17 by Robert Collins
apply the symlink revert patch from Aaron Bentley
230
        os.mkdir(os.path.join(self.tempdir, "symlinks"))
493 by Martin Pool
- Merge aaron's merge command
231
        self.cached = {}
232
974.1.19 by Aaron Bentley
Removed MergeTree.inventory
233
    def __iter__(self):
234
        return self.tree.__iter__()
235
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
236
    def __contains__(self, file_id):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
237
        return file_id in self.tree
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
238
974.1.23 by Aaron Bentley
Avoided unnecessary temp files
239
    def get_file(self, file_id):
240
        return self.tree.get_file(file_id)
241
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
242
    def get_file_sha1(self, id):
243
        return self.tree.get_file_sha1(id)
244
974.1.18 by Aaron Bentley
Stopped using SourceFile in inventory
245
    def id2path(self, file_id):
246
        return self.tree.id2path(file_id)
247
248
    def has_id(self, file_id):
249
        return self.tree.has_id(file_id)
250
974.1.47 by Aaron Bentley
Merged changes from the merge4 branch
251
    def has_or_had_id(self, file_id):
252
        if file_id == self.tree.inventory.root.file_id:
253
            return True
254
        return self.tree.inventory.has_id(file_id)
255
974.1.50 by aaron.bentley at utoronto
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9
256
    def has_or_had_id(self, file_id):
257
        if file_id == self.tree.inventory.root.file_id:
258
            return True
259
        return self.tree.inventory.has_id(file_id)
260
493 by Martin Pool
- Merge aaron's merge command
261
    def readonly_path(self, id):
850 by Martin Pool
- Merge merge updates from aaron
262
        if id not in self.tree:
263
            return None
493 by Martin Pool
- Merge aaron's merge command
264
        if self.root is not None:
265
            return self.tree.abspath(self.tree.id2path(id))
266
        else:
1092.2.17 by Robert Collins
apply the symlink revert patch from Aaron Bentley
267
            kind = self.tree.inventory[id].kind
268
            if kind in ("directory", "root_directory"):
493 by Martin Pool
- Merge aaron's merge command
269
                return self.tempdir
270
            if not self.cached.has_key(id):
1092.2.17 by Robert Collins
apply the symlink revert patch from Aaron Bentley
271
                if kind == "file":
272
                    path = os.path.join(self.tempdir, "texts", id)
273
                    outfile = file(path, "wb")
274
                    outfile.write(self.tree.get_file(id).read())
1092.2.24 by Robert Collins
merge from martins newformat branch - brings in transport abstraction
275
                    assert(bzrlib.osutils.lexists(path))
1092.2.17 by Robert Collins
apply the symlink revert patch from Aaron Bentley
276
                else:
277
                    assert kind == "symlink"
278
                    path = os.path.join(self.tempdir, "symlinks", id)
279
                    target = self.tree.get_symlink_target(id)
280
                    os.symlink(target, path)
493 by Martin Pool
- Merge aaron's merge command
281
                self.cached[id] = path
282
            return self.cached[id]
283
628 by Martin Pool
- merge aaron's updated merge/pull code
284
1393.1.10 by Martin Pool
- factor out stereotyped use of merge to build working dir
285
def build_working_dir(to_dir):
286
    """Build a working directory in an empty directory.
287
288
    to_dir is a directory containing branch metadata but no working files,
289
    typically constructed by cloning an existing branch. 
290
291
    This is split out as a special idiomatic case of merge.  It could
292
    eventually be done by just building the tree directly calling into 
293
    lower-level code (e.g. constructing a changeset).
294
    """
295
    merge((to_dir, -1), (to_dir, 0), this_dir=to_dir,
296
          check_clean=False, ignore_zero=True)
297
628 by Martin Pool
- merge aaron's updated merge/pull code
298
299
def merge(other_revision, base_revision,
300
          check_clean=True, ignore_zero=False,
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
301
          this_dir=None, backup_files=False, merge_type=ApplyMerge3,
302
          file_list=None):
628 by Martin Pool
- merge aaron's updated merge/pull code
303
    """Merge changes into a tree.
304
305
    base_revision
1092.1.38 by Robert Collins
make a default merge choose a sane base with branch.common_ancestor
306
        tuple(path, revision) Base for three-way merge.
628 by Martin Pool
- merge aaron's updated merge/pull code
307
    other_revision
1092.1.38 by Robert Collins
make a default merge choose a sane base with branch.common_ancestor
308
        tuple(path, revision) Other revision for three-way merge.
628 by Martin Pool
- merge aaron's updated merge/pull code
309
    this_dir
310
        Directory to merge changes into; '.' by default.
311
    check_clean
312
        If true, this_dir must have no uncommitted changes before the
313
        merge begins.
1393.1.10 by Martin Pool
- factor out stereotyped use of merge to build working dir
314
    ignore_zero - If true, suppress the "zero conflicts" message when 
315
        there are no conflicts; should be set when doing something we expect
316
        to complete perfectly.
1390 by Robert Collins
pair programming worx... merge integration and weave
317
318
    All available ancestors of other_revision and base_revision are
974.1.32 by aaron.bentley at utoronto
Made merge do greedy fetching.
319
    automatically pulled into the branch.
628 by Martin Pool
- merge aaron's updated merge/pull code
320
    """
493 by Martin Pool
- Merge aaron's merge command
321
    tempdir = tempfile.mkdtemp(prefix="bzr-")
322
    try:
628 by Martin Pool
- merge aaron's updated merge/pull code
323
        if this_dir is None:
324
            this_dir = '.'
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
325
        this_branch = Branch.open_containing(this_dir)
1241 by Martin Pool
- rename last_patch to last_revision
326
        this_rev_id = this_branch.last_revision()
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
327
        if this_rev_id is None:
328
            raise BzrCommandError("This branch has no commits")
628 by Martin Pool
- merge aaron's updated merge/pull code
329
        if check_clean:
622 by Martin Pool
Updated merge patch from Aaron
330
            changes = compare_trees(this_branch.working_tree(), 
331
                                    this_branch.basis_tree(), False)
332
            if changes.has_changed():
333
                raise BzrCommandError("Working tree has uncommitted changes.")
974.1.32 by aaron.bentley at utoronto
Made merge do greedy fetching.
334
        other_branch, other_tree = get_tree(other_revision, tempdir, "other",
335
                                            this_branch)
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
336
        if other_revision[1] == -1:
1241 by Martin Pool
- rename last_patch to last_revision
337
            other_rev_id = other_branch.last_revision()
974.1.80 by Aaron Bentley
Improved merge error handling and testing
338
            if other_rev_id is None:
339
                raise NoCommits(other_branch)
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
340
            other_basis = other_rev_id
341
        elif other_revision[1] is not None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
342
            other_rev_id = other_branch.get_rev_id(other_revision[1])
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
343
            other_basis = other_rev_id
344
        else:
345
            other_rev_id = None
1241 by Martin Pool
- rename last_patch to last_revision
346
            other_basis = other_branch.last_revision()
974.1.80 by Aaron Bentley
Improved merge error handling and testing
347
            if other_basis is None:
348
                raise NoCommits(other_branch)
622 by Martin Pool
Updated merge patch from Aaron
349
        if base_revision == [None, None]:
974.1.80 by Aaron Bentley
Improved merge error handling and testing
350
            try:
351
                base_rev_id = common_ancestor(this_rev_id, other_basis, 
352
                                              this_branch)
353
            except NoCommonAncestor:
622 by Martin Pool
Updated merge patch from Aaron
354
                raise UnrelatedBranches()
974.1.37 by aaron.bentley at utoronto
pending merges, common ancestor work properly
355
            base_tree = get_revid_tree(this_branch, base_rev_id, tempdir, 
356
                                       "base", None)
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
357
            base_is_ancestor = True
358
        else:
359
            base_branch, base_tree = get_tree(base_revision, tempdir, "base")
360
            if base_revision[1] == -1:
1241 by Martin Pool
- rename last_patch to last_revision
361
                base_rev_id = base_branch.last_revision()
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
362
            elif base_revision[1] is None:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
363
                base_rev_id = None
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
364
            else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
365
                base_rev_id = base_branch.get_rev_id(base_revision[1])
1390 by Robert Collins
pair programming worx... merge integration and weave
366
            fetch(from_branch=base_branch, to_branch=this_branch)
974.1.88 by Aaron Bentley
Set a pending_merge if the merge base is forced to revno 0
367
            base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
1390 by Robert Collins
pair programming worx... merge integration and weave
368
                                           this_branch)
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
369
        if file_list is None:
370
            interesting_ids = None
371
        else:
372
            interesting_ids = set()
373
            this_tree = this_branch.working_tree()
374
            for fname in file_list:
375
                path = this_branch.relpath(fname)
376
                found_id = False
377
                for tree in (this_tree, base_tree.tree, other_tree.tree):
378
                    file_id = tree.inventory.path2id(path)
379
                    if file_id is not None:
380
                        interesting_ids.add(file_id)
381
                        found_id = True
382
                if not found_id:
383
                    raise BzrCommandError("%s is not a source file in any"
384
                                          " tree." % fname)
622 by Martin Pool
Updated merge patch from Aaron
385
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
974.1.9 by Aaron Bentley
Added merge-type parameter to merge.
386
                    ignore_zero=ignore_zero, backup_files=backup_files, 
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
387
                    merge_type=merge_type, interesting_ids=interesting_ids)
974.1.55 by aaron.bentley at utoronto
Fixed bug causing previous revision to be listed as a pending merge on pull
388
        if base_is_ancestor and other_rev_id is not None\
389
            and other_rev_id not in this_branch.revision_history():
974.1.36 by aaron.bentley at utoronto
Committed it even though the test case doesn't work
390
            this_branch.add_pending_merge(other_rev_id)
493 by Martin Pool
- Merge aaron's merge command
391
    finally:
392
        shutil.rmtree(tempdir)
393
394
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
395
def set_interesting(inventory_a, inventory_b, interesting_ids):
396
    """Mark files whose ids are in interesting_ids as interesting
397
    """
398
    for inventory in (inventory_a, inventory_b):
399
        for path, source_file in inventory.iteritems():
400
             source_file.interesting = source_file.id in interesting_ids
401
402
974.1.19 by Aaron Bentley
Removed MergeTree.inventory
403
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
404
    """Generate a changeset.  If interesting_ids is supplied, only changes
405
    to those files will be shown.  Metadata changes are stripped.
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
406
    """ 
974.1.19 by Aaron Bentley
Removed MergeTree.inventory
407
    cset =  generate_changeset(tree_a, tree_b, interesting_ids)
493 by Martin Pool
- Merge aaron's merge command
408
    for entry in cset.entries.itervalues():
409
        entry.metadata_change = None
410
    return cset
411
412
622 by Martin Pool
Updated merge patch from Aaron
413
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
974.1.10 by aaron.bentley at utoronto
Added file-selection to merge-revert
414
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
415
                interesting_ids=None):
974.1.4 by Aaron Bentley
Implemented merge3 as the default text merge
416
974.1.23 by Aaron Bentley
Avoided unnecessary temp files
417
    def merge_factory(file_id, base, other):
418
        contents_change = merge_type(file_id, base, other)
974.1.8 by Aaron Bentley
Added default backups for merge-revert
419
        if backup_files:
420
            contents_change = BackupBeforeChange(contents_change)
421
        return contents_change
974.1.4 by Aaron Bentley
Implemented merge3 as the default text merge
422
628 by Martin Pool
- merge aaron's updated merge/pull code
423
    this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
493 by Martin Pool
- Merge aaron's merge command
424
425
    def get_inventory(tree):
974.1.19 by Aaron Bentley
Removed MergeTree.inventory
426
        return tree.tree.inventory
493 by Martin Pool
- Merge aaron's merge command
427
428
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
974.1.85 by Aaron Bentley
Reverted incomplete conflict handling
429
                             generate_cset_optimized, get_inventory,
1185.10.10 by Aaron Bentley
Handled modified files missing from THIS
430
                             MergeConflictHandler(this_tree, base_tree,
431
                             other_tree, ignore_zero=ignore_zero),
974.1.17 by Aaron Bentley
Switched to using a set of interesting file_ids instead of SourceFile attribute
432
                             merge_factory=merge_factory, 
433
                             interesting_ids=interesting_ids)
493 by Martin Pool
- Merge aaron's merge command
434
435
    adjust_ids = []
436
    for id, path in inv_changes.iteritems():
437
        if path is not None:
438
            if path == '.':
439
                path = ''
440
            else:
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
441
                assert path.startswith('.' + os.sep), "path is %s" % path
493 by Martin Pool
- Merge aaron's merge command
442
            path = path[2:]
443
        adjust_ids.append((path, id))
974.1.13 by aaron.bentley at utoronto
Avoid rewriting inventory when not necessary
444
    if len(adjust_ids) > 0:
445
        this_branch.set_inventory(regen_inventory(this_branch, this_tree.root,
446
                                                  adjust_ids))
493 by Martin Pool
- Merge aaron's merge command
447
448
449
def regen_inventory(this_branch, root, new_entries):
450
    old_entries = this_branch.read_working_inventory()
451
    new_inventory = {}
452
    by_path = {}
974.1.21 by aaron.bentley at utoronto
Handled path generation properly
453
    new_entries_map = {} 
454
    for path, file_id in new_entries:
455
        if path is None:
456
            continue
457
        new_entries_map[file_id] = path
458
459
    def id2path(file_id):
460
        path = new_entries_map.get(file_id)
461
        if path is not None:
462
            return path
463
        entry = old_entries[file_id]
464
        if entry.parent_id is None:
465
            return entry.name
466
        return os.path.join(id2path(entry.parent_id), entry.name)
467
        
493 by Martin Pool
- Merge aaron's merge command
468
    for file_id in old_entries:
469
        entry = old_entries[file_id]
974.1.21 by aaron.bentley at utoronto
Handled path generation properly
470
        path = id2path(file_id)
493 by Martin Pool
- Merge aaron's merge command
471
        new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
472
        by_path[path] = file_id
473
    
474
    deletions = 0
475
    insertions = 0
476
    new_path_list = []
477
    for path, file_id in new_entries:
478
        if path is None:
479
            del new_inventory[file_id]
480
            deletions += 1
481
        else:
482
            new_path_list.append((path, file_id))
483
            if file_id not in old_entries:
484
                insertions += 1
485
    # Ensure no file is added before its parent
486
    new_path_list.sort()
487
    for path, file_id in new_path_list:
488
        if path == '':
489
            parent = None
490
        else:
491
            parent = by_path[os.path.dirname(path)]
492
        kind = bzrlib.osutils.file_kind(os.path.join(root, path))
493
        new_inventory[file_id] = (path, file_id, parent, kind)
494
        by_path[path] = file_id 
495
496
    # Get a list in insertion order
497
    new_inventory_list = new_inventory.values()
498
    mutter ("""Inventory regeneration:
499
old length: %i insertions: %i deletions: %i new_length: %i"""\
500
        % (len(old_entries), insertions, deletions, len(new_inventory_list)))
501
    assert len(new_inventory_list) == len(old_entries) + insertions - deletions
502
    new_inventory_list.sort()
503
    return new_inventory_list
974.1.9 by Aaron Bentley
Added merge-type parameter to merge.
504
505
merge_types = {     "merge3": (ApplyMerge3, "Native diff3-style merge"), 
506
                     "diff3": (Diff3Merge,  "Merge using external diff3")
507
              }
508