1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
|
import changeset
from changeset import Inventory, apply_changeset, invert_dict
import os.path
class ThreewayInventory(object):
def __init__(self, this_inventory, base_inventory, other_inventory):
self.this = this_inventory
self.base = base_inventory
self.other = other_inventory
def invert_invent(inventory):
invert_invent = {}
for key, value in inventory.iteritems():
invert_invent[value.id] = key
return invert_invent
def make_inv(inventory):
return Inventory(invert_invent(inventory))
def merge_flex(this, base, other, changeset_function, inventory_function,
conflict_handler):
this_inventory = inventory_function(this)
base_inventory = inventory_function(base)
other_inventory = inventory_function(other)
inventory = ThreewayInventory(make_inv(this_inventory),
make_inv(base_inventory),
make_inv(other_inventory))
cset = changeset_function(base, other, base_inventory, other_inventory)
new_cset = make_merge_changeset(cset, inventory, this, base, other,
conflict_handler)
result = apply_changeset(new_cset, invert_invent(this_inventory),
this.root, conflict_handler, False)
conflict_handler.finalize()
return result
def make_merge_changeset(cset, inventory, this, base, other,
conflict_handler=None):
new_cset = changeset.Changeset()
def get_this_contents(id):
path = os.path.join(this.root, inventory.this.get_path(id))
if os.path.isdir(path):
return changeset.dir_create
else:
return changeset.FileCreate(file(path, "rb").read())
for entry in cset.entries.itervalues():
if entry.is_boring():
new_cset.add_entry(entry)
elif entry.is_creation(False):
if inventory.this.get_path(entry.id) is None:
new_cset.add_entry(entry)
else:
this_contents = get_this_contents(entry.id)
other_contents = entry.contents_change.new_contents
if other_contents == this_contents:
boring_entry = changeset.ChangesetEntry(entry.id,
entry.new_parent,
entry.new_path)
new_cset.add_entry(boring_entry)
else:
conflict_handler.contents_conflict(this_contents,
other_contents)
elif entry.is_deletion(False):
if inventory.this.get_path(entry.id) is None:
boring_entry = changeset.ChangesetEntry(entry.id, entry.parent,
entry.path)
new_cset.add_entry(boring_entry)
elif entry.contents_change is not None:
this_contents = get_this_contents(entry.id)
base_contents = entry.contents_change.old_contents
if base_contents == this_contents:
new_cset.add_entry(entry)
else:
entry_path = inventory.this.get_path(entry.id)
conflict_handler.rem_contents_conflict(entry_path,
this_contents,
base_contents)
else:
new_cset.add_entry(entry)
else:
entry = get_merge_entry(entry, inventory, base, other,
conflict_handler)
if entry is not None:
new_cset.add_entry(entry)
return new_cset
def get_merge_entry(entry, inventory, base, other, conflict_handler):
this_name = inventory.this.get_name(entry.id)
this_parent = inventory.this.get_parent(entry.id)
this_dir = inventory.this.get_dir(entry.id)
if this_dir is None:
this_dir = ""
if this_name is None:
return conflict_handler.merge_missing(entry.id, inventory)
base_name = inventory.base.get_name(entry.id)
base_parent = inventory.base.get_parent(entry.id)
base_dir = inventory.base.get_dir(entry.id)
if base_dir is None:
base_dir = ""
other_name = inventory.other.get_name(entry.id)
other_parent = inventory.other.get_parent(entry.id)
other_dir = inventory.base.get_dir(entry.id)
if other_dir is None:
other_dir = ""
if base_name == other_name:
old_name = this_name
new_name = this_name
else:
if this_name != base_name and this_name != other_name:
conflict_handler.rename_conflict(entry.id, this_name, base_name,
other_name)
else:
old_name = this_name
new_name = other_name
if base_parent == other_parent:
old_parent = this_parent
new_parent = this_parent
old_dir = this_dir
new_dir = this_dir
else:
if this_parent != base_parent and this_parent != other_parent:
conflict_handler.move_conflict(entry.id, inventory)
else:
old_parent = this_parent
old_dir = this_dir
new_parent = other_parent
new_dir = other_dir
old_path = os.path.join(old_dir, old_name)
new_entry = changeset.ChangesetEntry(entry.id, old_parent, old_name)
if new_name is not None or new_parent is not None:
new_entry.new_path = os.path.join(new_dir, new_name)
else:
new_entry.new_path = None
new_entry.new_parent = new_parent
base_path = base.readonly_path(entry.id)
other_path = other.readonly_path(entry.id)
if entry.contents_change is not None:
new_entry.contents_change = changeset.Diff3Merge(base_path, other_path)
if entry.metadata_change is not None:
new_entry.metadata_change = PermissionsMerge(base_path, other_path)
return new_entry
class PermissionsMerge(object):
def __init__(self, base_path, other_path):
self.base_path = base_path
self.other_path = other_path
def apply(self, filename, conflict_handler, reverse=False):
if not reverse:
base = self.base_path
other = self.other_path
else:
base = self.other_path
other = self.base_path
base_stat = os.stat(base).st_mode
other_stat = os.stat(other).st_mode
this_stat = os.stat(filename).st_mode
if base_stat &0777 == other_stat &0777:
return
elif this_stat &0777 == other_stat &0777:
return
elif this_stat &0777 == base_stat &0777:
os.chmod(filename, other_stat)
else:
conflict_handler.permission_conflict(filename, base, other)
import unittest
import tempfile
import shutil
class MergeTree(object):
def __init__(self, dir):
self.dir = dir;
os.mkdir(dir)
self.inventory = {'0': ""}
def child_path(self, parent, name):
return os.path.join(self.inventory[parent], name)
def add_file(self, id, parent, name, contents, mode):
path = self.child_path(parent, name)
full_path = self.abs_path(path)
assert not os.path.exists(full_path)
file(full_path, "wb").write(contents)
os.chmod(self.abs_path(path), mode)
self.inventory[id] = path
def add_dir(self, id, parent, name, mode):
path = self.child_path(parent, name)
full_path = self.abs_path(path)
assert not os.path.exists(full_path)
os.mkdir(self.abs_path(path))
os.chmod(self.abs_path(path), mode)
self.inventory[id] = path
def abs_path(self, path):
return os.path.join(self.dir, path)
def full_path(self, id):
return self.abs_path(self.inventory[id])
def change_path(self, id, path):
new = os.path.join(self.dir, self.inventory[id])
os.rename(self.abs_path(self.inventory[id]), self.abs_path(path))
self.inventory[id] = path
class MergeBuilder(object):
def __init__(self):
self.dir = tempfile.mkdtemp(prefix="BaZing")
self.base = MergeTree(os.path.join(self.dir, "base"))
self.this = MergeTree(os.path.join(self.dir, "this"))
self.other = MergeTree(os.path.join(self.dir, "other"))
self.cset = changeset.Changeset()
self.cset.add_entry(changeset.ChangesetEntry("0",
changeset.NULL_ID, "./."))
def get_cset_path(self, parent, name):
if name is None:
assert (parent is None)
return None
return os.path.join(self.cset.entries[parent].path, name)
def add_file(self, id, parent, name, contents, mode):
self.base.add_file(id, parent, name, contents, mode)
self.this.add_file(id, parent, name, contents, mode)
self.other.add_file(id, parent, name, contents, mode)
path = self.get_cset_path(parent, name)
self.cset.add_entry(changeset.ChangesetEntry(id, parent, path))
def add_dir(self, id, parent, name, mode):
path = self.get_cset_path(parent, name)
self.base.add_dir(id, parent, name, mode)
self.cset.add_entry(changeset.ChangesetEntry(id, parent, path))
self.this.add_dir(id, parent, name, mode)
self.other.add_dir(id, parent, name, mode)
def change_name(self, id, base=None, this=None, other=None):
if base is not None:
self.change_name_tree(id, self.base, base)
self.cset.entries[id].name = base
if this is not None:
self.change_name_tree(id, self.this, this)
if other is not None:
self.change_name_tree(id, self.other, other)
self.cset.entries[id].new_name = other
def change_parent(self, id, base=None, this=None, other=None):
if base is not None:
self.change_parent_tree(id, self.base, base)
self.cset.entries[id].parent = base
self.cset.entries[id].dir = self.cset.entries[base].path
if this is not None:
self.change_parent_tree(id, self.this, this)
if other is not None:
self.change_parent_tree(id, self.other, other)
self.cset.entries[id].new_parent = other
self.cset.entries[id].new_dir = \
self.cset.entries[other].new_path
def change_contents(self, id, base=None, this=None, other=None):
if base is not None:
self.change_contents_tree(id, self.base, base)
if this is not None:
self.change_contents_tree(id, self.this, this)
if other is not None:
self.change_contents_tree(id, self.other, other)
if base is not None or other is not None:
old_contents = file(self.base.full_path(id)).read()
new_contents = file(self.other.full_path(id)).read()
contents = changeset.ReplaceFileContents(old_contents,
new_contents)
self.cset.entries[id].contents_change = contents
def change_perms(self, id, base=None, this=None, other=None):
if base is not None:
self.change_perms_tree(id, self.base, base)
if this is not None:
self.change_perms_tree(id, self.this, this)
if other is not None:
self.change_perms_tree(id, self.other, other)
if base is not None or other is not None:
old_perms = os.stat(self.base.full_path(id)).st_mode &077
new_perms = os.stat(self.other.full_path(id)).st_mode &077
contents = changeset.ChangeUnixPermissions(old_perms,
new_perms)
self.cset.entries[id].metadata_change = contents
def change_name_tree(self, id, tree, name):
new_path = tree.child_path(self.cset.entries[id].parent, name)
tree.change_path(id, new_path)
def change_parent_tree(self, id, tree, parent):
new_path = tree.child_path(parent, self.cset.entries[id].name)
tree.change_path(id, new_path)
def change_contents_tree(self, id, tree, contents):
path = tree.full_path(id)
mode = os.stat(path).st_mode
file(path, "w").write(contents)
os.chmod(path, mode)
def change_perms_tree(self, id, tree, mode):
os.chmod(tree.full_path(id), mode)
def merge_changeset(self):
all_inventory = ThreewayInventory(Inventory(self.this.inventory),
Inventory(self.base.inventory),
Inventory(self.other.inventory))
conflict_handler = changeset.ExceptionConflictHandler(self.this.dir)
return make_merge_changeset(self.cset, all_inventory, self.this.dir,
self.base.dir, self.other.dir,
conflict_handler)
def apply_changeset(self, cset, conflict_handler=None, reverse=False):
self.this.inventory = \
changeset.apply_changeset(cset, self.this.inventory,
self.this.dir, conflict_handler,
reverse)
def cleanup(self):
shutil.rmtree(self.dir)
class MergeTest(unittest.TestCase):
def test_change_name(self):
"""Test renames"""
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "hello1", 0755)
builder.change_name("1", other="name2")
builder.add_file("2", "0", "name3", "hello2", 0755)
builder.change_name("2", base="name4")
builder.add_file("3", "0", "name5", "hello3", 0755)
builder.change_name("3", this="name6")
cset = builder.merge_changeset()
assert(cset.entries["2"].is_boring())
assert(cset.entries["1"].name == "name1")
assert(cset.entries["1"].new_name == "name2")
assert(cset.entries["3"].is_boring())
for tree in (builder.this, builder.other, builder.base):
assert(tree.dir != builder.dir and
tree.dir.startswith(builder.dir))
for path in tree.inventory.itervalues():
fullpath = tree.abs_path(path)
assert(fullpath.startswith(tree.dir))
assert(not path.startswith(tree.dir))
assert os.path.exists(fullpath)
builder.apply_changeset(cset)
builder.cleanup()
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "hello1", 0644)
builder.change_name("1", other="name2", this="name3")
self.assertRaises(changeset.RenameConflict,
builder.merge_changeset)
builder.cleanup()
def test_file_moves(self):
"""Test moves"""
builder = MergeBuilder()
builder.add_dir("1", "0", "dir1", 0755)
builder.add_dir("2", "0", "dir2", 0755)
builder.add_file("3", "1", "file1", "hello1", 0644)
builder.add_file("4", "1", "file2", "hello2", 0644)
builder.add_file("5", "1", "file3", "hello3", 0644)
builder.change_parent("3", other="2")
assert(Inventory(builder.other.inventory).get_parent("3") == "2")
builder.change_parent("4", this="2")
assert(Inventory(builder.this.inventory).get_parent("4") == "2")
builder.change_parent("5", base="2")
assert(Inventory(builder.base.inventory).get_parent("5") == "2")
cset = builder.merge_changeset()
for id in ("1", "2", "4", "5"):
assert(cset.entries[id].is_boring())
assert(cset.entries["3"].parent == "1")
assert(cset.entries["3"].new_parent == "2")
builder.apply_changeset(cset)
builder.cleanup()
builder = MergeBuilder()
builder.add_dir("1", "0", "dir1", 0755)
builder.add_dir("2", "0", "dir2", 0755)
builder.add_dir("3", "0", "dir3", 0755)
builder.add_file("4", "1", "file1", "hello1", 0644)
builder.change_parent("4", other="2", this="3")
self.assertRaises(changeset.MoveConflict,
builder.merge_changeset)
builder.cleanup()
def test_contents_merge(self):
"""Test diff3 merging"""
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "text1", 0755)
builder.change_contents("1", other="text4")
builder.add_file("2", "0", "name3", "text2", 0655)
builder.change_contents("2", base="text5")
builder.add_file("3", "0", "name5", "text3", 0744)
builder.change_contents("3", this="text6")
cset = builder.merge_changeset()
assert(cset.entries["1"].contents_change is not None)
assert(isinstance(cset.entries["1"].contents_change,
changeset.Diff3Merge))
assert(isinstance(cset.entries["2"].contents_change,
changeset.Diff3Merge))
assert(cset.entries["3"].is_boring())
builder.apply_changeset(cset)
assert(file(builder.this.full_path("1"), "rb").read() == "text4" )
assert(file(builder.this.full_path("2"), "rb").read() == "text2" )
assert(os.stat(builder.this.full_path("1")).st_mode &0777 == 0755)
assert(os.stat(builder.this.full_path("2")).st_mode &0777 == 0655)
assert(os.stat(builder.this.full_path("3")).st_mode &0777 == 0744)
builder.cleanup()
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "text1", 0755)
builder.change_contents("1", other="text4", this="text3")
cset = builder.merge_changeset()
self.assertRaises(changeset.MergeConflict, builder.apply_changeset,
cset)
builder.cleanup()
def test_perms_merge(self):
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "text1", 0755)
builder.change_perms("1", other=0655)
builder.add_file("2", "0", "name2", "text2", 0755)
builder.change_perms("2", base=0655)
builder.add_file("3", "0", "name3", "text3", 0755)
builder.change_perms("3", this=0655)
cset = builder.merge_changeset()
assert(cset.entries["1"].metadata_change is not None)
assert(isinstance(cset.entries["1"].metadata_change,
PermissionsMerge))
assert(isinstance(cset.entries["2"].metadata_change,
PermissionsMerge))
assert(cset.entries["3"].is_boring())
builder.apply_changeset(cset)
assert(os.stat(builder.this.full_path("1")).st_mode &0777 == 0655)
assert(os.stat(builder.this.full_path("2")).st_mode &0777 == 0755)
assert(os.stat(builder.this.full_path("3")).st_mode &0777 == 0655)
builder.cleanup();
builder = MergeBuilder()
builder.add_file("1", "0", "name1", "text1", 0755)
builder.change_perms("1", other=0655, base=0555)
cset = builder.merge_changeset()
self.assertRaises(changeset.MergePermissionConflict,
builder.apply_changeset, cset)
builder.cleanup()
def test():
changeset_suite = unittest.makeSuite(MergeTest, 'test_')
runner = unittest.TextTestRunner()
runner.run(changeset_suite)
if __name__ == "__main__":
test()
|