« back to all changes in this revision
Viewing changes to bzrlib/merge.py
- browse files at revision 1114
- compare with another revision
- download diff
- download tarball
- view history from revision 1114
- Committer: Martin Pool
- Date: 2005-08-25 08:54:29 UTC
- Revision ID: mbp@sourcefrog.net-20050825085429-d815c4dcf7cc2067
- fix bad method declaration
added
removed
bzrlib/merge.py
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
18
import os.path
19
import tempfile
20
import shutil
21
import errno
22
23
import bzrlib.osutils
24
import bzrlib.revision
1
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
3
27
from bzrlib.changeset import Inventory, Diff3Merge
4
from bzrlib import find_branch
5
import bzrlib.osutils
6
from bzrlib.errors import BzrCommandError
28
from bzrlib.branch import find_branch
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches
7
30
from bzrlib.delta import compare_trees
8
from trace import mutter, warning
9
import os.path
10
import tempfile
11
import shutil
12
import errno
31
from bzrlib.trace import mutter, warning
32
from bzrlib.fetch import greedy_fetch
13
33
14
34
15
35
# comments from abentley on irc: merge happens in two stages, each
18
38
# stage 1: generate OLD->OTHER,
19
39
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
20
40
21
class UnrelatedBranches(BzrCommandError):
22
def __init__(self):
23
msg = "Branches have no common ancestor, and no base revision"\
24
" specified."
25
BzrCommandError.__init__(self, msg)
26
27
28
41
class MergeConflictHandler(ExceptionConflictHandler):
29
42
"""Handle conflicts encountered while merging.
30
43
48
61
d_file.write(line)
49
62
os.chmod(dest, 0777 & os.stat(source).st_mode)
50
63
64
def dump(self, lines, 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
d_file = file(dest, "wb")
70
for line in lines:
71
d_file.write(line)
72
51
73
def add_suffix(self, name, suffix, last_new_name=None):
52
74
"""Rename a file to append a suffix. If the new name exists, the
53
75
suffix is added repeatedly until a non-existant name is found
72
94
self.conflicts += 1
73
95
74
96
75
def merge_conflict(self, new_file, this_path, base_path, other_path):
97
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
76
98
"""
77
99
Handle diff3 conflicts by producing a .THIS, .BASE and .OTHER. The
78
100
main file will be a version with diff3 conflicts.
82
104
:param other_path: Path to the file text for the OTHER tree
83
105
"""
84
106
self.add_suffix(this_path, ".THIS")
85
self.copy(base_path, this_path+".BASE")
86
self.copy(other_path, this_path+".OTHER")
107
self.dump(base_lines, this_path+".BASE")
108
self.dump(other_lines, this_path+".OTHER")
87
109
os.rename(new_file, this_path)
88
110
self.conflict("Diff3 conflict encountered in %s" % this_path)
89
111
108
130
if not self.ignore_zero:
109
131
print "%d conflicts encountered.\n" % self.conflicts
110
132
111
class SourceFile(object):
112
def __init__(self, path, id, present=None, isdir=None):
113
self.path = path
114
self.id = id
115
self.present = present
116
self.isdir = isdir
117
self.interesting = True
118
119
def __repr__(self):
120
return "SourceFile(%s, %s)" % (self.path, self.id)
121
122
def get_tree(treespec, temp_root, label):
133
def get_tree(treespec, temp_root, label, local_branch=None):
123
134
location, revno = treespec
124
135
branch = find_branch(location)
125
136
if revno is None:
137
revision = None
138
elif revno == -1:
139
revision = branch.last_patch()
140
else:
141
revision = branch.lookup_revision(revno)
142
return branch, get_revid_tree(branch, revision, temp_root, label,
143
local_branch)
144
145
def get_revid_tree(branch, revision, temp_root, label, local_branch):
146
if revision is None:
126
147
base_tree = branch.working_tree()
127
elif revno == -1:
128
base_tree = branch.basis_tree()
129
148
else:
130
base_tree = branch.revision_tree(branch.lookup_revision(revno))
149
if local_branch is not None:
150
greedy_fetch(local_branch, branch, revision)
151
base_tree = local_branch.revision_tree(revision)
152
else:
153
base_tree = branch.revision_tree(revision)
131
154
temp_path = os.path.join(temp_root, label)
132
155
os.mkdir(temp_path)
133
return branch, MergeTree(base_tree, temp_path)
134
135
136
def abspath(tree, file_id):
137
path = tree.inventory.id2path(file_id)
138
if path == "":
139
return "./."
140
return "./" + path
156
return MergeTree(base_tree, temp_path)
157
141
158
142
159
def file_exists(tree, file_id):
143
160
return tree.has_filename(tree.id2path(file_id))
144
161
145
def inventory_map(tree):
146
inventory = {}
147
for file_id in tree.inventory:
148
path = abspath(tree, file_id)
149
inventory[path] = SourceFile(path, file_id)
150
return inventory
151
152
162
153
163
class MergeTree(object):
154
164
def __init__(self, tree, tempdir):
157
167
self.root = tree.basedir
158
168
else:
159
169
self.root = None
160
self.inventory = inventory_map(tree)
161
170
self.tree = tree
162
171
self.tempdir = tempdir
163
172
os.mkdir(os.path.join(self.tempdir, "texts"))
164
173
self.cached = {}
165
174
175
def __iter__(self):
176
return self.tree.__iter__()
177
166
178
def __contains__(self, file_id):
167
return id in self.tree
179
return file_id in self.tree
180
181
def get_file(self, file_id):
182
return self.tree.get_file(file_id)
168
183
169
184
def get_file_sha1(self, id):
170
185
return self.tree.get_file_sha1(id)
171
186
187
def id2path(self, file_id):
188
return self.tree.id2path(file_id)
189
190
def has_id(self, file_id):
191
return self.tree.has_id(file_id)
192
193
def has_or_had_id(self, file_id):
194
if file_id == self.tree.inventory.root.file_id:
195
return True
196
return self.tree.inventory.has_id(file_id)
197
172
198
def readonly_path(self, id):
173
199
if id not in self.tree:
174
200
return None
202
228
check_clean
203
229
If true, this_dir must have no uncommitted changes before the
204
230
merge begins.
231
all available ancestors of other_revision and base_revision are
232
automatically pulled into the branch.
205
233
"""
234
from bzrlib.revision import common_ancestor, MultipleRevisionSources
235
from bzrlib.errors import NoSuchRevision
206
236
tempdir = tempfile.mkdtemp(prefix="bzr-")
207
237
try:
208
238
if this_dir is None:
209
239
this_dir = '.'
210
240
this_branch = find_branch(this_dir)
241
this_rev_id = this_branch.last_patch()
242
if this_rev_id is None:
243
raise BzrCommandError("This branch has no commits")
211
244
if check_clean:
212
245
changes = compare_trees(this_branch.working_tree(),
213
246
this_branch.basis_tree(), False)
214
247
if changes.has_changed():
215
248
raise BzrCommandError("Working tree has uncommitted changes.")
216
other_branch, other_tree = get_tree(other_revision, tempdir, "other")
249
other_branch, other_tree = get_tree(other_revision, tempdir, "other",
250
this_branch)
251
if other_revision[1] == -1:
252
other_rev_id = other_branch.last_patch()
253
other_basis = other_rev_id
254
elif other_revision[1] is not None:
255
other_rev_id = other_branch.lookup_revision(other_revision[1])
256
other_basis = other_rev_id
257
else:
258
other_rev_id = None
259
other_basis = other_branch.last_patch()
217
260
if base_revision == [None, None]:
218
261
if other_revision[1] == -1:
219
262
o_revno = None
220
263
else:
221
264
o_revno = other_revision[1]
222
base_revno = this_branch.common_ancestor(other_branch,
223
other_revno=o_revno)[0]
224
if base_revno is None:
225
265
raise UnrelatedBranches()
226
base_revision = ['.', base_revno]
227
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
266
try:
267
base_revision = this_branch.get_revision(base_rev_id)
268
base_branch = this_branch
269
except NoSuchRevision:
270
base_branch = other_branch
271
base_tree = get_revid_tree(base_branch, base_rev_id, tempdir,
272
"base")
273
base_is_ancestor = True
274
else:
275
base_branch, base_tree = get_tree(base_revision, tempdir, "base")
276
if base_revision[1] == -1:
277
base_rev_id = base_branch.last_patch()
278
elif base_revision[1] is None:
279
base_rev_id = None
280
else:
281
base_rev_id = base_branch.lookup_revision(base_revision[1])
282
if base_rev_id is not None:
283
base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
284
MultipleRevisionSources(this_branch,
285
base_branch))
286
else:
287
base_is_ancestor = False
228
288
if file_list is None:
229
289
interesting_ids = None
230
290
else:
244
304
merge_inner(this_branch, other_tree, base_tree, tempdir,
245
305
ignore_zero=ignore_zero, backup_files=backup_files,
246
306
merge_type=merge_type, interesting_ids=interesting_ids)
307
if base_is_ancestor and other_rev_id is not None:
308
this_branch.add_pending_merge(other_rev_id)
247
309
finally:
248
310
shutil.rmtree(tempdir)
249
311
256
318
source_file.interesting = source_file.id in interesting_ids
257
319
258
320
259
def generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
260
interesting_ids=None):
321
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
261
322
"""Generate a changeset. If interesting_ids is supplied, only changes
262
323
to those files will be shown. Metadata changes are stripped.
263
324
"""
264
if interesting_ids is not None:
265
set_interesting(inventory_a, inventory_b, interesting_ids)
266
cset = generate_changeset(tree_a, tree_b, inventory_a, inventory_b)
325
cset = generate_changeset(tree_a, tree_b, interesting_ids)
267
326
for entry in cset.entries.itervalues():
268
327
entry.metadata_change = None
269
328
return cset
273
332
ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
274
333
interesting_ids=None):
275
334
276
def merge_factory(base_file, other_file):
277
contents_change = merge_type(base_file, other_file)
335
def merge_factory(file_id, base, other):
336
contents_change = merge_type(file_id, base, other)
278
337
if backup_files:
279
338
contents_change = BackupBeforeChange(contents_change)
280
339
return contents_change
281
282
def generate_cset(tree_a, tree_b, inventory_a, inventory_b):
283
return generate_cset_optimized(tree_a, tree_b, inventory_a, inventory_b,
284
interesting_ids)
285
340
286
341
this_tree = get_tree((this_branch.base, None), tempdir, "this")[1]
287
342
288
343
def get_inventory(tree):
289
return tree.inventory
344
return tree.tree.inventory
290
345
291
346
inv_changes = merge_flex(this_tree, base_tree, other_tree,
292
generate_cset, get_inventory,
347
generate_cset_optimized, get_inventory,
293
348
MergeConflictHandler(base_tree.root,
294
349
ignore_zero=ignore_zero),
295
merge_factory=merge_factory)
350
merge_factory=merge_factory,
351
interesting_ids=interesting_ids)
296
352
297
353
adjust_ids = []
298
354
for id, path in inv_changes.iteritems():
300
356
if path == '.':
301
357
path = ''
302
358
else:
303
assert path.startswith('./')
359
assert path.startswith('./'), "path is %s" % path
304
360
path = path[2:]
305
361
adjust_ids.append((path, id))
306
362
if len(adjust_ids) > 0:
312
368
old_entries = this_branch.read_working_inventory()
313
369
new_inventory = {}
314
370
by_path = {}
371
new_entries_map = {}
372
for path, file_id in new_entries:
373
if path is None:
374
continue
375
new_entries_map[file_id] = path
376
377
def id2path(file_id):
378
path = new_entries_map.get(file_id)
379
if path is not None:
380
return path
381
entry = old_entries[file_id]
382
if entry.parent_id is None:
383
return entry.name
384
return os.path.join(id2path(entry.parent_id), entry.name)
385
315
386
for file_id in old_entries:
316
387
entry = old_entries[file_id]
317
path = old_entries.id2path(file_id)
388
path = id2path(file_id)
318
389
new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
319
390
by_path[path] = file_id
320
391
Loggerhead is a web-based interface for Breezy
Version: 2.0.1