Patchwork D3752: graft: move `if continue` to elif and add new line

login
register
mail settings
Submitter phabricator
Date June 25, 2018, 3:06 p.m.
Message ID <8e1c65e622d6714be996d7cfdf21d463@localhost.localdomain>
Download mbox | patch
Permalink /patch/32414/
State Not Applicable
Headers show

Comments

phabricator - June 25, 2018, 3:06 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGafb7e15392b9: graft: move `if continue` to elif and add new line (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3752?vs=9274&id=9281

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2199,6 +2199,7 @@ 
 
     cont = False
     graftstate = statemod.cmdstate(repo, 'graftstate')
+
     if opts.get('stop'):
         if opts.get('continue'):
             raise error.Abort(_("cannot use '--continue' and "
@@ -2208,7 +2209,7 @@ 
                 opts.get('currentuser'), opts.get('rev'))):
             raise error.Abort(_("cannot specify any other flag with '--stop'"))
         return _stopgraft(ui, repo, graftstate)
-    if opts.get('continue'):
+    elif opts.get('continue'):
         cont = True
         if revs:
             raise error.Abort(_("can't specify --continue and revisions"))