Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 30891:2915cc1d3429 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: move prompts out of the if (issue5505) Prompts weren't available in the else clause
author Simon Farnsworth <simonfar@fb.com>
date Mon, 20 Mar 2017 04:36:55 -0700
parents 0fbb3a5c188e
children f97e90fa5ad7
line wrap: on
line diff
--- a/mercurial/subrepo.py	Thu Mar 16 12:33:15 2017 -0700
+++ b/mercurial/subrepo.py	Mon Mar 20 04:36:55 2017 -0700
@@ -194,7 +194,9 @@
             r = "%s:%s:%s" % r
         repo.ui.debug("  subrepo %s: %s %s\n" % (s, msg, r))
 
+    promptssrc = filemerge.partextras(labels)
     for s, l in sorted(s1.iteritems()):
+        prompts = None
         a = sa.get(s, nullstate)
         ld = l # local state with possible dirty flag for compares
         if wctx.sub(s).dirty():
@@ -202,9 +204,9 @@
         if wctx == actx: # overwrite
             a = ld
 
+        prompts = promptssrc.copy()
+        prompts['s'] = s
         if s in s2:
-            prompts = filemerge.partextras(labels)
-            prompts['s'] = s
             r = s2[s]
             if ld == r or r == a: # no change or local is newer
                 sm[s] = l
@@ -267,6 +269,7 @@
                 wctx.sub(s).remove()
 
     for s, r in sorted(s2.items()):
+        prompts = None
         if s in s1:
             continue
         elif s not in sa:
@@ -274,6 +277,8 @@
             mctx.sub(s).get(r)
             sm[s] = r
         elif r != sa[s]:
+            prompts = promptssrc.copy()
+            prompts['s'] = s
             if repo.ui.promptchoice(
                 _(' remote%(o)s changed subrepository %(s)s'
                   ' which local%(l)s removed\n'