equal
deleted
inserted
replaced
204 p2 = rewindmap.get(p2, p2) |
204 p2 = rewindmap.get(p2, p2) |
205 |
205 |
206 updates = [] |
206 updates = [] |
207 if len(ctx.parents()) > 1: |
207 if len(ctx.parents()) > 1: |
208 updates = ctx.parents() |
208 updates = ctx.parents() |
209 extradict = {b'extra': extra} |
209 commitopts = {b'extra': extra, b'date': ctx.date()} |
210 |
210 |
211 new, unusedvariable = rewriteutil.rewrite(unfi, ctx, updates, ctx, |
211 new, unusedvariable = rewriteutil.rewrite(unfi, ctx, updates, ctx, |
212 [p1, p2], |
212 [p1, p2], |
213 commitopts=extradict) |
213 commitopts=commitopts) |
214 |
214 |
215 obsolete.createmarkers(unfi, [(ctx, (unfi[new],))], |
215 obsolete.createmarkers(unfi, [(ctx, (unfi[new],))], |
216 flag=identicalflag, operation=b'rewind') |
216 flag=identicalflag, operation=b'rewind') |
217 |
217 |
218 return new |
218 return new |