Patchwork D597: cmdutil: moving first use of newid closer to its use in amend

login
register
mail settings
Submitter phabricator
Date Sept. 2, 2017, 6:40 a.m.
Message ID <14073e101faa18a177e8567f6e17670e@localhost.localdomain>
Download mbox | patch
Permalink /patch/23621/
State Not Applicable
Headers show

Comments

phabricator - Sept. 2, 2017, 6:40 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa352ca63dc79: amend: moving first assignment of newid closer to its use (authored by singhsrb).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D597?vs=1529&id=1574

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: singhsrb, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3039,7 +3039,6 @@ 
     ui.note(_('amending changeset %s\n') % old)
     base = old.p1()
 
-    newid = None
     with repo.wlock(), repo.lock(), repo.transaction('amend'):
         # See if we got a message from -m or -l, if not, open the editor
         # with the message of the changeset to amend
@@ -3164,6 +3163,7 @@ 
             return old.node()
 
         ph = repo.ui.config('phases', 'new-commit', phases.draft)
+        newid = None
         try:
             if opts.get('secret'):
                 commitphase = 'secret'