equal
deleted
inserted
replaced
95 some = True |
95 some = True |
96 for line in f: |
96 for line in f: |
97 subhex, objhex = line.split() |
97 subhex, objhex = line.split() |
98 suc = bin(subhex) |
98 suc = bin(subhex) |
99 prec = bin(objhex) |
99 prec = bin(objhex) |
100 sucs = (suc==nullid) and [] or [suc] |
100 sucs = (suc == nullid) and [] or [suc] |
101 meta = { |
101 meta = { |
102 'date': '%i %i' % util.makedate(), |
102 'date': '%i %i' % util.makedate(), |
103 'user': ui.username(), |
103 'user': ui.username(), |
104 } |
104 } |
105 try: |
105 try: |
106 store.create(tr, prec, sucs, 0, metadata=meta) |
106 store.create(tr, prec, sucs, 0, metadata=meta) |
107 cnt += 1 |
107 cnt += 1 |
135 except LOOKUP_ERRORS: |
135 except LOOKUP_ERRORS: |
136 pass |
136 pass |
137 |
137 |
138 oldmark['date'] = '%i %i' % tuple(oldmark['date']) |
138 oldmark['date'] = '%i %i' % tuple(oldmark['date']) |
139 meta = dict((k.encode('utf-8'), v.encode('utf-8')) |
139 meta = dict((k.encode('utf-8'), v.encode('utf-8')) |
140 for k, v in oldmark.iteritems()) |
140 for k, v in oldmark.iteritems()) |
141 try: |
141 try: |
142 succs = [bin(n) for n in oldsubjects] |
142 succs = [bin(n) for n in oldsubjects] |
143 succs = [n for n in succs if n != nullid] |
143 succs = [n for n in succs if n != nullid] |
144 store.create(tr, bin(oldobject), succs, |
144 store.create(tr, bin(oldobject), succs, |
145 0, metadata=meta) |
145 0, metadata=meta) |
146 cnt += 1 |
146 cnt += 1 |
147 except ValueError: |
147 except ValueError: |
148 repo.ui.write_err("invalid marker %s -> %s\n" |
148 msg = "invalid marker %s -> %s\n" |
149 % (oldobject, oldsubjects)) |
149 msg %= (oldobject, oldsubjects) |
|
150 repo.ui.write_err(msg) |
150 err += 1 |
151 err += 1 |
151 unlink.append(repo.sjoin('obsoletemarkers')) |
152 unlink.append(repo.sjoin('obsoletemarkers')) |
152 tr.close() |
153 tr.close() |
153 for path in unlink: |
154 for path in unlink: |
154 util.unlink(path) |
155 util.unlink(path) |