/usr/share/pyshared/Codeville/history.py is in codeville 0.8.0-2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 | # Written by Bram Cohen and Ross Cohen
# see LICENSE.txt for license information
from bencode import bdecode, bencode
import binascii
from db import db
from DFS import DFS
from merge import MergeError, replay
from os import path
from hashlib import sha1
import struct
from time import localtime, strftime
from xml.sax import saxutils
import zlib
roothandle = '\xdfp\xce\xbaNt5\xf9\xa1\xabd\xf2\xc4\x87\xc5\xd1\x0bI\x8d\xb4'
rootnode = '\xb3L\xac\x1f\x98B\x15\\\x8c\t0&\xd7m\xecK\xdd\n\x81\xc4'
class HistoryError(Exception):
pass
def damerge(*dargs):
dc = {}
for dm in dargs:
dc.update({}.fromkeys(dm))
return dc.keys()
# keeping this one for possible performance reasons, need to measure
def dmerge(da, db):
dc = {}.fromkeys(da)
dc.update({}.fromkeys(db))
return dc.keys()
def rename_conflict_check(linfo, rinfo):
def _is_applied(line_points, points):
assert list == type(line_points)
for p in line_points:
if p in points:
return True
return False
# if we're merging, maybe nothing is different. this shields the root
# directory from causing problems
if linfo == rinfo:
return ('local', linfo['rename point'])
lapplied = _is_applied(linfo['rename point'], rinfo['points'])
rapplied = _is_applied(rinfo['rename point'], linfo['points'])
try:
if linfo['name'] == rinfo['name'] and \
linfo['parent'] == rinfo['parent']:
return ('local', dmerge(linfo['rename point'], rinfo['rename point']))
except KeyError:
assert linfo['rename point'] == rinfo['rename point'] == [rootnode]
raise HistoryError, 'cannot rename root directory'
if rapplied and not lapplied:
return ('local', linfo['rename point'])
if not rapplied and lapplied:
return ('remote', rinfo['rename point'])
return ('conflict', None)
def _name_use_count(co, state, point, func, txn):
cursor = co.allnamesdb.cursor(txn=txn)
lookup = state['parent'] + state['name']
try:
key, value = cursor.set(lookup)
except (db.DBNotFoundError, TypeError):
return []
named = []
while key == lookup:
vinfo = func(co, value, point, txn)
if vinfo is not None:
if not vinfo.has_key('delete') and vinfo['parent'] == state['parent'] and vinfo['name'] == state['name']:
named.append(value)
# next_dup() is broken
foo = cursor.next()
if foo is None:
break
key, value = foo
cursor.close()
return named
def name_use_count(co, state, point, txn):
return _name_use_count(co, state, point, handle_name_at_point, txn)
def _children_count(co, handle, point, func, txn):
cursor = co.allnamesdb.cursor(txn=txn)
try:
foo = cursor.set_range(handle)
except (db.DBNotFoundError, TypeError):
foo = None
children = {}
while foo is not None:
key, value = foo
parent = key[:20]
if parent != handle:
break
vinfo = func(co, value, point, txn)
if vinfo is not None:
if not vinfo.has_key('delete') and vinfo['parent'] == handle:
children[value] = None
foo = cursor.next()
cursor.close()
return children.keys()
def children_count(co, handle, point, txn):
return _children_count(co, handle, point, handle_name_at_point, txn)
def parent_loop_check(co, handle, point, txn):
hseen = {}
while handle != roothandle:
if hseen.has_key(handle):
return handle
hseen[handle] = 1
phandle = handle_name_at_point(co, handle, point, txn)['parent']
if phandle is None:
return handle
handle = phandle
return None
def is_ancestor(co, ancestor, point, txn):
if point is None:
return 0
return _is_ancestor(co, ancestor, [point], txn)
def _is_ancestor(co, ancestor, points, txn):
#ainfo = bdecode(co.branchmapdb.get(ancestor, txn=txn))
ainfo = db_get(co, co.branchmapdb, ancestor, txn)
points = points[:]
state = {}
while len(points):
pnext = points.pop()
if pnext == ancestor:
return 1
# if it's in state, then we've already walked it
if pnext in state:
continue
state[pnext] = 1
#pinfo = bdecode(co.branchmapdb.get(pnext, txn=txn))
pinfo = db_get(co, co.branchmapdb, pnext, txn)
if pinfo['generation'] <= ainfo['generation']:
continue
ps = pinfo['precursors'][:]
ps.reverse()
points.extend(ps)
return 0
def read_diff(co, handle, point, txn):
hinfo = bdecode(co.contents.dagdb.get(handle + point, txn=txn))
hfile = open(path.join(co.cpath, binascii.hexlify(handle)), 'rb')
#hfile = open(path.join(co.cpath, 'diffs'), 'rb')
diff = _read_diff(hinfo, hfile)
hfile.close()
return diff
def _read_diff(index, hfile):
if not index.has_key('handle') or not index['handle'].has_key('offset'):
return None
try:
hfile.seek(index['handle']['offset'])
except IOError:
print index
raise
return hfile.read(index['handle']['length'])
def write_diff(co, handle, diff, txn):
cdagdb = co.contents.dagdb
try:
fend = struct.unpack('<I', cdagdb.get(handle, txn=txn))[0]
hfile = open(path.join(co.cpath, binascii.hexlify(handle)), 'r+b')
#fend = struct.unpack('<I', cdagdb.get('diffend', txn=txn))[0]
#hfile = open(path.join(co.cpath, 'diffs'), 'r+b')
except (TypeError, struct.error):
fend = 0
hfile = open(path.join(co.cpath, binascii.hexlify(handle)), 'wb')
#hfile = open(path.join(co.cpath, 'diffs'), 'wb')
hfile.seek(fend)
hfile.write(diff)
hfile.close()
index = {'offset': fend, 'length': len(diff)}
fend += index['length']
cdagdb.put(handle, struct.pack('<I', fend), txn=txn)
#cdagdb.put('diffend', struct.pack('<I', fend), txn=txn)
return index
# This should be merged with write_diff()
def write_index(co, point, handle, index, txn):
cdagdb = co.contents.dagdb
try:
old_index = bdecode(cdagdb.get(handle + point, txn=txn))
old_index['handle'] = index
except (db.DBNotFoundError, TypeError):
old_index = {'handle': index}
cdagdb.put(handle + point, bencode(old_index), txn=txn)
class WriteDiff:
def __init__(self, co, handle, txn):
self.co = co
self.handle = handle
self.txn = txn
self.indices = []
cdagdb = co.contents.dagdb
fname = path.join(self.co.cpath, binascii.hexlify(handle))
#fname = path.join(self.co.cpath, 'diffs')
try:
self.fend = struct.unpack('<I', cdagdb.get(handle, txn=txn))[0]
#self.fend = struct.unpack('<I', cdagdb.get('diffend', txn=txn))[0]
self.hfile = open(fname, 'r+b')
except (db.DBNotFoundError, TypeError, struct.error):
self.fend = 0
self.hfile = open(fname, 'wb')
self.hfile.seek(self.fend)
return
def write(self, diff, point):
self.hfile.write(diff)
self.indices.append(({'offset': self.fend, 'length': len(diff)}, point))
self.fend += len(diff)
return
def close(self):
self.hfile.close()
# update where to write next time
cdagdb = self.co.contents.dagdb
cdagdb.put(self.handle, struct.pack('<I', self.fend), txn=self.txn)
#cdagdb.put('diffend', struct.pack('<I', self.fend), txn=self.txn)
# write out the indices
for index, point in self.indices:
try:
old_index = bdecode(cdagdb.get(self.handle + point, txn=self.txn))
old_index['handle'] = index
except (db.DBNotFoundError, TypeError):
old_index = {'handle': index}
cdagdb.put(self.handle + point, bencode(old_index), txn=self.txn)
return
def write_changeset(co, point, cset, txn):
co.lcrepo.put(point, cset, txn=txn)
def sync_history(co, point, txn, cache=dict()):
named, modified, manifest = [], [], {}
sync_dfs = DFS(_history_deps, [co, txn, cache])
sync_dfs.search(point)
points = sync_dfs.result()
for npoint in points:
named, modified, unnamed, unmodified = \
_sync_history(co, npoint, txn, cache=cache)
unchecked = dict.fromkeys(unnamed)
for handle in named:
if handle in unchecked:
continue
_verify_manifest(co, handle, npoint, txn)
co.changesdb.put(binascii.hexlify(npoint), '', txn=txn)
return named, modified
def _history_deps(node, args):
co, txn, cache = args[0], args[1], args[2]
# decode the changeset and populate the cache
cset = bdecode(co.lcrepo.get(node, txn=txn))
cache[node] = cset
# reversing the nodes gives better overall performance
nodes = []
for i in xrange(len(cset['precursors'])-1, -1, -1):
pre_node = cset['precursors'][i]
# don't sync it if we handled it in a previous import
if co.changesdb.has_key(binascii.hexlify(pre_node), txn):
continue
nodes.append(pre_node)
return nodes
def _sync_history(co, point, txn, cache=dict()):
pinfo = cache[point]
# see if we can extend an existing branch
pre, prebminfo = None, None
generations, pre_important = [], []
bminfo = {'precursors': pinfo['precursors']}
for pre in bminfo['precursors']:
prebminfo = db_get(co, co.branchmapdb, pre, txn)
generations.append(prebminfo['generation'])
if bminfo.has_key('branch'):
continue
binfo = db_get(co, co.branchdb, prebminfo['branch'], txn)
if prebminfo['branchnum'] == binfo['last']:
bminfo['branch'] = prebminfo['branch']
bminfo['branchnum'] = prebminfo['branchnum'] + 1
binfo['last'] += 1
db_put(co, co.branchdb, bminfo['branch'], binfo, txn)
pre_important.append(pre)
# generation == 'distance to root node', the exception is for the root
try:
bminfo['generation'] = max(generations) + 1
except ValueError:
bminfo['generation'] = 0
# if we couldn't extend a branch, start a new one
if not bminfo.has_key('branch'):
bminfo['branch'] = bdecode(co.linforepo.get('branchmax', txn=txn)) + 1
co.linforepo.put('branchmax', bencode(bminfo['branch']), txn=txn)
bminfo['branchnum'] = 0
try:
# using the last precursor for this did the best empirically,
# beating out both first precursor and largest branch number.
binfo = {'last': 0,
'parent': prebminfo['branch'],
'parentnum': prebminfo['branchnum']}
pre_important.append(pre)
except TypeError:
# special stuff for the rootnode
assert bminfo['branch'] == 1
binfo = {'last': 0}
db_put(co, co.branchdb, bminfo['branch'], binfo, txn)
db_put(co, co.branchmapdb, point, bminfo, txn)
# put new files into staticdb
for (handle, value) in pinfo['handles'].items():
if value.has_key('add'):
validate_handle(handle, pinfo['precursors'], value)
db_put(co, co.staticdb, handle, {'type': value['add']['type']}, txn)
# figure out which files were modified here and hand off to helpers
named, modified, added, deleted = \
handles_in_branch(co, pre_important, [point], txn, cache=cache)
named = damerge(named, added, deleted)
modified = damerge(modified, added, deleted)
# function with side effects, modifies named and modified
pinfo['point'] = point
unnamed = _update_mini_dag(co, co.names,
_update_helper_name, named,
pinfo, txn)
unmodified = _update_mini_dag(co, co.contents,
_update_helper_content, modified,
pinfo, txn)
return (named, modified, unnamed, unmodified)
def _verify_manifest(co, handle, point, txn):
state = _handle_name_at_point(co, handle, point, txn)
co.name_cache = {}
if state['name'] == '' and handle != roothandle:
raise HistoryError, 'illegal name'
if state['name'] == '.' or state['name'] == '..':
raise HistoryError, 'illegal name'
if state['name'] == '.cdv':
raise HistoryError, 'illegal name'
if state.has_key('delete'):
if len(children_count(co, handle, point, txn)):
raise HistoryError, 'non-empty directory can\'t be deleted'
return state
staticinfo = db_get(co, co.staticdb, handle, txn)
if staticinfo['type'] == 'dir':
try:
if parent_loop_check(co, state['parent'], point, txn):
raise HistoryError, 'parent loop'
except KeyError:
pass
try:
#parentinfo = bdecode(co.staticdb.get(state['parent'], txn=txn))
parentinfo = db_get(co, co.staticdb, state['parent'], txn)
if parentinfo['type'] != 'dir':
raise HistoryError, 'parent not a directory'
parentstate = handle_name_at_point(co, state['parent'], point, txn)
if parentstate is None:
raise HistoryError, 'parent not in repository'
if parentstate.has_key('delete'):
raise HistoryError, 'file committed with deleted parent'
if len(name_use_count(co, state, point, txn)) != 1:
raise HistoryError, 'name already in use'
except KeyError:
if handle != roothandle:
raise
return
def validate_handle(handle, precursors, hinfo):
encinfo = bencode({'precursors': precursors, 'handle': hinfo})
if sha1(encinfo).digest() != handle:
raise HistoryError, 'bad identifier'
def pretty_print_big_dag(co, heads):
print 'digraph {'
points = heads[:]
cache = {}
while len(points):
point = points.pop()
if cache.has_key(point):
continue
cache[point] = 1
info = bdecode(co.lcrepo.get(point))
sid = short_id(co, point)
color = "orange"
style = "dashed"
if clean_merge_point(info) or point == rootnode:
color = "lightblue"
style = "solid"
label = sid
if point == rootnode:
label = "root"
print 'c_%s [label="%s",style=filled,color=%s]' % (sid, label, color)
for pre in info['precursors']:
print 'c_%s -> c_%s [style=%s]' % (short_id(co, pre), sid, style)
style = "dashed"
points.extend([point for point in info['precursors']])
print '}'
def pretty_print_dag(co, handle, heads):
print 'digraph {'
points = []
for point in heads:
head = handle_last_modified(co, co.contents, handle, point, None)
if head is not None:
points.append(head)
cdagdb = co.contents.dagdb
cache = {}
while len(points):
point = points.pop()
if cache.has_key(point):
continue
cache[point] = 1
sid = short_id(co, point)
print 'c_%s [label="%s"]' % (sid, sid)
info = bdecode(cdagdb.get(handle + point))
for pre, foo in info['precursors']:
print 'c_%s -> c_%s' % (sid, short_id(co, pre))
points.extend([point for point, index in info['precursors']])
print '}'
def _update_mini_dag(co, changedbs, helper, handles, cset, txn):
indexdb = changedbs.indexdb
dagdb = changedbs.dagdb
pres = cset['precursors']
point = cset['point']
#bminfo = bdecode(co.branchmapdb.get(point, txn=txn))
bminfo = db_get(co, co.branchmapdb, point, txn)
bnum = struct.pack('>II', bminfo['branch'], bminfo['branchnum'])
untouched = []
for handle in handles:
precursors = simplify_precursors(co, handle, changedbs, pres, txn)[0]
mdinfo = {'handle': {}}
# there's some broken history, need to work around it for now
# deleted files are deleted, regardless of later edits
deleted = None
#if len(precursors) > 1:
if True:
# only deletes can be implicitly merged
all_deleted = True
for pre in precursors:
phinfo = bdecode(dagdb.get(handle + pre[0], txn=txn))
if phinfo['handle'].has_key('delete'):
deleted = phinfo
else:
all_deleted = False
if all_deleted:
if len(precursors) > 1:
# affects finding when the handle was modified
untouched.append(handle)
continue
if deleted is not None:
mdinfo['handle'] = deleted['handle']
elif cset['handles'].has_key(handle):
mdinfo['handle'] = helper(co, handle, point, precursors,
cset['handles'][handle], txn)
if mdinfo['handle'] == {}:
if deleted is None:
if len(precursors) > 1:
raise HistoryError, 'cannot automatically merge changes'
del mdinfo['handle']
mdinfo['precursors'] = precursors
if precursors == []:
assert cset['handles'][handle].has_key('add')
dagdb.put(handle + point, bencode(mdinfo), txn=txn)
indexdb.put(handle + bnum, point, txn=txn)
return untouched
def simplify_precursors(co, handle, changedbs, pres, txn):
# map big DAG precursors to little DAG
dagdb = changedbs.dagdb
precursors, indices = [], []
for i in xrange(len(pres)):
last = handle_last_modified(co, changedbs, handle, pres[i], txn)
if last is None:
continue
precursors.append(last)
indices.append(i)
# second pass to eliminate precursors which are ancestors of others
retval = []
for i in xrange(len(precursors)):
pre = precursors.pop(0)
index = indices.pop(0)
if _is_ancestor(co, pre, precursors, txn):
continue
precursors.append(pre)
retval.append((pre, index))
return retval, len(pres)
def _update_helper_content(co, handle, point, precursors, hinfo, txn):
oinfo = {}
if hinfo.has_key('hash'):
if co.contents.dagdb.has_key(handle + point, txn):
dinfo = bdecode(co.contents.dagdb.get(handle + point, txn=txn))
oinfo['offset'] = dinfo['handle']['offset']
oinfo['length'] = dinfo['handle']['length']
else:
# XXX: ugly in general
oinfo['offset'] = -1
if hinfo.has_key('add'):
oinfo['add'] = 1
elif hinfo.has_key('delete'):
oinfo['delete'] = 1
return oinfo
def _update_helper_name(co, handle, point, precursors, hinfo, txn):
oinfo = {}
if hinfo.has_key('name'):
# XXX: work around some broken history, remove this later
# check to see if the file was already deleted.
for pre in precursors:
phinfo = bdecode(co.names.dagdb.get(handle + pre[0], txn=txn))
if phinfo['handle'].has_key('delete'):
oinfo = phinfo['handle']
return oinfo
oinfo['name'] = hinfo['name']
try:
oinfo['parent'] = hinfo['parent']
co.allnamesdb.put(hinfo['parent'] + hinfo['name'],
handle, flags=db.DB_NODUPDATA, txn=txn)
except KeyError:
assert handle == roothandle
assert hinfo.has_key('add')
except db.DBKeyExistError:
pass
if hinfo.has_key('add'):
assert len(precursors) == 0
oinfo['add'] = 1
elif hinfo.has_key('delete'):
# part of making lookups faster
phinfo = bdecode(co.names.dagdb.get(handle + precursors[0][0], txn=txn))
oinfo = phinfo['handle']
oinfo['delete'] = 1
else:
# something to make name lookups faster
for pre in precursors:
phinfo = bdecode(co.names.dagdb.get(handle + pre[0], txn=txn))
if phinfo.has_key('delete'):
oinfo = phinfo['handle']
break
if oinfo != {}:
assert oinfo.has_key('name') or oinfo.has_key('delete')
return oinfo
def changes_in_branch(co, lpoints, bpoints, txn, cache=None):
points = bpoints[:]
seen, changes = {}, []
while len(points):
pnext = points.pop()
if seen.has_key(pnext):
continue
seen[pnext] = 1
if _is_ancestor(co, pnext, lpoints, txn):
continue
if cache:
if cache.has_key(pnext):
pinfo = cache[pnext]
else:
pinfo = bdecode(co.lcrepo.get(pnext, txn=txn))
cache[pnext] = pinfo
else:
pinfo = bdecode(co.lcrepo.get(pnext, txn=txn))
points.extend(pinfo['precursors'])
changes.append(pnext)
return changes
def handles_in_branch(co, lpoints, bpoints, txn, cache=None):
points = bpoints[:]
seen = {}
named, modified, added, deleted = {}, {}, {}, {}
while len(points):
pnext = points.pop()
if seen.has_key(pnext):
continue
seen[pnext] = 1
if _is_ancestor(co, pnext, lpoints, txn):
continue
if cache:
if cache.has_key(pnext):
pinfo = cache[pnext]
else:
pinfo = bdecode(co.lcrepo.get(pnext, txn=txn))
cache[pnext] = pinfo
else:
pinfo = bdecode(co.lcrepo.get(pnext, txn=txn))
for handle, hinfo in pinfo['handles'].items():
if hinfo.has_key('add'):
added[handle] = 1
if hinfo.has_key('name'):
named[handle] = 1
if hinfo.has_key('hash'):
modified[handle] = 1
if hinfo.has_key('delete'):
deleted[handle] = 1
points.extend(pinfo['precursors'])
return (named.keys(), modified.keys(), added.keys(), deleted.keys())
def handle_last_modified(co, changedbs, handle, change, txn):
retval = _handle_last_modified(co, changedbs, handle, change, txn)
if retval is None:
return retval
# optimization step. we may have gotten an artifact of the indexing
# structure. because of how the mini-dags are constructed, this can be
# corrected by following a single precursor.
pinfo = bdecode(changedbs.dagdb.get(handle + retval, txn=txn))
if not pinfo.has_key('handle') and len(pinfo['precursors']) == 1:
retval = _handle_last_modified(co, changedbs, handle,
pinfo['precursors'][0][0], txn)
return retval
def _handle_last_modified(co, changedbs, handle, change, txn):
indexdb = changedbs.indexdb
dagdb = changedbs.dagdb
if dagdb.has_key(handle + change, txn):
return change
#hinfo = bdecode(co.branchmapdb.get(change, txn=txn))
hinfo = db_get(co, co.branchmapdb, change, txn)
bbranch, bnum = int(hinfo['branch']), hinfo['branchnum']
retval = None
cursor = indexdb.cursor(txn=txn)
while True:
branchpoint = struct.pack('>20sII', handle, bbranch, bnum)
try:
foo = cursor.set_range(branchpoint)
except db.DBNotFoundError:
foo = None
if foo is None:
foo = cursor.last()
if foo is None:
break
key, value = foo
else:
key, value = foo
if key != branchpoint:
try:
foo = cursor.prev_nodup()
except db.DBNotFound:
foo = None
if foo is None:
break
key, value = foo
rhandle, rbranch, rnum = struct.unpack('>20sII', key)
if rhandle == handle and rbranch == bbranch:
retval = value
break
#pinfo = bdecode(co.branchdb.get(bbranch, txn=txn))
pinfo = db_get(co, co.branchdb, bbranch, txn)
try:
bbranch, bnum = int(pinfo['parent']), pinfo['parentnum']
except KeyError:
#_print_indexdb(co, indexdb, handle, txn)
break
cursor.close()
return retval
def _print_indexdb(co, indexdb, handle, txn):
print 'indexdb'
cursor = indexdb.cursor(txn=txn)
foo = cursor.set_range(handle)
while foo != None:
key, value = foo
nhandle, branch, num = struct.unpack('>20sII', key)
if handle != nhandle:
break
print "%d, %d" % (branch, num)
foo = cursor.next()
cursor.close()
def handle_name_at_point(co, handle, point, txn, lookup=True):
change = point
if lookup:
change = handle_last_modified(co, co.names, handle, point, txn)
if change is None:
return None
blinfo = co.names.dagdb.get(handle + change, txn=txn)
linfo = bdecode(blinfo)
return linfo['handle']
def __handle_name_at_point(co, handle, point, txn, docache=True):
#key = handle + point
#if co.name_cache.has_key(key):
# return co.name_cache[key]
change = handle_last_modified(co, co.names, handle, point, txn)
if change is None:
return None
return _handle_name_at_point(co, handle, change, txn, docache=docache)
def _handle_name_from_precursors(precursors, resolution, point):
if resolution.has_key('delete'):
resolution.update(precursors[0])
return
resolution['rename point'] = []
for pre in precursors:
if pre.has_key('delete'):
resolution.update(pre)
return
if pre['name'] == resolution['name'] and \
pre['parent'] == resolution['parent']:
assert list == type(pre['rename point'])
resolution['rename point'].extend(pre['rename point'])
if resolution['rename point'] == []:
resolution['rename point'] = [point]
return
# figure out the whether we should assign a new rename point. this handles
# 2 cases:
# 1) ambiguous merge picking the line points of an ancestor
# 2) ancestors are A and B where B should win, but user reassigned to A
for pre in precursors:
outcome, rename_point = rename_conflict_check(resolution, pre)
if outcome != 'local':
resolution['rename point'] = [point]
break
return
def _deleted_in_precursors(precursors):
deleted = True
for pre in precursors:
if not pre.has_key('delete'):
deleted = False
break
return deleted
def _handle_name_at_point(co, handle, point, txn, docache=False):
cset = bdecode(co.names.dagdb.get(handle + point, txn=txn))
precursors, points = [], [point]
for pre, index in cset['precursors']:
pre_name = _handle_name_at_point(co, handle, pre, txn, docache=docache)
if pre_name is None:
continue
points = dmerge(points, pre_name['points'])
precursors.append(pre_name)
state = {}
if not cset.has_key('handle'):
if len(cset['precursors']) != 1:
# we don't require deletes to be explicitly merged
if not _deleted_in_precursors(precursors):
raise HistoryError, 'implicit name merges not permitted'
state = precursors[0]
elif cset['handle'].has_key('delete'):
state['delete'] = 1
else:
state['name'] = cset['handle']['name']
try:
state['parent'] = cset['handle']['parent']
except KeyError:
assert handle == roothandle
assert cset['handle'].has_key('add')
state['points'] = points
_handle_name_from_precursors(precursors, state, point)
if not docache:
return state
co.name_cache[handle + point] = state
return state
def fullpath_at_point(co, handle, point, txn=None):
name = None
while handle != roothandle:
pinfo = handle_name_at_point(co, handle, point, txn)
if pinfo is None:
return None
if name is None:
name = pinfo['name']
else:
name = path.join(pinfo['name'], name)
handle = pinfo['parent']
return name
def _mini_dag_refcount(co, handle, point, txn, cache=None, info_cache=None):
assert info_cache is not None
if cache is None:
cache = {}
points = [point]
while len(points):
point = points.pop()
if cache.has_key(point):
cache[point]['refcount'] += 1
continue
cache[point] = {'refcount': 1}
pinfo = bdecode(co.contents.dagdb.get(handle + point, txn=txn))
info_cache[point] = pinfo
for p, i in pinfo['precursors']:
points.append(p)
return cache
def _merge_check_deps(node, args):
co, handle, txn, hcache = args[0], args[1], args[2], args[3]
hinfo = bdecode(co.contents.dagdb.get(handle + node, txn=txn))
hcache[node] = hinfo
return [p[0] for p in hinfo['precursors']]
def handle_merge_check(co, handle, point, txn):
change = handle_last_modified(co, co.contents, handle, point, txn)
if change is None:
return None
hcache = {}
cDFS = DFS(_merge_check_deps, [co, handle, txn, hcache])
cDFS.search(change)
ordering = cDFS.result()
for point in ordering:
hinfo = hcache[point]
if not hinfo.has_key('handle') and len(hinfo['precursors']) > 1:
raise HistoryError, 'cannot automatically merge changes'
return
def _content_deps(node, args):
hcache = args[0]
return [p[0] for p in hcache[node]['precursors']]
def handle_contents_at_point(co, handle, point, txn, dcache=None, replayfunc=replay):
if dcache is None:
dcache = {}
#staticinfo = bdecode(co.staticdb.get(handle, txn=txn))
staticinfo = db_get(co, co.staticdb, handle, txn)
if staticinfo['type'] != 'file':
raise ValueError, 'Expected type \"file\", got type \"%s\"' % \
(staticinfo['type'],)
change = handle_last_modified(co, co.contents, handle, point, txn)
if change is None:
return None
hcache = {}
cache = _mini_dag_refcount(co, handle, change, txn, info_cache=hcache)
hfile = open(path.join(co.cpath, binascii.hexlify(handle)), 'rb')
#hfile = open(path.join(co.cpath, 'diffs'), 'rb')
cDFS = DFS(_content_deps, [hcache])
cDFS.search(change)
ordering = cDFS.result()
for point in ordering:
hinfo = hcache[point]
if hinfo['handle'].has_key('delete'):
# Pick contents of an ancestor, doesn't really matter
cache[point]['info'] = cache[hinfo['precursors'][0][0]].copy()
cache[point]['info']['delete'] = hinfo['handle']['delete']
# put together the precursor list and decrement refcounts
precursors = []
for pre, foo in hinfo['precursors']:
precursors.append(cache[pre]['info'])
cache[pre]['refcount'] -= 1
if cache[pre]['refcount'] == 0:
del cache[pre]
if hinfo['handle'].has_key('delete'):
# This has to be done after decrementing refcounts, whereas the
# content setting has to be done before.
continue
# read the diff
if dcache.has_key(point):
diff = dcache[point]
else:
diff = _read_diff(hinfo, hfile)
if diff is None:
if len(hinfo['precursors']) > 1:
raise HistoryError, 'cannot automatically merge changes'
raise HistoryError, 'change with no diff'
diff = bdecode(zlib.decompress(diff))
# finally, get the contents
cache[point]['info'] = _handle_contents_at_point(point, hinfo,
precursors, diff,
replayfunc=replayfunc)
hfile.close()
cache[change]['info']['type'] = staticinfo['type']
return cache[change]['info']
def _handle_contents_at_point(point, hinfo, precursors, diff, replayfunc=replay):
state = {}
matches = []
for pre, index in hinfo['precursors']:
matches.append(diff['matches'][index])
if diff.has_key('add'):
if precursors != []:
raise HistoryError, 'handle already exists'
elif precursors == []:
raise HistoryError, 'cannot modify non-existent file'
if diff.has_key('delete'):
state['delete'] = diff['delete']
if not state.has_key('delete'):
fpre = []
for pre in precursors:
fpre.append((pre['lines'], pre['line points'], pre['points']))
try:
lines, line_points, points = replayfunc(fpre, matches,
diff['newlines'], point)
except MergeError, msg:
raise HistoryError, 'merge error: ' + str(msg)
except KeyError:
raise HistoryError, 'malformed change'
points.append(point)
state['lines'] = lines
state['line points'] = line_points
state['points'] = points
return state
def print_file_with_points(pre):
def _print_points(line_points):
ps = []
for line_point in line_points:
ps.append(binascii.hexlify(line_point))
return ', '.join(ps)
lines, line_points, points = pre
out = [_print_points(line_points[0])]
for i in xrange(len(lines)):
out.append(lines[i])
out.append(_print_points(line_points[i+1]))
return '\n'.join(out)
from merge import _find_conflict
def print_conflict(co, fpre):
p1, p2 = fpre[0], fpre[1]
olines, oline_points = _find_conflict(fpre[0][0], fpre[0][1], fpre[0][2],
fpre[1][0], fpre[1][1], fpre[1][2])[:2]
ls = []
offset = [0, 0]
for i in xrange(len(olines)):
l = olines[i]
if type(l) is str:
offset[0] += 1
offset[1] += 1
continue
print '@@ -%d,%d +%d,%d @@' % (offset[0], len(l[0]), offset[0], len(l[1]))
offset[0] += len(l[0])
offset[1] += len(l[1])
lp = oline_points[i]
ls.append('<<<<<<< local')
ps = ', '.join([short_id(co, p) for p in lp[0][0]])
ls.append(ps)
for j in xrange(len(l[0])):
ls.append(l[0][j])
ps = ', '.join([short_id(co, p) for p in lp[0][j+1]])
ls.append(ps)
ls.append('=======')
ps = ', '.join([short_id(co, p) for p in lp[1][0]])
ls.append(ps)
for j in xrange(len(l[1])):
ls.append(l[1][j])
ps = ', '.join([short_id(co, p) for p in lp[1][j+1]])
ls.append(ps)
ls.append('>>>>>>> remote')
return '\n'.join(ls)
def rebuild_from_points(co, points, txn):
co.changesdb.truncate(txn)
co.branchdb.truncate(txn)
co.branchmapdb.truncate(txn)
co.names.indexdb.truncate(txn)
co.names.dagdb.truncate(txn)
co.contents.indexdb.truncate(txn)
# we don't truncate the cdagdb because it contains the offsets and lengths
# for the diffs in the files, which we can't recreate. the sync below will
# read those parameters out and rewrite the cdagdb, anyway.
co.linforepo.put('branchmax', bencode(0), txn=txn)
cdagdb = co.contents.dagdb
for key, value in cdagdb.items(txn):
if len(key) != 40:
continue
if not bdecode(value).has_key('handle'):
cdagdb.delete(key, txn=txn)
for point in points:
sync_history(co, point, txn)
def clean_merge_point(info):
if info['handles'] != {}:
return 0
if len(info['precursors']) != 2:
return 0
if info.has_key('comment'):
return 0
return 1
def short_id(co, point):
apoint = binascii.hexlify(point)
length = 3
key = apoint[:length]
cursor = co.changesdb.cursor()
while key.startswith(apoint[:length]) and length < len(apoint):
length += 1
try:
key, value = cursor.set_range(apoint[:length])
except (db.DBNotFoundError, TypeError):
break
if key != apoint:
continue
foo = cursor.next()
if foo is None:
break
key, value = foo
cursor.close()
return apoint[:length]
class ChangeNotKnown(Exception): pass
class ChangeNotUnique(Exception): pass
class ChangeBadRepository(Exception): pass
def long_id(co, point):
if point.startswith('cdv://'):
key = repo_head(co, tuple_to_server(server_to_tuple(point)))
if key is None:
raise ChangeBadRepository, point
return key
cursor = co.changesdb.cursor()
try:
key, value = cursor.set_range(point)
except (db.DBNotFoundError, TypeError):
cursor.close()
raise ChangeNotKnown, point
if not key.startswith(point):
cursor.close()
raise ChangeNotKnown, point
try:
key2, value = cursor.next()
except (db.DBNotFoundError, TypeError):
cursor.close()
return binascii.unhexlify(key)
if key2.startswith(point):
keys = [key]
while key2.startswith(point):
keys.append(key2)
try:
key2, value = cursor.next()
except (db.DBNotFoundError, TypeError):
break
cursor.close()
raise ChangeNotUnique, (point, keys)
cursor.close()
return binascii.unhexlify(key)
def repo_head(co, repo):
if repo is None:
return None
repo = tuple_to_server(server_to_tuple(repo))
return co.linforepo.get(repo)
def server_to_tuple(server_string):
if server_string.startswith('cdv://'):
server_string = server_string[6:]
temp = server_string.split('/', 1)
if len(temp) != 2 or temp[1] == '':
repo = None
else:
repo = temp[1]
if repo[-1] == '/':
repo = repo[:-1]
temp = temp[0].split(':', 1)
if len(temp) == 1:
port = 6601
else:
try:
port = int(temp[1])
except ValueError:
return None
server_string = temp[0]
return (temp[0], port, repo)
def tuple_to_server(tuple):
return 'cdv://%s:%d/%s' % tuple
def print_change(co, change, changeset):
escape = saxutils.escape
output = []
output.append("<change>")
output.append("<changenumber>" + binascii.hexlify(change) + "</changenumber>")
output.append("<short-changenumber>" + short_id(co, change) + "</short-changenumber>")
output.append("<user>" + escape(changeset['user']) + "</user>")
try:
output.append("<comment>" + escape(changeset['comment']) + "</comment>")
except KeyError:
pass
output.append("<date>" + str(changeset['time']) + "</date>")
output.append("<pretty-date>" + strftime('%a %b %d %H:%M:%S %Y %Z', localtime(changeset['time'])) + "</pretty-date>")
adds, deletes, renames, mods = {}, {}, {}, {}
for handle, value in changeset['handles'].items():
if value.has_key('add'):
adds[handle] = value['add']
else:
if value.has_key('delete'):
deletes[handle] = 1
if value.has_key('name'):
renames[handle] = 1
if value.has_key('hash'):
mods[handle] = 1
output.append("<added-files>")
for handle, info in adds.items():
output.append("<file>")
output.append("<name>" + escape(fullpath_at_point(co, handle, change)) + "</name>")
output.append("<type>" + info['type'] + "</type>")
output.append("</file>")
output.append("</added-files>")
output.append("<deleted-files>")
for handle in deletes.keys():
output.append("<file>")
output.append("<name>" + escape(fullpath_at_point(co, handle, change)) + "</name>")
output.append("</file>")
output.append("</deleted-files>")
output.append("<renamed-files>")
for handle in renames.keys():
output.append("<file>")
output.append("<name>" + escape(fullpath_at_point(co, handle, change)) + "</name>")
output.append("</file>")
output.append("</renamed-files>")
output.append("<modified-files>")
for handle in mods.keys():
output.append("<file>")
output.append("<name>" + escape(fullpath_at_point(co, handle, change)) + "</name>")
output.append("</file>")
output.append("</modified-files>")
output.append("</change>")
return output
def dump_changeinfo(co, change, repo=None):
output = []
changeset = bdecode(co.lcrepo.get(change))
if not clean_merge_point(changeset):
raise ValueError
output.append("<root>")
if repo:
output.append("<repository>" + saxutils.escape(repo) + "</repository>")
output.append("<changenumber>" + binascii.hexlify(change) + "</changenumber>")
output.append("<short-changenumber>" + short_id(co, change) + "</short-changenumber>")
output.append("<committer>" + saxutils.escape(changeset['user']) + "</committer>")
output.append("<date>" + str(changeset['time']) + "</date>")
for change in changes_in_branch(co, [changeset['precursors'][0]],
changeset['precursors'][1:], None):
changeset = bdecode(co.lcrepo.get(change))
if not clean_merge_point(changeset):
output.extend(print_change(co, change, changeset))
output.append("</root>\n")
return '\n'.join(output)
def db_get(co, cdb, key, txn):
try:
cache = co.db_cache[db]
except KeyError:
cache = co.db_cache[db] = {}
if key in cache:
return cache[key]
cache[key] = bdecode(cdb.get(key, txn=txn))
#try:
# return cache[key]
#except KeyError:
# cache[key] = bdecode(cdb.get(key, txn=txn))
return cache[key]
def db_put(co, cdb, key, value, txn):
cdb.put(key, bencode(value), txn=txn)
try:
cache = co.db_cache[db]
except KeyError:
cache = co.db_cache[db] = {}
cache[key] = value
try:
import psyco
psyco.bind(_is_ancestor, 1)
psyco.bind(handle_last_modified, 1)
except ImportError:
pass
|