From patchwork Fri Jul 13 12:23:52 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D3939: rebase: correct misleading message in --confirm option
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 32835
Message-Id: <24b8036d18918e519fd47dadb1622bff@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 13 Jul 2018 12:23:52 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG35b3f686157a: rebase: correct misleading message in --confirm option (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3939?vs=9575&id=9587

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

AFFECTED FILES
  hgext/rebase.py
  tests/test-rebase-inmemory.t

CHANGE DETAILS




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

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -369,7 +369,7 @@
   $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF
   > n
   > EOF
-  starting rebase...
+  starting in-memory rebase
   rebasing 2:177f92b77385 "c"
   rebasing 3:055a42cdd887 "d"
   rebasing 4:e860deea161a "e"
@@ -400,7 +400,7 @@
   $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF
   > y
   > EOF
-  starting rebase...
+  starting in-memory rebase
   rebasing 2:177f92b77385 "c"
   rebasing 3:055a42cdd887 "d"
   rebasing 4:e860deea161a "e"
@@ -475,7 +475,7 @@
   $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
   > n
   > EOF
-  starting rebase...
+  starting in-memory rebase
   rebasing 4:e860deea161a "e"
   merging e
   hit a merge conflict
@@ -516,7 +516,7 @@
   $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
   > y
   > EOF
-  starting rebase...
+  starting in-memory rebase
   rebasing 4:e860deea161a "e"
   merging e
   hit a merge conflict
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -854,7 +854,7 @@
     rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
     confirm = opts.get('confirm')
     if confirm:
-        ui.status(_('starting rebase...\n'))
+        ui.status(_('starting in-memory rebase\n'))
     else:
         ui.status(_('starting dry-run rebase; repository will not be '
                     'changed\n'))