« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 1185.33.36
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.33.36
- Committer: Martin Pool
- Date: 2005-11-22 04:30:14 UTC
- mto: (1508.1.15) (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1510.
- Revision ID: mbp@sourcefrog.net-20051122043014-6df209fd93033b59
Exclude more files from dumb-rsync upload
- files added:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files removed:
- bzrlib/mdiff.py
- files renamed:
- bzrlib/store.py => bzrlib/store/__init__.py
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- contrib/bash/bzr => contrib/bash/bzr.simple
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/changeset.py
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
"""Represent and apply a changeset.
18
19
Conflicts in applying a changeset are represented as exceptions.
20
21
This only handles the in-memory objects representing changesets, which are
22
primarily used by the merge code.
23
"""
24
16
25
import os.path
17
26
import errno
18
import patch
19
27
import stat
20
"""
21
Represent and apply a changeset
22
"""
28
from tempfile import mkdtemp
29
from shutil import rmtree
30
from itertools import izip
31
32
from bzrlib.trace import mutter, warning
33
from bzrlib.osutils import rename, sha_file
34
import bzrlib
35
23
36
__docformat__ = "restructuredtext"
24
37
25
38
NULL_ID = "!NULL"
26
39
27
40
class OldFailedTreeOp(Exception):
41
def __init__(self):
42
Exception.__init__(self, "bzr-tree-change contains files from a"
43
" previous failed merge operation.")
28
44
def invert_dict(dict):
29
45
newdict = {}
30
46
for (key,value) in dict.iteritems():
31
47
newdict[value] = key
32
48
return newdict
33
49
34
35
class PatchApply:
36
"""Patch application as a kind of content change"""
37
def __init__(self, contents):
38
"""Constructor.
39
40
:param contents: The text of the patch to apply
41
:type contents: str"""
42
self.contents = contents
43
44
def __eq__(self, other):
45
if not isinstance(other, PatchApply):
46
return False
47
elif self.contents != other.contents:
48
return False
49
else:
50
return True
51
52
def __ne__(self, other):
53
return not (self == other)
54
55
def apply(self, filename, conflict_handler, reverse=False):
56
"""Applies the patch to the specified file.
57
58
:param filename: the file to apply the patch to
59
:type filename: str
60
:param reverse: If true, apply the patch in reverse
61
:type reverse: bool
62
"""
63
input_name = filename+".orig"
64
try:
65
os.rename(filename, input_name)
66
except OSError, e:
67
if e.errno != errno.ENOENT:
68
raise
69
if conflict_handler.patch_target_missing(filename, self.contents)\
70
== "skip":
71
return
72
os.rename(filename, input_name)
73
74
75
status = patch.patch(self.contents, input_name, filename,
76
reverse)
77
os.chmod(filename, os.stat(input_name).st_mode)
78
if status == 0:
79
os.unlink(input_name)
80
elif status == 1:
81
conflict_handler.failed_hunks(filename)
82
83
84
class ChangeUnixPermissions:
50
51
class ChangeExecFlag(object):
85
52
"""This is two-way change, suitable for file modification, creation,
86
53
deletion"""
87
def __init__(self, old_mode, new_mode):
88
self.old_mode = old_mode
89
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
90
57
91
58
def apply(self, filename, conflict_handler, reverse=False):
92
59
if not reverse:
93
from_mode = self.old_mode
94
to_mode = self.new_mode
60
from_exec_flag = self.old_exec_flag
61
to_exec_flag = self.new_exec_flag
95
62
else:
96
from_mode = self.new_mode
97
to_mode = self.old_mode
63
from_exec_flag = self.new_exec_flag
64
to_exec_flag = self.old_exec_flag
98
65
try:
99
current_mode = os.stat(filename).st_mode &0777
66
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
100
67
except OSError, e:
101
68
if e.errno == errno.ENOENT:
102
if conflict_handler.missing_for_chmod(filename) == "skip":
69
if conflict_handler.missing_for_exec_flag(filename) == "skip":
103
70
return
104
71
else:
105
current_mode = from_mode
72
current_exec_flag = from_exec_flag
106
73
107
if from_mode is not None and current_mode != from_mode:
108
if conflict_handler.wrong_old_perms(filename, from_mode,
109
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":
110
77
return
111
78
112
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
113
92
try:
114
93
os.chmod(filename, to_mode)
115
94
except IOError, e:
116
95
if e.errno == errno.ENOENT:
117
conflict_handler.missing_for_chmod(filename)
96
conflict_handler.missing_for_exec_flag(filename)
118
97
119
98
def __eq__(self, other):
120
if not isinstance(other, ChangeUnixPermissions):
121
return False
122
elif self.old_mode != other.old_mode:
123
return False
124
elif self.new_mode != other.new_mode:
125
return False
126
else:
127
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)
128
102
129
103
def __ne__(self, other):
130
104
return not (self == other)
131
105
106
132
107
def dir_create(filename, conflict_handler, reverse):
133
108
"""Creates the directory, or deletes it if reverse is true. Intended to be
134
109
used with ReplaceContents.
154
129
try:
155
130
os.rmdir(filename)
156
131
except OSError, e:
157
if e.errno != 39:
132
if e.errno != errno.ENOTEMPTY:
158
133
raise
159
134
if conflict_handler.rmdir_non_empty(filename) == "skip":
160
135
return
161
136
os.rmdir(filename)
162
137
163
164
165
138
166
class SymlinkCreate:
139
class SymlinkCreate(object):
167
140
"""Creates or deletes a symlink (for use with ReplaceContents)"""
168
141
def __init__(self, contents):
169
142
"""Constructor.
173
146
"""
174
147
self.target = contents
175
148
149
def __repr__(self):
150
return "SymlinkCreate(%s)" % self.target
151
176
152
def __call__(self, filename, conflict_handler, reverse):
177
153
"""Creates or destroys the symlink.
178
154
202
178
def __ne__(self, other):
203
179
return not (self == other)
204
180
205
class FileCreate:
181
class FileCreate(object):
206
182
"""Create or delete a file (for use with ReplaceContents)"""
207
183
def __init__(self, contents):
208
184
"""Constructor
260
236
261
237
262
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
263
305
def reversed(sequence):
264
306
max = len(sequence) - 1
265
307
for i in range(len(sequence)):
266
308
yield sequence[max - i]
267
309
268
class ReplaceContents:
310
class ReplaceContents(object):
269
311
"""A contents-replacement framework. It allows a file/directory/symlink to
270
312
be created, deleted, or replaced with another file/directory/symlink.
271
313
Arguments must be callable with (filename, reverse).
332
374
if mode is not None:
333
375
os.chmod(filename, mode)
334
376
335
class ApplySequence:
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
383
class ApplySequence(object):
336
384
def __init__(self, changes=None):
337
385
self.changes = []
338
386
if changes is not None:
362
410
change.apply(filename, conflict_handler, reverse)
363
411
364
412
365
class Diff3Merge:
366
def __init__(self, base_file, other_file):
367
self.base_file = base_file
368
self.other_file = other_file
413
class Diff3Merge(object):
414
history_based = False
415
def __init__(self, file_id, base, other):
416
self.file_id = file_id
417
self.base = base
418
self.other = other
419
420
def is_creation(self):
421
return False
422
423
def is_deletion(self):
424
return False
369
425
370
426
def __eq__(self, other):
371
427
if not isinstance(other, Diff3Merge):
372
428
return False
373
return (self.base_file == other.base_file and
374
self.other_file == other.other_file)
429
return (self.base == other.base and
430
self.other == other.other and self.file_id == other.file_id)
375
431
376
432
def __ne__(self, other):
377
433
return not (self == other)
378
434
435
def dump_file(self, temp_dir, name, tree):
436
out_path = os.path.join(temp_dir, name)
437
out_file = file(out_path, "wb")
438
in_file = tree.get_file(self.file_id)
439
for line in in_file:
440
out_file.write(line)
441
return out_path
442
379
443
def apply(self, filename, conflict_handler, reverse=False):
380
new_file = filename+".new"
381
if not reverse:
382
base = self.base_file
383
other = self.other_file
384
else:
385
base = self.other_file
386
other = self.base_file
387
status = patch.diff3(new_file, filename, base, other)
388
if status == 0:
389
os.chmod(new_file, os.stat(filename).st_mode)
390
os.rename(new_file, filename)
391
return
392
else:
393
assert(status == 1)
394
conflict_handler.merge_conflict(new_file, filename, base, other)
444
import bzrlib.patch
445
temp_dir = mkdtemp(prefix="bzr-")
446
try:
447
new_file = filename+".new"
448
base_file = self.dump_file(temp_dir, "base", self.base)
449
other_file = self.dump_file(temp_dir, "other", self.other)
450
if not reverse:
451
base = base_file
452
other = other_file
453
else:
454
base = other_file
455
other = base_file
456
status = bzrlib.patch.diff3(new_file, filename, base, other)
457
if status == 0:
458
os.chmod(new_file, os.stat(filename).st_mode)
459
rename(new_file, filename)
460
return
461
else:
462
assert(status == 1)
463
def get_lines(filename):
464
my_file = file(filename, "rb")
465
lines = my_file.readlines()
466
my_file.close()
467
return lines
468
base_lines = get_lines(base)
469
other_lines = get_lines(other)
470
conflict_handler.merge_conflict(new_file, filename, base_lines,
471
other_lines)
472
finally:
473
rmtree(temp_dir)
395
474
396
475
397
476
def CreateDir():
430
509
"""
431
510
return ReplaceContents(FileCreate(contents), None)
432
511
433
def ReplaceFileContents(old_contents, new_contents):
512
def ReplaceFileContents(old_tree, new_tree, file_id):
434
513
"""Convenience fucntion to replace the contents of a file.
435
514
436
515
:param old_contents: The contents of the file to replace
440
519
:return: A ReplaceContents that will replace the contents of a file a file
441
520
:rtype: `ReplaceContents`
442
521
"""
443
return ReplaceContents(FileCreate(old_contents), FileCreate(new_contents))
522
return ReplaceContents(TreeFileCreate(old_tree, file_id),
523
TreeFileCreate(new_tree, file_id))
444
524
445
525
def CreateSymlink(target):
446
526
"""Convenience fucntion to create a symlink.
609
689
:param reverse: if true, the changeset is being applied in reverse
610
690
:rtype: bool
611
691
"""
612
return ((self.new_parent is None and not reverse) or
613
(self.parent is None and reverse))
692
return self.is_creation(not reverse)
614
693
615
694
def is_creation(self, reverse):
616
695
"""Return true if applying the entry would create a file/directory.
618
697
:param reverse: if true, the changeset is being applied in reverse
619
698
:rtype: bool
620
699
"""
621
return ((self.parent is None and not reverse) or
622
(self.new_parent is None and reverse))
700
if self.contents_change is None:
701
return False
702
if reverse:
703
return self.contents_change.is_deletion()
704
else:
705
return self.contents_change.is_creation()
623
706
624
707
def is_creation_or_deletion(self):
625
708
"""Return true if applying the entry would create or delete a
627
710
628
711
:rtype: bool
629
712
"""
630
return self.parent is None or self.new_parent is None
713
return self.is_creation(False) or self.is_deletion(False)
631
714
632
715
def get_cset_path(self, mod=False):
633
716
"""Determine the path of the entry according to the changeset.
653
736
return None
654
737
return self.path
655
738
656
def summarize_name(self, changeset, reverse=False):
739
def summarize_name(self, reverse=False):
657
740
"""Produce a one-line summary of the filename. Indicates renames as
658
741
old => new, indicates creation as None => new, indicates deletion as
659
742
old => None.
690
773
:type reverse: bool
691
774
:rtype: str
692
775
"""
776
mutter("Finding new path for %s", self.summarize_name())
693
777
if reverse:
694
778
parent = self.parent
695
779
to_dir = self.dir
714
798
if from_dir == to_dir:
715
799
dir = os.path.dirname(id_map[self.id])
716
800
else:
801
mutter("path, new_path: %r %r", self.path, self.new_path)
717
802
parent_entry = changeset.entries[parent]
718
803
dir = parent_entry.get_new_path(id_map, changeset, reverse)
719
804
if from_name == to_name:
762
847
Exception.__init__(self, msg)
763
848
self.id = id
764
849
765
class Changeset:
850
class Changeset(object):
766
851
"""A set of changes to apply"""
767
852
def __init__(self):
768
853
self.entries = {}
803
888
:rtype: (List, List)
804
889
"""
805
890
source_entries = [x for x in changeset.entries.itervalues()
806
if x.needs_rename()]
891
if x.needs_rename() or x.is_creation_or_deletion()]
807
892
# these are done from longest path to shortest, to avoid deleting a
808
893
# parent before its children are deleted/renamed
809
894
def longest_to_shortest(entry):
826
911
my_sort(target_entries, shortest_to_longest)
827
912
return (source_entries, target_entries)
828
913
829
def rename_to_temp_delete(source_entries, inventory, dir, conflict_handler,
830
reverse):
914
def rename_to_temp_delete(source_entries, inventory, dir, temp_dir,
915
conflict_handler, reverse):
831
916
"""Delete and rename entries as appropriate. Entries are renamed to temp
832
names. A map of id -> temp name is returned.
917
names. A map of id -> temp name (or None, for deletions) is returned.
833
918
834
919
:param source_entries: The entries to rename and delete
835
920
:type source_entries: List of `ChangesetEntry`
842
927
:return: a mapping of id to temporary name
843
928
:rtype: Dictionary
844
929
"""
845
temp_dir = os.path.join(dir, "temp")
846
930
temp_name = {}
847
931
for i in range(len(source_entries)):
848
932
entry = source_entries[i]
849
933
if entry.is_deletion(reverse):
850
934
path = os.path.join(dir, inventory[entry.id])
851
935
entry.apply(path, conflict_handler, reverse)
936
temp_name[entry.id] = None
852
937
853
else:
854
to_name = temp_dir+"/"+str(i)
938
elif entry.needs_rename():
939
to_name = os.path.join(temp_dir, str(i))
855
940
src_path = inventory.get(entry.id)
856
941
if src_path is not None:
857
942
src_path = os.path.join(dir, src_path)
858
943
try:
859
os.rename(src_path, to_name)
944
rename(src_path, to_name)
860
945
temp_name[entry.id] = to_name
861
946
except OSError, e:
862
947
if e.errno != errno.ENOENT:
863
948
raise
864
if conflict_handler.missing_for_rename(src_path) == "skip":
949
if conflict_handler.missing_for_rename(src_path, to_name) \
950
== "skip":
865
951
continue
866
952
867
953
return temp_name
868
954
869
955
870
def rename_to_new_create(temp_name, target_entries, inventory, changeset, dir,
871
conflict_handler, reverse):
956
def rename_to_new_create(changed_inventory, target_entries, inventory,
957
changeset, dir, conflict_handler, reverse):
872
958
"""Rename entries with temp names to their final names, create new files.
873
959
874
:param temp_name: A mapping of id to temporary name
875
:type temp_name: Dictionary
960
:param changed_inventory: A mapping of id to temporary name
961
:type changed_inventory: Dictionary
876
962
:param target_entries: The entries to apply changes to
877
963
:type target_entries: List of `ChangesetEntry`
878
964
:param changeset: The changeset to apply
883
969
:type reverse: bool
884
970
"""
885
971
for entry in target_entries:
886
new_path = entry.get_new_path(inventory, changeset, reverse)
887
if new_path is None:
972
new_tree_path = entry.get_new_path(inventory, changeset, reverse)
973
if new_tree_path is None:
888
974
continue
889
new_path = os.path.join(dir, new_path)
890
old_path = temp_name.get(entry.id)
891
if os.path.exists(new_path):
975
new_path = os.path.join(dir, new_tree_path)
976
old_path = changed_inventory.get(entry.id)
977
if bzrlib.osutils.lexists(new_path):
892
978
if conflict_handler.target_exists(entry, new_path, old_path) == \
893
979
"skip":
894
980
continue
895
981
if entry.is_creation(reverse):
896
982
entry.apply(new_path, conflict_handler, reverse)
897
else:
983
changed_inventory[entry.id] = new_tree_path
984
elif entry.needs_rename():
898
985
if old_path is None:
899
986
continue
900
987
try:
901
os.rename(old_path, new_path)
988
rename(old_path, new_path)
989
changed_inventory[entry.id] = new_tree_path
902
990
except OSError, e:
903
991
raise Exception ("%s is missing" % new_path)
904
992
938
1026
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
939
1027
self.this_path = this_path
940
1028
941
class MergePermissionConflict(Exception):
942
def __init__(self, this_path, base_path, other_path):
943
this_perms = os.stat(this_path).st_mode & 0755
944
base_perms = os.stat(base_path).st_mode & 0755
945
other_perms = os.stat(other_path).st_mode & 0755
946
msg = """Conflicting permission for %s
947
this: %o
948
base: %o
949
other: %o
950
""" % (this_path, this_perms, base_perms, other_perms)
951
self.this_path = this_path
952
self.base_path = base_path
953
self.other_path = other_path
954
Exception.__init__(self, msg)
955
956
1029
class WrongOldContents(Exception):
957
1030
def __init__(self, filename):
958
1031
msg = "Contents mismatch deleting %s" % filename
959
1032
self.filename = filename
960
1033
Exception.__init__(self, msg)
961
1034
962
class WrongOldPermissions(Exception):
963
def __init__(self, filename, old_perms, new_perms):
964
msg = "Permission missmatch on %s:\n" \
965
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
1035
class WrongOldExecFlag(Exception):
1036
def __init__(self, filename, old_exec_flag, new_exec_flag):
1037
msg = "Executable flag missmatch on %s:\n" \
1038
"Expected %s, got %s." % (filename, old_exec_flag, new_exec_flag)
966
1039
self.filename = filename
967
1040
Exception.__init__(self, msg)
968
1041
986
1059
Exception.__init__(self, msg)
987
1060
self.filename = filename
988
1061
989
class MissingPermsFile(Exception):
1062
class MissingForSetExec(Exception):
990
1063
def __init__(self, filename):
991
1064
msg = "Attempt to change permissions on %s, which does not exist" %\
992
1065
filename
1001
1074
1002
1075
1003
1076
class MissingForRename(Exception):
1004
def __init__(self, filename):
1005
msg = "Attempt to move missing path %s" % (filename)
1077
def __init__(self, filename, to_path):
1078
msg = "Attempt to move missing path %s to %s" % (filename, to_path)
1006
1079
Exception.__init__(self, msg)
1007
1080
self.filename = filename
1008
1081
1009
class ExceptionConflictHandler:
1010
def __init__(self, dir):
1011
self.dir = dir
1012
1082
class NewContentsConflict(Exception):
1083
def __init__(self, filename):
1084
msg = "Conflicting contents for new file %s" % (filename)
1085
Exception.__init__(self, msg)
1086
1087
class WeaveMergeConflict(Exception):
1088
def __init__(self, filename):
1089
msg = "Conflicting contents for file %s" % (filename)
1090
Exception.__init__(self, msg)
1091
1092
class ThreewayContentsConflict(Exception):
1093
def __init__(self, filename):
1094
msg = "Conflicting contents for file %s" % (filename)
1095
Exception.__init__(self, msg)
1096
1097
1098
class MissingForMerge(Exception):
1099
def __init__(self, filename):
1100
msg = "The file %s was modified, but does not exist in this tree"\
1101
% (filename)
1102
Exception.__init__(self, msg)
1103
1104
1105
class ExceptionConflictHandler(object):
1106
"""Default handler for merge exceptions.
1107
1108
This throws an error on any kind of conflict. Conflict handlers can
1109
descend from this class if they have a better way to handle some or
1110
all types of conflict.
1111
"""
1013
1112
def missing_parent(self, pathname):
1014
1113
parent = os.path.dirname(pathname)
1015
1114
raise Exception("Parent directory missing for %s" % pathname)
1026
1125
def rename_conflict(self, id, this_name, base_name, other_name):
1027
1126
raise RenameConflict(id, this_name, base_name, other_name)
1028
1127
1029
def move_conflict(self, id, inventory):
1030
this_dir = inventory.this.get_dir(id)
1031
base_dir = inventory.base.get_dir(id)
1032
other_dir = inventory.other.get_dir(id)
1128
def move_conflict(self, id, this_dir, base_dir, other_dir):
1033
1129
raise MoveConflict(id, this_dir, base_dir, other_dir)
1034
1130
1035
def merge_conflict(self, new_file, this_path, base_path, other_path):
1131
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1036
1132
os.unlink(new_file)
1037
1133
raise MergeConflict(this_path)
1038
1134
1039
def permission_conflict(self, this_path, base_path, other_path):
1040
raise MergePermissionConflict(this_path, base_path, other_path)
1041
1042
1135
def wrong_old_contents(self, filename, expected_contents):
1043
1136
raise WrongOldContents(filename)
1044
1137
1045
1138
def rem_contents_conflict(self, filename, this_contents, base_contents):
1046
1139
raise RemoveContentsConflict(filename)
1047
1140
1048
def wrong_old_perms(self, filename, old_perms, new_perms):
1049
raise WrongOldPermissions(filename, old_perms, new_perms)
1141
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1142
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1050
1143
1051
1144
def rmdir_non_empty(self, filename):
1052
1145
raise DeletingNonEmptyDirectory(filename)
1057
1150
def patch_target_missing(self, filename, contents):
1058
1151
raise PatchTargetMissing(filename)
1059
1152
1060
def missing_for_chmod(self, filename):
1061
raise MissingPermsFile(filename)
1153
def missing_for_exec_flag(self, filename):
1154
raise MissingForExecFlag(filename)
1062
1155
1063
1156
def missing_for_rm(self, filename, change):
1064
1157
raise MissingForRm(filename)
1065
1158
1066
def missing_for_rename(self, filename):
1067
raise MissingForRename(filename)
1159
def missing_for_rename(self, filename, to_path):
1160
raise MissingForRename(filename, to_path)
1161
1162
def missing_for_merge(self, file_id, other_path):
1163
raise MissingForMerge(other_path)
1164
1165
def new_contents_conflict(self, filename, other_contents):
1166
raise NewContentsConflict(filename)
1167
1168
def weave_merge_conflict(self, filename, weave, other_i, out_file):
1169
raise WeaveMergeConflict(filename)
1170
1171
def threeway_contents_conflict(self, filename, this_contents,
1172
base_contents, other_contents):
1173
raise ThreewayContentsConflict(filename)
1174
1175
def finalize(self):
1176
pass
1068
1177
1069
1178
def apply_changeset(changeset, inventory, dir, conflict_handler=None,
1070
1179
reverse=False):
1082
1191
:rtype: Dictionary
1083
1192
"""
1084
1193
if conflict_handler is None:
1085
conflict_handler = ExceptionConflictHandler(dir)
1086
temp_dir = dir+"/temp"
1087
os.mkdir(temp_dir)
1194
conflict_handler = ExceptionConflictHandler()
1195
temp_dir = os.path.join(dir, "bzr-tree-change")
1196
try:
1197
os.mkdir(temp_dir)
1198
except OSError, e:
1199
if e.errno == errno.EEXIST:
1200
try:
1201
os.rmdir(temp_dir)
1202
except OSError, e:
1203
if e.errno == errno.ENOTEMPTY:
1204
raise OldFailedTreeOp()
1205
os.mkdir(temp_dir)
1206
else:
1207
raise
1088
1208
1089
1209
#apply changes that don't affect filenames
1090
1210
for entry in changeset.entries.itervalues():
1091
if not entry.is_creation_or_deletion():
1211
if not entry.is_creation_or_deletion() and not entry.is_boring():
1212
if entry.id not in inventory:
1213
warning("entry {%s} no longer present, can't be updated",
1214
entry.id)
1215
continue
1092
1216
path = os.path.join(dir, inventory[entry.id])
1093
1217
entry.apply(path, conflict_handler, reverse)
1094
1218
1099
1223
(source_entries, target_entries) = get_rename_entries(changeset, inventory,
1100
1224
reverse)
1101
1225
1102
temp_name = rename_to_temp_delete(source_entries, inventory, dir,
1103
conflict_handler, reverse)
1226
changed_inventory = rename_to_temp_delete(source_entries, inventory, dir,
1227
temp_dir, conflict_handler,
1228
reverse)
1104
1229
1105
rename_to_new_create(temp_name, target_entries, inventory, changeset, dir,
1106
conflict_handler, reverse)
1230
rename_to_new_create(changed_inventory, target_entries, inventory,
1231
changeset, dir, conflict_handler, reverse)
1107
1232
os.rmdir(temp_dir)
1108
r_inventory = invert_dict(inventory)
1109
new_entries, removed_entries = get_inventory_change(inventory,
1110
r_inventory, changeset, reverse)
1111
new_inventory = {}
1112
for path, file_id in new_entries.iteritems():
1113
new_inventory[file_id] = path
1114
for file_id in removed_entries:
1115
new_inventory[file_id] = None
1116
return new_inventory
1233
return changed_inventory
1117
1234
1118
1235
1119
1236
def apply_changeset_tree(cset, tree, reverse=False):
1120
1237
r_inventory = {}
1121
1238
for entry in tree.source_inventory().itervalues():
1122
1239
inventory[entry.id] = entry.path
1123
new_inventory = apply_changeset(cset, r_inventory, tree.root,
1240
new_inventory = apply_changeset(cset, r_inventory, tree.basedir,
1124
1241
reverse=reverse)
1125
1242
new_entries, remove_entries = \
1126
1243
get_inventory_change(inventory, new_inventory, cset, reverse)
1130
1247
def get_inventory_change(inventory, new_inventory, cset, reverse=False):
1131
1248
new_entries = {}
1132
1249
remove_entries = []
1133
r_inventory = invert_dict(inventory)
1134
r_new_inventory = invert_dict(new_inventory)
1135
1250
for entry in cset.entries.itervalues():
1136
1251
if entry.needs_rename():
1137
old_path = r_inventory.get(entry.id)
1138
if old_path is not None:
1139
remove_entries.append(old_path)
1252
new_path = entry.get_new_path(inventory, cset)
1253
if new_path is None:
1254
remove_entries.append(entry.id)
1140
1255
else:
1141
new_path = entry.get_new_path(inventory, cset)
1142
if new_path is not None:
1143
new_entries[new_path] = entry.id
1256
new_entries[new_path] = entry.id
1144
1257
return new_entries, remove_entries
1145
1258
1146
1259
1265
1378
return new_meta
1266
1379
elif new_meta is None:
1267
1380
return old_meta
1268
elif isinstance(old_meta, ChangeUnixPermissions) and \
1269
isinstance(new_meta, ChangeUnixPermissions):
1270
return ChangeUnixPermissions(old_meta.old_mode, new_meta.new_mode)
1381
elif (isinstance(old_meta, ChangeExecFlag) and
1382
isinstance(new_meta, ChangeExecFlag)):
1383
return ChangeExecFlag(old_meta.old_exec_flag, new_meta.new_exec_flag)
1271
1384
else:
1272
1385
return ApplySequence(old_meta, new_meta)
1273
1386
1278
1391
return False
1279
1392
return True
1280
1393
1281
class UnsuppportedFiletype(Exception):
1282
def __init__(self, full_path, stat_result):
1283
msg = "The file \"%s\" is not a supported filetype." % full_path
1394
class UnsupportedFiletype(Exception):
1395
def __init__(self, kind, full_path):
1396
msg = "The file \"%s\" is a %s, which is not a supported filetype." \
1397
% (full_path, kind)
1284
1398
Exception.__init__(self, msg)
1285
1399
self.full_path = full_path
1286
self.stat_result = stat_result
1287
1288
def generate_changeset(tree_a, tree_b, inventory_a=None, inventory_b=None):
1289
return ChangesetGenerator(tree_a, tree_b, inventory_a, inventory_b)()
1400
self.kind = kind
1401
1402
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1403
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1404
1290
1405
1291
1406
class ChangesetGenerator(object):
1292
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1407
def __init__(self, tree_a, tree_b, interesting_ids=None):
1293
1408
object.__init__(self)
1294
1409
self.tree_a = tree_a
1295
1410
self.tree_b = tree_b
1296
if inventory_a is not None:
1297
self.inventory_a = inventory_a
1298
else:
1299
self.inventory_a = tree_a.inventory()
1300
if inventory_b is not None:
1301
self.inventory_b = inventory_b
1302
else:
1303
self.inventory_b = tree_b.inventory()
1304
self.r_inventory_a = self.reverse_inventory(self.inventory_a)
1305
self.r_inventory_b = self.reverse_inventory(self.inventory_b)
1411
self._interesting_ids = interesting_ids
1306
1412
1307
def reverse_inventory(self, inventory):
1308
r_inventory = {}
1309
for entry in inventory.itervalues():
1310
if entry.id is None:
1311
continue
1312
r_inventory[entry.id] = entry
1313
return r_inventory
1413
def iter_both_tree_ids(self):
1414
for file_id in self.tree_a:
1415
yield file_id
1416
for file_id in self.tree_b:
1417
if file_id not in self.tree_a:
1418
yield file_id
1314
1419
1315
1420
def __call__(self):
1316
1421
cset = Changeset()
1317
for entry in self.inventory_a.itervalues():
1318
if entry.id is None:
1319
continue
1320
cs_entry = self.make_entry(entry.id)
1422
for file_id in self.iter_both_tree_ids():
1423
cs_entry = self.make_entry(file_id)
1321
1424
if cs_entry is not None and not cs_entry.is_boring():
1322
1425
cset.add_entry(cs_entry)
1323
1426
1324
for entry in self.inventory_b.itervalues():
1325
if entry.id is None:
1326
continue
1327
if not self.r_inventory_a.has_key(entry.id):
1328
cs_entry = self.make_entry(entry.id)
1329
if cs_entry is not None and not cs_entry.is_boring():
1330
cset.add_entry(cs_entry)
1331
1427
for entry in list(cset.entries.itervalues()):
1332
1428
if entry.parent != entry.new_parent:
1333
1429
if not cset.entries.has_key(entry.parent) and\
1341
1437
cset.add_entry(parent_entry)
1342
1438
return cset
1343
1439
1344
def get_entry_parent(self, entry, inventory):
1345
if entry is None:
1346
return None
1347
if entry.path == "./.":
1348
return NULL_ID
1349
dirname = os.path.dirname(entry.path)
1350
if dirname == ".":
1351
dirname = "./."
1352
parent = inventory[dirname]
1353
return parent.id
1354
1355
def get_paths(self, entry, tree):
1356
if entry is None:
1357
return (None, None)
1358
full_path = tree.readonly_path(entry.id)
1359
if entry.path == ".":
1360
return ("", full_path)
1361
return (entry.path, full_path)
1362
1363
def make_basic_entry(self, id, only_interesting):
1364
entry_a = self.r_inventory_a.get(id)
1365
entry_b = self.r_inventory_b.get(id)
1440
def iter_inventory(self, tree):
1441
for file_id in tree:
1442
yield self.get_entry(file_id, tree)
1443
1444
def get_entry(self, file_id, tree):
1445
if not tree.has_or_had_id(file_id):
1446
return None
1447
return tree.inventory[file_id]
1448
1449
def get_entry_parent(self, entry):
1450
if entry is None:
1451
return None
1452
return entry.parent_id
1453
1454
def get_path(self, file_id, tree):
1455
if not tree.has_or_had_id(file_id):
1456
return None
1457
path = tree.id2path(file_id)
1458
if path == '':
1459
return './.'
1460
else:
1461
return path
1462
1463
def make_basic_entry(self, file_id, only_interesting):
1464
entry_a = self.get_entry(file_id, self.tree_a)
1465
entry_b = self.get_entry(file_id, self.tree_b)
1366
1466
if only_interesting and not self.is_interesting(entry_a, entry_b):
1367
return (None, None, None)
1368
parent = self.get_entry_parent(entry_a, self.inventory_a)
1369
(path, full_path_a) = self.get_paths(entry_a, self.tree_a)
1370
cs_entry = ChangesetEntry(id, parent, path)
1371
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1372
1373
1374
(new_path, full_path_b) = self.get_paths(entry_b, self.tree_b)
1467
return None
1468
parent = self.get_entry_parent(entry_a)
1469
path = self.get_path(file_id, self.tree_a)
1470
cs_entry = ChangesetEntry(file_id, parent, path)
1471
new_parent = self.get_entry_parent(entry_b)
1472
1473
new_path = self.get_path(file_id, self.tree_b)
1375
1474
1376
1475
cs_entry.new_path = new_path
1377
1476
cs_entry.new_parent = new_parent
1378
return (cs_entry, full_path_a, full_path_b)
1477
return cs_entry
1379
1478
1380
1479
def is_interesting(self, entry_a, entry_b):
1480
if self._interesting_ids is None:
1481
return True
1381
1482
if entry_a is not None:
1382
if entry_a.interesting:
1383
return True
1384
if entry_b is not None:
1385
if entry_b.interesting:
1386
return True
1387
return False
1483
file_id = entry_a.file_id
1484
elif entry_b is not None:
1485
file_id = entry_b.file_id
1486
else:
1487
return False
1488
return file_id in self._interesting_ids
1388
1489
1389
1490
def make_boring_entry(self, id):
1390
(cs_entry, full_path_a, full_path_b) = \
1391
self.make_basic_entry(id, only_interesting=False)
1491
cs_entry = self.make_basic_entry(id, only_interesting=False)
1392
1492
if cs_entry.is_creation_or_deletion():
1393
1493
return self.make_entry(id, only_interesting=False)
1394
1494
else:
1396
1496
1397
1497
1398
1498
def make_entry(self, id, only_interesting=True):
1399
(cs_entry, full_path_a, full_path_b) = \
1400
self.make_basic_entry(id, only_interesting)
1499
cs_entry = self.make_basic_entry(id, only_interesting)
1401
1500
1402
1501
if cs_entry is None:
1403
1502
return None
1404
1405
stat_a = self.lstat(full_path_a)
1406
stat_b = self.lstat(full_path_b)
1407
if stat_b is None:
1408
cs_entry.new_parent = None
1409
cs_entry.new_path = None
1410
1411
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1412
cs_entry.contents_change = self.make_contents_change(full_path_a,
1413
stat_a,
1414
full_path_b,
1415
stat_b)
1503
1504
cs_entry.metadata_change = self.make_exec_flag_change(id)
1505
1506
if id in self.tree_a and id in self.tree_b:
1507
a_sha1 = self.tree_a.get_file_sha1(id)
1508
b_sha1 = self.tree_b.get_file_sha1(id)
1509
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1510
return cs_entry
1511
1512
cs_entry.contents_change = self.make_contents_change(id)
1416
1513
return cs_entry
1417
1514
1418
def make_mode_change(self, stat_a, stat_b):
1419
mode_a = None
1420
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1421
mode_a = stat_a.st_mode & 0777
1422
mode_b = None
1423
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1424
mode_b = stat_b.st_mode & 0777
1425
if mode_a == mode_b:
1426
return None
1427
return ChangeUnixPermissions(mode_a, mode_b)
1428
1429
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1430
if stat_a is None and stat_b is None:
1431
return None
1432
if None not in (stat_a, stat_b) and stat.S_ISDIR(stat_a.st_mode) and\
1433
stat.S_ISDIR(stat_b.st_mode):
1434
return None
1435
if None not in (stat_a, stat_b) and stat.S_ISREG(stat_a.st_mode) and\
1436
stat.S_ISREG(stat_b.st_mode):
1437
if stat_a.st_ino == stat_b.st_ino and \
1438
stat_a.st_dev == stat_b.st_dev:
1439
return None
1440
if file(full_path_a, "rb").read() == \
1441
file(full_path_b, "rb").read():
1442
return None
1443
1444
patch_contents = patch.diff(full_path_a,
1445
file(full_path_b, "rb").read())
1446
if patch_contents is None:
1447
return None
1448
return PatchApply(patch_contents)
1449
1450
a_contents = self.get_contents(stat_a, full_path_a)
1451
b_contents = self.get_contents(stat_b, full_path_b)
1515
def make_exec_flag_change(self, file_id):
1516
exec_flag_a = exec_flag_b = None
1517
if file_id in self.tree_a and self.tree_a.kind(file_id) == "file":
1518
exec_flag_a = self.tree_a.is_executable(file_id)
1519
1520
if file_id in self.tree_b and self.tree_b.kind(file_id) == "file":
1521
exec_flag_b = self.tree_b.is_executable(file_id)
1522
1523
if exec_flag_a == exec_flag_b:
1524
return None
1525
return ChangeExecFlag(exec_flag_a, exec_flag_b)
1526
1527
def make_contents_change(self, file_id):
1528
a_contents = get_contents(self.tree_a, file_id)
1529
b_contents = get_contents(self.tree_b, file_id)
1452
1530
if a_contents == b_contents:
1453
1531
return None
1454
1532
return ReplaceContents(a_contents, b_contents)
1455
1533
1456
def get_contents(self, stat_result, full_path):
1457
if stat_result is None:
1458
return None
1459
elif stat.S_ISREG(stat_result.st_mode):
1460
return FileCreate(file(full_path, "rb").read())
1461
elif stat.S_ISDIR(stat_result.st_mode):
1462
return dir_create
1463
elif stat.S_ISLNK(stat_result.st_mode):
1464
return SymlinkCreate(os.readlink(full_path))
1465
else:
1466
raise UnsupportedFiletype(full_path, stat_result)
1467
1534
1468
def lstat(self, full_path):
1469
stat_result = None
1470
if full_path is not None:
1471
try:
1472
stat_result = os.lstat(full_path)
1473
except OSError, e:
1474
if e.errno != errno.ENOENT:
1475
raise
1476
return stat_result
1535
def get_contents(tree, file_id):
1536
"""Return the appropriate contents to create a copy of file_id from tree"""
1537
if file_id not in tree:
1538
return None
1539
kind = tree.kind(file_id)
1540
if kind == "file":
1541
return TreeFileCreate(tree, file_id)
1542
elif kind in ("directory", "root_directory"):
1543
return dir_create
1544
elif kind == "symlink":
1545
return SymlinkCreate(tree.get_symlink_target(file_id))
1546
else:
1547
raise UnsupportedFiletype(kind, tree.id2path(file_id))
1477
1548
1478
1549
1479
1550
def full_path(entry, tree):
1480
return os.path.join(tree.root, entry.path)
1551
return os.path.join(tree.basedir, entry.path)
1481
1552
1482
1553
def new_delete_entry(entry, tree, inventory, delete):
1483
1554
if entry.path == "":
1499
1570
1500
1571
1501
1572
1502
1503
class Inventory:
1573
# XXX: Can't we unify this with the regular inventory object
1574
class Inventory(object):
1504
1575
def __init__(self, inventory):
1505
1576
self.inventory = inventory
1506
1577
self.rinventory = None
1514
1585
return self.inventory.get(id)
1515
1586
1516
1587
def get_name(self, id):
1517
return os.path.basename(self.get_path(id))
1588
path = self.get_path(id)
1589
if path is None:
1590
return None
1591
else:
1592
return os.path.basename(path)
1518
1593
1519
1594
def get_dir(self, id):
1520
1595
path = self.get_path(id)
1521
1596
if path == "":
1522
1597
return None
1598
if path is None:
1599
return None
1523
1600
return os.path.dirname(path)
1524
1601
1525
1602
def get_parent(self, id):
1603
if self.get_path(id) is None:
1604
return None
1526
1605
directory = self.get_dir(id)
1527
1606
if directory == '.':
1528
1607
directory = './.'
Loggerhead is a web-based interface for Breezy
Version: 2.0.1