narrow: set opts['narrow'] instead of local variable
authorGregory Szorc <gregory.szorc@gmail.com>
Tue, 11 Sep 2018 15:40:33 -0700
changeset 39545 4afd2af36456
parent 39544 10a8472f6662
child 39546 41aa5dced975
narrow: set opts['narrow'] instead of local variable This will allow the command function in core to infer the presence of the option without duplicating logic. Differential Revision: https://phab.mercurial-scm.org/D4532
hgext/narrow/narrowcommands.py
--- a/hgext/narrow/narrowcommands.py	Tue Sep 11 15:53:12 2018 -0700
+++ b/hgext/narrow/narrowcommands.py	Tue Sep 11 15:40:33 2018 -0700
@@ -66,7 +66,6 @@
     """Wraps clone command, so 'hg clone' first wraps localrepo.clone()."""
     opts = pycompat.byteskwargs(opts)
     wrappedextraprepare = util.nullcontextmanager()
-    opts_narrow = opts['narrow']
     narrowspecfile = opts['narrowspec']
 
     if narrowspecfile:
@@ -87,11 +86,11 @@
         narrowspec.validatepatterns(excludes)
 
         # narrowspec is passed so we should assume that user wants narrow clone
-        opts_narrow = True
+        opts['narrow'] = True
         opts['include'].extend(includes)
         opts['exclude'].extend(excludes)
 
-    if opts_narrow:
+    if opts['narrow']:
         def pullbundle2extraprepare_widen(orig, pullop, kwargs):
             # Create narrow spec patterns from clone flags
             includepats = narrowspec.parsepatterns(opts['include'])
@@ -114,7 +113,7 @@
             '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
 
     def pullnarrow(orig, repo, *args, **kwargs):
-        if opts_narrow:
+        if opts['narrow']:
             repo.requirements.add(repository.NARROW_REQUIREMENT)
             repo._writerequirements()