Patchwork D2398: histedit: use the new stack definition for histedit

login
register
mail settings
Submitter phabricator
Date Feb. 23, 2018, 10:36 a.m.
Message ID <differential-rev-PHID-DREV-ztxrsl62n3vtpyyhmt3q-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28269/
State Superseded
Headers show

Comments

phabricator - Feb. 23, 2018, 10:36 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Now that we have a common stack definition, use it in the hg histedit command.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/destutil.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 24, 2018, 2:40 a.m.
indygreg requested changes to this revision.
indygreg added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> destutil.py:345
>      """Default base revision to edit for `hg histedit`."""
> -    default = ui.config('histedit', 'defaultrev', histeditdefaultrevset)
> -    if default:
> +    default = ui.config('histedit', 'defaultrev', None)
> +

This means we can mark the default value for this option as `None`.

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
phabricator - March 21, 2018, 2:19 p.m.
yuja added inline comments.

INLINE COMMENTS

> destutil.py:356
> +        revs.sort()
> +        return revs.first()
>  

Can be `return revs.min()`?

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, indygreg, durin42
Cc: yuja, indygreg, mercurial-devel
phabricator - April 5, 2018, 4:25 p.m.
lothiraldan marked an inline comment as done.
lothiraldan added inline comments.

INLINE COMMENTS

> yuja wrote in destutil.py:356
> Can be `return revs.min()`?

It seems so and it's much simpler to read. I have sent a follow-up: https://phab.mercurial-scm.org/D3137

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, indygreg, durin42
Cc: yuja, indygreg, mercurial-devel

Patch

diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -340,18 +340,20 @@ 
                                 onheadcheck=onheadcheck, destspace=destspace)
     return repo[node].rev()
 
-histeditdefaultrevset = 'reverse(only(.) and not public() and not ::merge())'
-
 def desthistedit(ui, repo):
     """Default base revision to edit for `hg histedit`."""
-    default = ui.config('histedit', 'defaultrev', histeditdefaultrevset)
-    if default:
+    default = ui.config('histedit', 'defaultrev', None)
+
+    if default is None:
+        revs = stack.getstack(repo)
+    elif default:
         revs = scmutil.revrange(repo, [default])
-        if revs:
-            # The revset supplied by the user may not be in ascending order nor
-            # take the first revision. So do this manually.
-            revs.sort()
-            return revs.first()
+
+    if revs:
+        # The revset supplied by the user may not be in ascending order nor
+        # take the first revision. So do this manually.
+        revs.sort()
+        return revs.first()
 
     return None