Patchwork rebase: drop --style option

login
register
mail settings
Submitter Yuya Nishihara
Date Nov. 2, 2017, 1:33 p.m.
Message ID <3fef2926f7dc84c8840b.1509629628@mimosa>
Download mbox | patch
Permalink /patch/25348/
State Accepted
Headers show

Comments

Yuya Nishihara - Nov. 2, 2017, 1:33 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1508572880 -32400
#      Sat Oct 21 17:01:20 2017 +0900
# Node ID 3fef2926f7dc84c8840b8d1d592f2e650ce0a7ee
# Parent  946badd65a139cbb50150f23471db136a42d7814
rebase: drop --style option

It existed from the very start, but I don't think the rebase command does
support log-like templates.
Augie Fackler - Nov. 2, 2017, 2:02 p.m.
> On Nov 2, 2017, at 09:33, Yuya Nishihara <yuya@tcha.org> wrote:
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1508572880 -32400
> #      Sat Oct 21 17:01:20 2017 +0900
> # Node ID 3fef2926f7dc84c8840b8d1d592f2e650ce0a7ee
> # Parent  946badd65a139cbb50150f23471db136a42d7814
> rebase: drop --style option

queued, thanks

> 
> It existed from the very start, but I don't think the rebase command does
> support log-like templates.
> 
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -53,7 +53,6 @@ from mercurial import (
> )
> 
> release = lock.release
> -templateopts = cmdutil.templateopts
> 
> # The following constants are used throughout the rebase module. The ordering of
> # their values must be maintained.
> @@ -594,7 +593,7 @@ class rebaseruntime(object):
>     ('t', 'tool', '', _('specify merge tool')),
>     ('c', 'continue', False, _('continue an interrupted rebase')),
>     ('a', 'abort', False, _('abort an interrupted rebase'))] +
> -     templateopts,
> +    cmdutil.formatteropts,
>     _('[-s REV | -b REV] [-d REV] [OPTION]'))
> def rebase(ui, repo, **opts):
>     """move changeset (and descendants) to a different branch
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -53,7 +53,6 @@  from mercurial import (
 )
 
 release = lock.release
-templateopts = cmdutil.templateopts
 
 # The following constants are used throughout the rebase module. The ordering of
 # their values must be maintained.
@@ -594,7 +593,7 @@  class rebaseruntime(object):
     ('t', 'tool', '', _('specify merge tool')),
     ('c', 'continue', False, _('continue an interrupted rebase')),
     ('a', 'abort', False, _('abort an interrupted rebase'))] +
-     templateopts,
+    cmdutil.formatteropts,
     _('[-s REV | -b REV] [-d REV] [OPTION]'))
 def rebase(ui, repo, **opts):
     """move changeset (and descendants) to a different branch