D3140: rebase: remove unnecessary and incorrect handling of nullid
This revision was automatically updated to reflect the committed changes. Closed by commit rHG953db9e00eeb: rebase: remove unnecessary and incorrect handling of nullid (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3140?vs=7742&id=7750 REVISION DETAIL https://phab.mercurial-scm.org/D3140 AFFECTED FILES hgext/rebase.py CHANGE DETAILS 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: To: martinvonz, #hg-reviewers, quark, pulkit Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3140: rebase: remove unnecessary and incorrect handling of nullid
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 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: To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3140: rebase: remove unnecessary and incorrect handling of nullid
martinvonz added a comment. In https://phab.mercurial-scm.org/D3140#50376, @quark wrote: > Hmm... maybe just remove it. Done. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3140 To: martinvonz, #hg-reviewers, quark Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
