equal
deleted
inserted
replaced
246 oldrev = args[0] |
246 oldrev = args[0] |
247 newrev = args[1] |
247 newrev = args[1] |
248 if newrev in legacystates: |
248 if newrev in legacystates: |
249 continue |
249 continue |
250 if len(args) > 2: |
250 if len(args) > 2: |
251 destnode = args[2] |
251 destrev = repo[args[2]].rev() |
252 else: |
252 else: |
253 destnode = legacydest |
253 destrev = legacydest |
254 destmap[repo[oldrev].rev()] = repo[destnode].rev() |
254 destmap[repo[oldrev].rev()] = destrev |
255 if newrev in (nullid, revtodostr): |
255 if newrev in (nullid, revtodostr): |
256 state[repo[oldrev].rev()] = revtodo |
256 state[repo[oldrev].rev()] = revtodo |
257 # Legacy compat special case |
257 # Legacy compat special case |
258 else: |
258 else: |
259 state[repo[oldrev].rev()] = repo[newrev].rev() |
259 state[repo[oldrev].rev()] = repo[newrev].rev() |