To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 1185.12.49
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.12.49
- Committer: Aaron Bentley
- Date: 2005-10-18 18:48:27 UTC
- mto: (1185.25.1)
- mto: This revision was merged to the branch mainline in revision 1474.
- Revision ID: abentley@panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
Switched to ConfigObj
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
added
removed
bzrlib/changeset.py
17
17
import errno
18
18
import patch
19
19
import stat
20
from tempfile import mkdtemp
21
from shutil import rmtree
20
22
from bzrlib.trace import mutter
21
"""
22
Represent and apply a changeset
23
"""
23
from bzrlib.osutils import rename, sha_file
24
import bzrlib
25
from itertools import izip
26
27
# XXX: mbp: I'm not totally convinced that we should handle conflicts
28
# as part of changeset application, rather than only in the merge
29
# operation.
30
31
"""Represent and apply a changeset
32
33
Conflicts in applying a changeset are represented as exceptions.
34
"""
35
24
36
__docformat__ = "restructuredtext"
25
37
26
38
NULL_ID = "!NULL"
35
47
newdict[value] = key
36
48
return newdict
37
49
38
39
class PatchApply(object):
40
"""Patch application as a kind of content change"""
41
def __init__(self, contents):
42
"""Constructor.
43
44
:param contents: The text of the patch to apply
45
:type contents: str"""
46
self.contents = contents
47
48
def __eq__(self, other):
49
if not isinstance(other, PatchApply):
50
return False
51
elif self.contents != other.contents:
52
return False
53
else:
54
return True
55
56
def __ne__(self, other):
57
return not (self == other)
58
59
def apply(self, filename, conflict_handler, reverse=False):
60
"""Applies the patch to the specified file.
61
62
:param filename: the file to apply the patch to
63
:type filename: str
64
:param reverse: If true, apply the patch in reverse
65
:type reverse: bool
66
"""
67
input_name = filename+".orig"
68
try:
69
os.rename(filename, input_name)
70
except OSError, e:
71
if e.errno != errno.ENOENT:
72
raise
73
if conflict_handler.patch_target_missing(filename, self.contents)\
74
== "skip":
75
return
76
os.rename(filename, input_name)
77
78
79
status = patch.patch(self.contents, input_name, filename,
80
reverse)
81
os.chmod(filename, os.stat(input_name).st_mode)
82
if status == 0:
83
os.unlink(input_name)
84
elif status == 1:
85
conflict_handler.failed_hunks(filename)
86
87
88
class ChangeUnixPermissions(object):
50
51
class ChangeExecFlag(object):
89
52
"""This is two-way change, suitable for file modification, creation,
90
53
deletion"""
91
def __init__(self, old_mode, new_mode):
92
self.old_mode = old_mode
93
self.new_mode = new_mode
54
def __init__(self, old_exec_flag, new_exec_flag):
55
self.old_exec_flag = old_exec_flag
56
self.new_exec_flag = new_exec_flag
94
57
95
58
def apply(self, filename, conflict_handler, reverse=False):
96
59
if not reverse:
97
from_mode = self.old_mode
98
to_mode = self.new_mode
60
from_exec_flag = self.old_exec_flag
61
to_exec_flag = self.new_exec_flag
99
62
else:
100
from_mode = self.new_mode
101
to_mode = self.old_mode
63
from_exec_flag = self.new_exec_flag
64
to_exec_flag = self.old_exec_flag
102
65
try:
103
current_mode = os.stat(filename).st_mode &0777
66
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
104
67
except OSError, e:
105
68
if e.errno == errno.ENOENT:
106
if conflict_handler.missing_for_chmod(filename) == "skip":
69
if conflict_handler.missing_for_exec_flag(filename) == "skip":
107
70
return
108
71
else:
109
current_mode = from_mode
72
current_exec_flag = from_exec_flag
110
73
111
if from_mode is not None and current_mode != from_mode:
112
if conflict_handler.wrong_old_perms(filename, from_mode,
113
current_mode) != "continue":
74
if from_exec_flag is not None and current_exec_flag != from_exec_flag:
75
if conflict_handler.wrong_old_exec_flag(filename,
76
from_exec_flag, current_exec_flag) != "continue":
114
77
return
115
78
116
if to_mode is not None:
79
if to_exec_flag is not None:
80
current_mode = os.stat(filename).st_mode
81
if to_exec_flag:
82
umask = os.umask(0)
83
os.umask(umask)
84
to_mode = current_mode | (0100 & ~umask)
85
# Enable x-bit for others only if they can read it.
86
if current_mode & 0004:
87
to_mode |= 0001 & ~umask
88
if current_mode & 0040:
89
to_mode |= 0010 & ~umask
90
else:
91
to_mode = current_mode & ~0111
117
92
try:
118
93
os.chmod(filename, to_mode)
119
94
except IOError, e:
120
95
if e.errno == errno.ENOENT:
121
conflict_handler.missing_for_chmod(filename)
96
conflict_handler.missing_for_exec_flag(filename)
122
97
123
98
def __eq__(self, other):
124
if not isinstance(other, ChangeUnixPermissions):
125
return False
126
elif self.old_mode != other.old_mode:
127
return False
128
elif self.new_mode != other.new_mode:
129
return False
130
else:
131
return True
99
return (isinstance(other, ChangeExecFlag) and
100
self.old_exec_flag == other.old_exec_flag and
101
self.new_exec_flag == other.new_exec_flag)
132
102
133
103
def __ne__(self, other):
134
104
return not (self == other)
135
105
106
136
107
def dir_create(filename, conflict_handler, reverse):
137
108
"""Creates the directory, or deletes it if reverse is true. Intended to be
138
109
used with ReplaceContents.
158
129
try:
159
130
os.rmdir(filename)
160
131
except OSError, e:
161
if e.errno != 39:
132
if e.errno != errno.ENOTEMPTY:
162
133
raise
163
134
if conflict_handler.rmdir_non_empty(filename) == "skip":
164
135
return
165
136
os.rmdir(filename)
166
137
167
168
169
138
170
139
class SymlinkCreate(object):
171
140
"""Creates or deletes a symlink (for use with ReplaceContents)"""
177
146
"""
178
147
self.target = contents
179
148
149
def __repr__(self):
150
return "SymlinkCreate(%s)" % self.target
151
180
152
def __call__(self, filename, conflict_handler, reverse):
181
153
"""Creates or destroys the symlink.
182
154
264
236
265
237
266
238
239
class TreeFileCreate(object):
240
"""Create or delete a file (for use with ReplaceContents)"""
241
def __init__(self, tree, file_id):
242
"""Constructor
243
244
:param contents: The contents of the file to write
245
:type contents: str
246
"""
247
self.tree = tree
248
self.file_id = file_id
249
250
def __repr__(self):
251
return "TreeFileCreate(%s)" % self.file_id
252
253
def __eq__(self, other):
254
if not isinstance(other, TreeFileCreate):
255
return False
256
return self.tree.get_file_sha1(self.file_id) == \
257
other.tree.get_file_sha1(other.file_id)
258
259
def __ne__(self, other):
260
return not (self == other)
261
262
def write_file(self, filename):
263
outfile = file(filename, "wb")
264
for line in self.tree.get_file(self.file_id):
265
outfile.write(line)
266
267
def same_text(self, filename):
268
in_file = file(filename, "rb")
269
return sha_file(in_file) == self.tree.get_file_sha1(self.file_id)
270
271
def __call__(self, filename, conflict_handler, reverse):
272
"""Create or delete a file
273
274
:param filename: The name of the file to create
275
:type filename: str
276
:param reverse: Delete the file instead of creating it
277
:type reverse: bool
278
"""
279
if not reverse:
280
try:
281
self.write_file(filename)
282
except IOError, e:
283
if e.errno == errno.ENOENT:
284
if conflict_handler.missing_parent(filename)=="continue":
285
self.write_file(filename)
286
else:
287
raise
288
289
else:
290
try:
291
if not self.same_text(filename):
292
direction = conflict_handler.wrong_old_contents(filename,
293
self.tree.get_file(self.file_id).read())
294
if direction != "continue":
295
return
296
os.unlink(filename)
297
except IOError, e:
298
if e.errno != errno.ENOENT:
299
raise
300
if conflict_handler.missing_for_rm(filename, undo) == "skip":
301
return
302
303
304
267
305
def reversed(sequence):
268
306
max = len(sequence) - 1
269
307
for i in range(len(sequence)):
336
374
if mode is not None:
337
375
os.chmod(filename, mode)
338
376
377
def is_creation(self):
378
return self.new_contents is not None and self.old_contents is None
379
380
def is_deletion(self):
381
return self.old_contents is not None and self.new_contents is None
382
339
383
class ApplySequence(object):
340
384
def __init__(self, changes=None):
341
385
self.changes = []
367
411
368
412
369
413
class Diff3Merge(object):
370
def __init__(self, base_file, other_file):
371
self.base_file = base_file
372
self.other_file = other_file
414
def __init__(self, file_id, base, other):
415
self.file_id = file_id
416
self.base = base
417
self.other = other
418
419
def is_creation(self):
420
return False
421
422
def is_deletion(self):
423
return False
373
424
374
425
def __eq__(self, other):
375
426
if not isinstance(other, Diff3Merge):
376
427
return False
377
return (self.base_file == other.base_file and
378
self.other_file == other.other_file)
428
return (self.base == other.base and
429
self.other == other.other and self.file_id == other.file_id)
379
430
380
431
def __ne__(self, other):
381
432
return not (self == other)
382
433
434
def dump_file(self, temp_dir, name, tree):
435
out_path = os.path.join(temp_dir, name)
436
out_file = file(out_path, "wb")
437
in_file = tree.get_file(self.file_id)
438
for line in in_file:
439
out_file.write(line)
440
return out_path
441
383
442
def apply(self, filename, conflict_handler, reverse=False):
384
new_file = filename+".new"
385
if not reverse:
386
base = self.base_file
387
other = self.other_file
388
else:
389
base = self.other_file
390
other = self.base_file
391
status = patch.diff3(new_file, filename, base, other)
392
if status == 0:
393
os.chmod(new_file, os.stat(filename).st_mode)
394
os.rename(new_file, filename)
395
return
396
else:
397
assert(status == 1)
398
conflict_handler.merge_conflict(new_file, filename, base, other)
443
temp_dir = mkdtemp(prefix="bzr-")
444
try:
445
new_file = filename+".new"
446
base_file = self.dump_file(temp_dir, "base", self.base)
447
other_file = self.dump_file(temp_dir, "other", self.other)
448
if not reverse:
449
base = base_file
450
other = other_file
451
else:
452
base = other_file
453
other = base_file
454
status = patch.diff3(new_file, filename, base, other)
455
if status == 0:
456
os.chmod(new_file, os.stat(filename).st_mode)
457
rename(new_file, filename)
458
return
459
else:
460
assert(status == 1)
461
def get_lines(filename):
462
my_file = file(filename, "rb")
463
lines = my_file.readlines()
464
my_file.close()
465
return lines
466
base_lines = get_lines(base)
467
other_lines = get_lines(other)
468
conflict_handler.merge_conflict(new_file, filename, base_lines,
469
other_lines)
470
finally:
471
rmtree(temp_dir)
399
472
400
473
401
474
def CreateDir():
434
507
"""
435
508
return ReplaceContents(FileCreate(contents), None)
436
509
437
def ReplaceFileContents(old_contents, new_contents):
510
def ReplaceFileContents(old_tree, new_tree, file_id):
438
511
"""Convenience fucntion to replace the contents of a file.
439
512
440
513
:param old_contents: The contents of the file to replace
444
517
:return: A ReplaceContents that will replace the contents of a file a file
445
518
:rtype: `ReplaceContents`
446
519
"""
447
return ReplaceContents(FileCreate(old_contents), FileCreate(new_contents))
520
return ReplaceContents(TreeFileCreate(old_tree, file_id),
521
TreeFileCreate(new_tree, file_id))
448
522
449
523
def CreateSymlink(target):
450
524
"""Convenience fucntion to create a symlink.
613
687
:param reverse: if true, the changeset is being applied in reverse
614
688
:rtype: bool
615
689
"""
616
return ((self.new_parent is None and not reverse) or
617
(self.parent is None and reverse))
690
return self.is_creation(not reverse)
618
691
619
692
def is_creation(self, reverse):
620
693
"""Return true if applying the entry would create a file/directory.
622
695
:param reverse: if true, the changeset is being applied in reverse
623
696
:rtype: bool
624
697
"""
625
return ((self.parent is None and not reverse) or
626
(self.new_parent is None and reverse))
698
if self.contents_change is None:
699
return False
700
if reverse:
701
return self.contents_change.is_deletion()
702
else:
703
return self.contents_change.is_creation()
627
704
628
705
def is_creation_or_deletion(self):
629
706
"""Return true if applying the entry would create or delete a
631
708
632
709
:rtype: bool
633
710
"""
634
return self.parent is None or self.new_parent is None
711
return self.is_creation(False) or self.is_deletion(False)
635
712
636
713
def get_cset_path(self, mod=False):
637
714
"""Determine the path of the entry according to the changeset.
657
734
return None
658
735
return self.path
659
736
660
def summarize_name(self, changeset, reverse=False):
737
def summarize_name(self, reverse=False):
661
738
"""Produce a one-line summary of the filename. Indicates renames as
662
739
old => new, indicates creation as None => new, indicates deletion as
663
740
old => None.
694
771
:type reverse: bool
695
772
:rtype: str
696
773
"""
697
mutter("Finding new path for %s" % self.summarize_name(changeset))
774
mutter("Finding new path for %s" % self.summarize_name())
698
775
if reverse:
699
776
parent = self.parent
700
777
to_dir = self.dir
809
886
:rtype: (List, List)
810
887
"""
811
888
source_entries = [x for x in changeset.entries.itervalues()
812
if x.needs_rename()]
889
if x.needs_rename() or x.is_creation_or_deletion()]
813
890
# these are done from longest path to shortest, to avoid deleting a
814
891
# parent before its children are deleted/renamed
815
892
def longest_to_shortest(entry):
856
933
entry.apply(path, conflict_handler, reverse)
857
934
temp_name[entry.id] = None
858
935
859
else:
936
elif entry.needs_rename():
860
937
to_name = os.path.join(temp_dir, str(i))
861
938
src_path = inventory.get(entry.id)
862
939
if src_path is not None:
863
940
src_path = os.path.join(dir, src_path)
864
941
try:
865
os.rename(src_path, to_name)
942
rename(src_path, to_name)
866
943
temp_name[entry.id] = to_name
867
944
except OSError, e:
868
945
if e.errno != errno.ENOENT:
869
946
raise
870
if conflict_handler.missing_for_rename(src_path) == "skip":
947
if conflict_handler.missing_for_rename(src_path, to_name) \
948
== "skip":
871
949
continue
872
950
873
951
return temp_name
894
972
continue
895
973
new_path = os.path.join(dir, new_tree_path)
896
974
old_path = changed_inventory.get(entry.id)
897
if os.path.exists(new_path):
975
if bzrlib.osutils.lexists(new_path):
898
976
if conflict_handler.target_exists(entry, new_path, old_path) == \
899
977
"skip":
900
978
continue
901
979
if entry.is_creation(reverse):
902
980
entry.apply(new_path, conflict_handler, reverse)
903
981
changed_inventory[entry.id] = new_tree_path
904
else:
982
elif entry.needs_rename():
905
983
if old_path is None:
906
984
continue
907
985
try:
908
os.rename(old_path, new_path)
986
rename(old_path, new_path)
909
987
changed_inventory[entry.id] = new_tree_path
910
988
except OSError, e:
911
989
raise Exception ("%s is missing" % new_path)
946
1024
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
947
1025
self.this_path = this_path
948
1026
949
class MergePermissionConflict(Exception):
950
def __init__(self, this_path, base_path, other_path):
951
this_perms = os.stat(this_path).st_mode & 0755
952
base_perms = os.stat(base_path).st_mode & 0755
953
other_perms = os.stat(other_path).st_mode & 0755
954
msg = """Conflicting permission for %s
955
this: %o
956
base: %o
957
other: %o
958
""" % (this_path, this_perms, base_perms, other_perms)
959
self.this_path = this_path
960
self.base_path = base_path
961
self.other_path = other_path
962
Exception.__init__(self, msg)
963
964
1027
class WrongOldContents(Exception):
965
1028
def __init__(self, filename):
966
1029
msg = "Contents mismatch deleting %s" % filename
967
1030
self.filename = filename
968
1031
Exception.__init__(self, msg)
969
1032
970
class WrongOldPermissions(Exception):
971
def __init__(self, filename, old_perms, new_perms):
972
msg = "Permission missmatch on %s:\n" \
973
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
1033
class WrongOldExecFlag(Exception):
1034
def __init__(self, filename, old_exec_flag, new_exec_flag):
1035
msg = "Executable flag missmatch on %s:\n" \
1036
"Expected %s, got %s." % (filename, old_exec_flag, new_exec_flag)
974
1037
self.filename = filename
975
1038
Exception.__init__(self, msg)
976
1039
994
1057
Exception.__init__(self, msg)
995
1058
self.filename = filename
996
1059
997
class MissingPermsFile(Exception):
1060
class MissingForSetExec(Exception):
998
1061
def __init__(self, filename):
999
1062
msg = "Attempt to change permissions on %s, which does not exist" %\
1000
1063
filename
1009
1072
1010
1073
1011
1074
class MissingForRename(Exception):
1012
def __init__(self, filename):
1013
msg = "Attempt to move missing path %s" % (filename)
1075
def __init__(self, filename, to_path):
1076
msg = "Attempt to move missing path %s to %s" % (filename, to_path)
1014
1077
Exception.__init__(self, msg)
1015
1078
self.filename = filename
1016
1079
1019
1082
msg = "Conflicting contents for new file %s" % (filename)
1020
1083
Exception.__init__(self, msg)
1021
1084
1085
class ThreewayContentsConflict(Exception):
1086
def __init__(self, filename):
1087
msg = "Conflicting contents for file %s" % (filename)
1088
Exception.__init__(self, msg)
1089
1022
1090
1023
1091
class MissingForMerge(Exception):
1024
1092
def __init__(self, filename):
1028
1096
1029
1097
1030
1098
class ExceptionConflictHandler(object):
1031
def __init__(self, dir):
1032
self.dir = dir
1033
1099
"""Default handler for merge exceptions.
1100
1101
This throws an error on any kind of conflict. Conflict handlers can
1102
descend from this class if they have a better way to handle some or
1103
all types of conflict.
1104
"""
1034
1105
def missing_parent(self, pathname):
1035
1106
parent = os.path.dirname(pathname)
1036
1107
raise Exception("Parent directory missing for %s" % pathname)
1047
1118
def rename_conflict(self, id, this_name, base_name, other_name):
1048
1119
raise RenameConflict(id, this_name, base_name, other_name)
1049
1120
1050
def move_conflict(self, id, inventory):
1051
this_dir = inventory.this.get_dir(id)
1052
base_dir = inventory.base.get_dir(id)
1053
other_dir = inventory.other.get_dir(id)
1121
def move_conflict(self, id, this_dir, base_dir, other_dir):
1054
1122
raise MoveConflict(id, this_dir, base_dir, other_dir)
1055
1123
1056
def merge_conflict(self, new_file, this_path, base_path, other_path):
1124
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1057
1125
os.unlink(new_file)
1058
1126
raise MergeConflict(this_path)
1059
1127
1060
def permission_conflict(self, this_path, base_path, other_path):
1061
raise MergePermissionConflict(this_path, base_path, other_path)
1062
1063
1128
def wrong_old_contents(self, filename, expected_contents):
1064
1129
raise WrongOldContents(filename)
1065
1130
1066
1131
def rem_contents_conflict(self, filename, this_contents, base_contents):
1067
1132
raise RemoveContentsConflict(filename)
1068
1133
1069
def wrong_old_perms(self, filename, old_perms, new_perms):
1070
raise WrongOldPermissions(filename, old_perms, new_perms)
1134
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1135
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1071
1136
1072
1137
def rmdir_non_empty(self, filename):
1073
1138
raise DeletingNonEmptyDirectory(filename)
1078
1143
def patch_target_missing(self, filename, contents):
1079
1144
raise PatchTargetMissing(filename)
1080
1145
1081
def missing_for_chmod(self, filename):
1082
raise MissingPermsFile(filename)
1146
def missing_for_exec_flag(self, filename):
1147
raise MissingForExecFlag(filename)
1083
1148
1084
1149
def missing_for_rm(self, filename, change):
1085
1150
raise MissingForRm(filename)
1086
1151
1087
def missing_for_rename(self, filename):
1088
raise MissingForRename(filename)
1152
def missing_for_rename(self, filename, to_path):
1153
raise MissingForRename(filename, to_path)
1089
1154
1090
def missing_for_merge(self, file_id, inventory):
1091
raise MissingForMerge(inventory.other.get_path(file_id))
1155
def missing_for_merge(self, file_id, other_path):
1156
raise MissingForMerge(other_path)
1092
1157
1093
1158
def new_contents_conflict(self, filename, other_contents):
1094
1159
raise NewContentsConflict(filename)
1095
1160
1096
def finalize():
1161
def threeway_contents_conflict(self, filename, this_contents,
1162
base_contents, other_contents):
1163
raise ThreewayContentsConflict(filename)
1164
1165
def finalize(self):
1097
1166
pass
1098
1167
1099
1168
def apply_changeset(changeset, inventory, dir, conflict_handler=None,
1112
1181
:rtype: Dictionary
1113
1182
"""
1114
1183
if conflict_handler is None:
1115
conflict_handler = ExceptionConflictHandler(dir)
1184
conflict_handler = ExceptionConflictHandler()
1116
1185
temp_dir = os.path.join(dir, "bzr-tree-change")
1117
1186
try:
1118
1187
os.mkdir(temp_dir)
1129
1198
1130
1199
#apply changes that don't affect filenames
1131
1200
for entry in changeset.entries.itervalues():
1132
if not entry.is_creation_or_deletion():
1201
if not entry.is_creation_or_deletion() and not entry.is_boring():
1133
1202
path = os.path.join(dir, inventory[entry.id])
1134
1203
entry.apply(path, conflict_handler, reverse)
1135
1204
1154
1223
r_inventory = {}
1155
1224
for entry in tree.source_inventory().itervalues():
1156
1225
inventory[entry.id] = entry.path
1157
new_inventory = apply_changeset(cset, r_inventory, tree.root,
1226
new_inventory = apply_changeset(cset, r_inventory, tree.basedir,
1158
1227
reverse=reverse)
1159
1228
new_entries, remove_entries = \
1160
1229
get_inventory_change(inventory, new_inventory, cset, reverse)
1295
1364
return new_meta
1296
1365
elif new_meta is None:
1297
1366
return old_meta
1298
elif isinstance(old_meta, ChangeUnixPermissions) and \
1299
isinstance(new_meta, ChangeUnixPermissions):
1300
return ChangeUnixPermissions(old_meta.old_mode, new_meta.new_mode)
1367
elif (isinstance(old_meta, ChangeExecFlag) and
1368
isinstance(new_meta, ChangeExecFlag)):
1369
return ChangeExecFlag(old_meta.old_exec_flag, new_meta.new_exec_flag)
1301
1370
else:
1302
1371
return ApplySequence(old_meta, new_meta)
1303
1372
1308
1377
return False
1309
1378
return True
1310
1379
1311
class UnsuppportedFiletype(Exception):
1312
def __init__(self, full_path, stat_result):
1313
msg = "The file \"%s\" is not a supported filetype." % full_path
1380
class UnsupportedFiletype(Exception):
1381
def __init__(self, kind, full_path):
1382
msg = "The file \"%s\" is a %s, which is not a supported filetype." \
1383
% (full_path, kind)
1314
1384
Exception.__init__(self, msg)
1315
1385
self.full_path = full_path
1316
self.stat_result = stat_result
1317
1318
def generate_changeset(tree_a, tree_b, inventory_a=None, inventory_b=None):
1319
return ChangesetGenerator(tree_a, tree_b, inventory_a, inventory_b)()
1386
self.kind = kind
1387
1388
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1389
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1390
1320
1391
1321
1392
class ChangesetGenerator(object):
1322
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1393
def __init__(self, tree_a, tree_b, interesting_ids=None):
1323
1394
object.__init__(self)
1324
1395
self.tree_a = tree_a
1325
1396
self.tree_b = tree_b
1326
if inventory_a is not None:
1327
self.inventory_a = inventory_a
1328
else:
1329
self.inventory_a = tree_a.inventory()
1330
if inventory_b is not None:
1331
self.inventory_b = inventory_b
1332
else:
1333
self.inventory_b = tree_b.inventory()
1334
self.r_inventory_a = self.reverse_inventory(self.inventory_a)
1335
self.r_inventory_b = self.reverse_inventory(self.inventory_b)
1397
self._interesting_ids = interesting_ids
1336
1398
1337
def reverse_inventory(self, inventory):
1338
r_inventory = {}
1339
for entry in inventory.itervalues():
1340
if entry.id is None:
1341
continue
1342
r_inventory[entry.id] = entry
1343
return r_inventory
1399
def iter_both_tree_ids(self):
1400
for file_id in self.tree_a:
1401
yield file_id
1402
for file_id in self.tree_b:
1403
if file_id not in self.tree_a:
1404
yield file_id
1344
1405
1345
1406
def __call__(self):
1346
1407
cset = Changeset()
1347
for entry in self.inventory_a.itervalues():
1348
if entry.id is None:
1349
continue
1350
cs_entry = self.make_entry(entry.id)
1408
for file_id in self.iter_both_tree_ids():
1409
cs_entry = self.make_entry(file_id)
1351
1410
if cs_entry is not None and not cs_entry.is_boring():
1352
1411
cset.add_entry(cs_entry)
1353
1412
1354
for entry in self.inventory_b.itervalues():
1355
if entry.id is None:
1356
continue
1357
if not self.r_inventory_a.has_key(entry.id):
1358
cs_entry = self.make_entry(entry.id)
1359
if cs_entry is not None and not cs_entry.is_boring():
1360
cset.add_entry(cs_entry)
1361
1413
for entry in list(cset.entries.itervalues()):
1362
1414
if entry.parent != entry.new_parent:
1363
1415
if not cset.entries.has_key(entry.parent) and\
1371
1423
cset.add_entry(parent_entry)
1372
1424
return cset
1373
1425
1374
def get_entry_parent(self, entry, inventory):
1375
if entry is None:
1376
return None
1377
if entry.path == "./.":
1378
return NULL_ID
1379
dirname = os.path.dirname(entry.path)
1380
if dirname == ".":
1381
dirname = "./."
1382
parent = inventory[dirname]
1383
return parent.id
1384
1385
def get_paths(self, entry, tree):
1386
if entry is None:
1387
return (None, None)
1388
full_path = tree.readonly_path(entry.id)
1389
if entry.path == ".":
1390
return ("", full_path)
1391
return (entry.path, full_path)
1392
1393
def make_basic_entry(self, id, only_interesting):
1394
entry_a = self.r_inventory_a.get(id)
1395
entry_b = self.r_inventory_b.get(id)
1426
def iter_inventory(self, tree):
1427
for file_id in tree:
1428
yield self.get_entry(file_id, tree)
1429
1430
def get_entry(self, file_id, tree):
1431
if not tree.has_or_had_id(file_id):
1432
return None
1433
return tree.inventory[file_id]
1434
1435
def get_entry_parent(self, entry):
1436
if entry is None:
1437
return None
1438
return entry.parent_id
1439
1440
def get_path(self, file_id, tree):
1441
if not tree.has_or_had_id(file_id):
1442
return None
1443
path = tree.id2path(file_id)
1444
if path == '':
1445
return './.'
1446
else:
1447
return path
1448
1449
def make_basic_entry(self, file_id, only_interesting):
1450
entry_a = self.get_entry(file_id, self.tree_a)
1451
entry_b = self.get_entry(file_id, self.tree_b)
1396
1452
if only_interesting and not self.is_interesting(entry_a, entry_b):
1397
return (None, None, None)
1398
parent = self.get_entry_parent(entry_a, self.inventory_a)
1399
(path, full_path_a) = self.get_paths(entry_a, self.tree_a)
1400
cs_entry = ChangesetEntry(id, parent, path)
1401
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1402
1403
1404
(new_path, full_path_b) = self.get_paths(entry_b, self.tree_b)
1453
return None
1454
parent = self.get_entry_parent(entry_a)
1455
path = self.get_path(file_id, self.tree_a)
1456
cs_entry = ChangesetEntry(file_id, parent, path)
1457
new_parent = self.get_entry_parent(entry_b)
1458
1459
new_path = self.get_path(file_id, self.tree_b)
1405
1460
1406
1461
cs_entry.new_path = new_path
1407
1462
cs_entry.new_parent = new_parent
1408
return (cs_entry, full_path_a, full_path_b)
1463
return cs_entry
1409
1464
1410
1465
def is_interesting(self, entry_a, entry_b):
1466
if self._interesting_ids is None:
1467
return True
1411
1468
if entry_a is not None:
1412
if entry_a.interesting:
1413
return True
1414
if entry_b is not None:
1415
if entry_b.interesting:
1416
return True
1417
return False
1469
file_id = entry_a.file_id
1470
elif entry_b is not None:
1471
file_id = entry_b.file_id
1472
else:
1473
return False
1474
return file_id in self._interesting_ids
1418
1475
1419
1476
def make_boring_entry(self, id):
1420
(cs_entry, full_path_a, full_path_b) = \
1421
self.make_basic_entry(id, only_interesting=False)
1477
cs_entry = self.make_basic_entry(id, only_interesting=False)
1422
1478
if cs_entry.is_creation_or_deletion():
1423
1479
return self.make_entry(id, only_interesting=False)
1424
1480
else:
1426
1482
1427
1483
1428
1484
def make_entry(self, id, only_interesting=True):
1429
(cs_entry, full_path_a, full_path_b) = \
1430
self.make_basic_entry(id, only_interesting)
1485
cs_entry = self.make_basic_entry(id, only_interesting)
1431
1486
1432
1487
if cs_entry is None:
1433
1488
return None
1434
1435
stat_a = self.lstat(full_path_a)
1436
stat_b = self.lstat(full_path_b)
1437
if stat_b is None:
1438
cs_entry.new_parent = None
1439
cs_entry.new_path = None
1440
1441
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1442
cs_entry.contents_change = self.make_contents_change(full_path_a,
1443
stat_a,
1444
full_path_b,
1445
stat_b)
1489
1490
cs_entry.metadata_change = self.make_exec_flag_change(id)
1491
1492
if id in self.tree_a and id in self.tree_b:
1493
a_sha1 = self.tree_a.get_file_sha1(id)
1494
b_sha1 = self.tree_b.get_file_sha1(id)
1495
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1496
return cs_entry
1497
1498
cs_entry.contents_change = self.make_contents_change(id)
1446
1499
return cs_entry
1447
1500
1448
def make_mode_change(self, stat_a, stat_b):
1449
mode_a = None
1450
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1451
mode_a = stat_a.st_mode & 0777
1452
mode_b = None
1453
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1454
mode_b = stat_b.st_mode & 0777
1455
if mode_a == mode_b:
1456
return None
1457
return ChangeUnixPermissions(mode_a, mode_b)
1458
1459
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1460
if stat_a is None and stat_b is None:
1461
return None
1462
if None not in (stat_a, stat_b) and stat.S_ISDIR(stat_a.st_mode) and\
1463
stat.S_ISDIR(stat_b.st_mode):
1464
return None
1465
if None not in (stat_a, stat_b) and stat.S_ISREG(stat_a.st_mode) and\
1466
stat.S_ISREG(stat_b.st_mode):
1467
if stat_a.st_ino == stat_b.st_ino and \
1468
stat_a.st_dev == stat_b.st_dev:
1469
return None
1470
if file(full_path_a, "rb").read() == \
1471
file(full_path_b, "rb").read():
1472
return None
1473
1474
patch_contents = patch.diff(full_path_a,
1475
file(full_path_b, "rb").read())
1476
if patch_contents is None:
1477
return None
1478
return PatchApply(patch_contents)
1479
1480
a_contents = self.get_contents(stat_a, full_path_a)
1481
b_contents = self.get_contents(stat_b, full_path_b)
1501
def make_exec_flag_change(self, file_id):
1502
exec_flag_a = exec_flag_b = None
1503
if file_id in self.tree_a and self.tree_a.kind(file_id) == "file":
1504
exec_flag_a = self.tree_a.is_executable(file_id)
1505
1506
if file_id in self.tree_b and self.tree_b.kind(file_id) == "file":
1507
exec_flag_b = self.tree_b.is_executable(file_id)
1508
1509
if exec_flag_a == exec_flag_b:
1510
return None
1511
return ChangeExecFlag(exec_flag_a, exec_flag_b)
1512
1513
def make_contents_change(self, file_id):
1514
a_contents = get_contents(self.tree_a, file_id)
1515
b_contents = get_contents(self.tree_b, file_id)
1482
1516
if a_contents == b_contents:
1483
1517
return None
1484
1518
return ReplaceContents(a_contents, b_contents)
1485
1519
1486
def get_contents(self, stat_result, full_path):
1487
if stat_result is None:
1488
return None
1489
elif stat.S_ISREG(stat_result.st_mode):
1490
return FileCreate(file(full_path, "rb").read())
1491
elif stat.S_ISDIR(stat_result.st_mode):
1492
return dir_create
1493
elif stat.S_ISLNK(stat_result.st_mode):
1494
return SymlinkCreate(os.readlink(full_path))
1495
else:
1496
raise UnsupportedFiletype(full_path, stat_result)
1497
1520
1498
def lstat(self, full_path):
1499
stat_result = None
1500
if full_path is not None:
1501
try:
1502
stat_result = os.lstat(full_path)
1503
except OSError, e:
1504
if e.errno != errno.ENOENT:
1505
raise
1506
return stat_result
1521
def get_contents(tree, file_id):
1522
"""Return the appropriate contents to create a copy of file_id from tree"""
1523
if file_id not in tree:
1524
return None
1525
kind = tree.kind(file_id)
1526
if kind == "file":
1527
return TreeFileCreate(tree, file_id)
1528
elif kind in ("directory", "root_directory"):
1529
return dir_create
1530
elif kind == "symlink":
1531
return SymlinkCreate(tree.get_symlink_target(file_id))
1532
else:
1533
raise UnsupportedFiletype(kind, tree.id2path(file_id))
1507
1534
1508
1535
1509
1536
def full_path(entry, tree):
1510
return os.path.join(tree.root, entry.path)
1537
return os.path.join(tree.basedir, entry.path)
1511
1538
1512
1539
def new_delete_entry(entry, tree, inventory, delete):
1513
1540
if entry.path == "":
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0