D2301: rebase: sort roots by revision

Submitter	phabricator
Date	Feb. 18, 2018, 5:36 a.m.
Message ID	<differential-rev-PHID-DREV-qfnta2d6yqndsf7qprms-req@phab.mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/28041/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sun, 18 Feb 2018 05:36:05 +0000 To: mercurial-devel@mercurial-scm.org From: "durin42 (Augie Fackler)" <phabricator@mercurial-scm.org> Subject: D2301: rebase: sort roots by revision Message-ID: <differential-rev-PHID-DREV-qfnta2d6yqndsf7qprms-req@phab.mercurial-scm.org> Thread-Topic: D2301: rebase: sort roots by revision Precedence: bulk Thread-Index: MzQyNTgyN2VhMWVmZTJmYzNhNzk2YjE5ZmNh MIME-Version: 1.0 Reply-To: phabricator+D2301+public+27b73aa1f4e1da8b@mercurial-scm.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Feb. 18, 2018, 5:36 a.m.

durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Previously we were sorting them by whatever implicit sort order we got
  between changectx instances. Sorting by rev at least makes some sense,
  so I chose that.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1650,7 +1650,9 @@ 
     roots = list(repo.set('roots(%ld)', sortedsrc[0]))
     if not roots:
         raise error.Abort(_('no matching revisions'))
-    roots.sort()
+    def revof(r):
+        return r.rev()
+    roots = sorted(roots, key=revof)
     state = dict.fromkeys(rebaseset, revtodo)
     emptyrebase = (len(sortedsrc) == 1)
     for root in roots:

Patchwork D2301: rebase: sort roots by revision

Comments

Patch