Patchwork D3140: rebase: remove unnecessary and incorrect handling of nullid

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 6:02 p.m.
Message ID <23485603acc9dabeee9d739a9273e97f@localhost.localdomain>
Download mbox | patch
Permalink /patch/30395/
State Not Applicable
Headers show

Comments

phabricator - April 5, 2018, 6:02 p.m.
martinvonz updated this revision to Diff 7742.
martinvonz edited the summary of this revision.
martinvonz retitled this revision from "rebase: fix explicit handling of nullid in rebase state" to "rebase: remove unnecessary and incorrect handling of nullid".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3140?vs=7741&id=7742

REVISION DETAIL
  https://phab.mercurial-scm.org/D3140

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, quark
Cc: quark, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -21,7 +21,6 @@ 
 
 from mercurial.i18n import _
 from mercurial.node import (
-    nullid,
     nullrev,
     short,
 )
@@ -252,7 +251,7 @@ 
                     else:
                         destrev = legacydest
                     destmap[oldrev] = destrev
-                    if newrev in (nullid, revtodostr):
+                    if newrev == revtodostr:
                         state[oldrev] = revtodo
                         # Legacy compat special case
                     else: