equal
deleted
inserted
replaced
94 meta = { |
94 meta = { |
95 'date': '%i %i' % util.makedate(), |
95 'date': '%i %i' % util.makedate(), |
96 'user': ui.username(), |
96 'user': ui.username(), |
97 } |
97 } |
98 try: |
98 try: |
99 store.create(tr, prec, sucs, 0, meta) |
99 store.create(tr, prec, sucs, 0, metadata=meta) |
100 cnt += 1 |
100 cnt += 1 |
101 except ValueError: |
101 except ValueError: |
102 repo.ui.write_err("invalid old marker line: %s" |
102 repo.ui.write_err("invalid old marker line: %s" |
103 % (line)) |
103 % (line)) |
104 err += 1 |
104 err += 1 |
133 for k, v in oldmark.iteritems()) |
133 for k, v in oldmark.iteritems()) |
134 try: |
134 try: |
135 succs = [bin(n) for n in oldsubjects] |
135 succs = [bin(n) for n in oldsubjects] |
136 succs = [n for n in succs if n != nullid] |
136 succs = [n for n in succs if n != nullid] |
137 store.create(tr, bin(oldobject), succs, |
137 store.create(tr, bin(oldobject), succs, |
138 0, meta) |
138 0, metadata=meta) |
139 cnt += 1 |
139 cnt += 1 |
140 except ValueError: |
140 except ValueError: |
141 repo.ui.write_err("invalid marker %s -> %s\n" |
141 repo.ui.write_err("invalid marker %s -> %s\n" |
142 % (oldobject, oldsubjects)) |
142 % (oldobject, oldsubjects)) |
143 err += 1 |
143 err += 1 |