comparison hgext/evolve.py @ 1063:742c1ce79a96

merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 18 Aug 2014 15:57:44 -0700
parents 00bc31523074 f3867e60d072
children 5d063fed9e3d
comparison
equal deleted inserted replaced
1059:d1baf69b935c 1063:742c1ce79a96
1017 ctx = unfi[rev] 1017 ctx = unfi[rev]
1018 meta = obsolete.decodemeta(mark[3]) 1018 meta = obsolete.decodemeta(mark[3])
1019 for i, p in enumerate(ctx.parents(), 1): 1019 for i, p in enumerate(ctx.parents(), 1):
1020 meta['p%i' % i] = p.hex() 1020 meta['p%i' % i] = p.hex()
1021 before = len(store._all) 1021 before = len(store._all)
1022 store.create(tr, mark[0], mark[1], mark[2], meta) 1022 store.create(tr, mark[0], mark[1], mark[2], metadata=meta)
1023 if len(store._all) - before: 1023 if len(store._all) - before:
1024 ui.write('created new markers for %i\n' % rev) 1024 ui.write('created new markers for %i\n' % rev)
1025 ui.progress(pgop, idx, total=pgtotal) 1025 ui.progress(pgop, idx, total=pgtotal)
1026 tr.close() 1026 tr.close()
1027 ui.progress(pgop, None) 1027 ui.progress(pgop, None)