comparison hgext/rebase.py @ 37376:25940470c7e6

rebase: make "destnode" consistently a revnum and rename it to "destrev" Differential Revision: https://phab.mercurial-scm.org/D3138
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 05 Apr 2018 10:12:10 -0700
parents b48b7b130d08
children 3dfd7f018c69
comparison
equal deleted inserted replaced
37375:a973bb92ab71 37376:25940470c7e6
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()