equal
deleted
inserted
replaced
194 user = unfi.ui.username() |
194 user = unfi.ui.username() |
195 date = unfi.ui.configdate(b'devel', b'default-date') |
195 date = unfi.ui.configdate(b'devel', b'default-date') |
196 if date is None: |
196 if date is None: |
197 date = compat.makedate() |
197 date = compat.makedate() |
198 noise = b"%s\0%s\0%d\0%d" % (ctx.node(), user, date[0], date[1]) |
198 noise = b"%s\0%s\0%d\0%d" % (ctx.node(), user, date[0], date[1]) |
199 extra[b'__rewind-hash__'] = hashlib.sha256(noise).hexdigest() |
199 extra[b'__rewind-hash__'] = hashlib.sha256(noise).hexdigest().encode('ascii') |
200 |
200 |
201 p1 = ctx.p1().node() |
201 p1 = ctx.p1().node() |
202 p1 = rewindmap.get(p1, p1) |
202 p1 = rewindmap.get(p1, p1) |
203 p2 = ctx.p2().node() |
203 p2 = ctx.p2().node() |
204 p2 = rewindmap.get(p2, p2) |
204 p2 = rewindmap.get(p2, p2) |