Patchwork D3944: rebase: in --confirm option just abort if hit a conflict

login
register
mail settings
Submitter phabricator
Date July 14, 2018, 2:19 p.m.
Message ID <2938461659c7c05faf11df13bce7e7a4@localhost.localdomain>
Download mbox | patch
Permalink /patch/32846/
State Not Applicable
Headers show

Comments

phabricator - July 14, 2018, 2:19 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb3d0c97a0820: rebase: in --confirm option just abort if hit a conflict (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3944?vs=9592&id=9594

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

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

CHANGE DETAILS




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

Patch

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
@@ -472,14 +472,11 @@ 
   o  0:cb9a9f314b8b test
      a
   
-  $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
-  > n
-  > EOF
+  $ hg rebase -s 4 -d . --keep --confirm
   starting in-memory rebase
   rebasing 4:e860deea161a "e"
   merging e
   hit a merge conflict
-  apply changes (yn)? n
   [1]
   $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
   @  9:906d72f66a59 test
@@ -512,58 +509,3 @@ 
   o  0:cb9a9f314b8b test
      a
   
-
-  $ hg rebase -s 4 -d . --keep --config ui.interactive=True --confirm << EOF
-  > y
-  > EOF
-  starting in-memory rebase
-  rebasing 4:e860deea161a "e"
-  merging e
-  hit a merge conflict
-  apply changes (yn)? y
-  rebasing 4:e860deea161a "e"
-  merging e
-  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
-  unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [1]
-
-  $ echo e>e
-  $ hg resolve --mark --all
-  (no more unresolved files)
-  continue: hg rebase --continue
-  $ hg rebase --continue
-  rebasing 4:e860deea161a "e"
-  $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
-  o  10:9fa3731dd6df test
-  |  e
-  |
-  @  9:906d72f66a59 test
-  |  conflict with e
-  |
-  o  8:12cbf031f469 test
-  |  d
-  |
-  o  7:c83b1da5b1ae test
-  |  c
-  |
-  o  6:baf10c5166d4 test
-  |  g
-  |
-  o  5:6343ca3eff20 test
-  |  f
-  |
-  | o  4:e860deea161a test
-  | |  e
-  | |
-  | o  3:055a42cdd887 test
-  | |  d
-  | |
-  | o  2:177f92b77385 test
-  |/   c
-  |
-  o  1:d2ae7f538514 test
-  |  b
-  |
-  o  0:cb9a9f314b8b test
-     a
-  
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -872,9 +872,6 @@ 
                 rbsrt._prepareabortorcontinue(isabort=True, backup=False,
                                               suppwarns=True)
                 needsabort = False
-                if not ui.promptchoice(_(b'apply changes (yn)?'
-                                         b'$$ &Yes $$ &No')):
-                    return _dorebase(ui, repo, opts, inmemory=False)
             return 1
         else:
             if confirm: