D4931: narrow: only send the narrowspecs back if ACL in play

[pulkit (Pulkit Goyal)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcb516a854bc7: narrow: only send the narrowspecs back if ACL in play (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4931?vs=12192&id=12226

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

AFFECTED FILES
  mercurial/exchange.py
  tests/test-narrow-rebase.t
  tests/test-narrow-widen-no-ellipsis.t

CHANGE DETAILS

diff --git a/tests/test-narrow-widen-no-ellipsis.t b/tests/test-narrow-widen-no-ellipsis.t
--- a/tests/test-narrow-widen-no-ellipsis.t
+++ b/tests/test-narrow-widen-no-ellipsis.t
@@ -137,7 +137,6 @@
   adding file changes
   added 5 changesets with 4 changes to 2 files
   new changesets *:* (glob)
-  3 local changesets published
   (run 'hg update' to get a working copy)
   $ hg update -r 'desc("add wider")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-narrow-rebase.t b/tests/test-narrow-rebase.t
--- a/tests/test-narrow-rebase.t
+++ b/tests/test-narrow-rebase.t
@@ -86,7 +86,6 @@
 
   $ hg update -q 'desc("conflicting outside/f1")'
   $ hg phase -f -d .
-  no phases changed
   $ hg rebase -d 'desc("modify outside/f1")'
   rebasing 4:707c035aadb6 "conflicting outside/f1"
   abort: conflict in file 'outside/f1' is outside narrow clone
diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1907,6 +1907,7 @@
     new_args = {}
     new_args.update(kwargs)
     new_args[r'narrow'] = True
+    new_args[r'narrow_acl'] = True
     new_args[r'includepats'] = req_includes
     if req_excludes:
         new_args[r'excludepats'] = req_excludes
@@ -2171,7 +2172,8 @@
     if 'treemanifest' in repo.requirements:
         part.addparam('treemanifest', '1')
 
-    if kwargs.get(r'narrow', False) and (include or exclude):
+    if (kwargs.get(r'narrow', False) and kwargs.get('narrow_acl', False)
+        and (include or exclude)):
         narrowspecpart = bundler.newpart('narrow:spec')
         if include:
             narrowspecpart.addparam(



To: pulkit, durin42, martinvonz, #hg-reviewers
Cc: indygreg, mercurial-devel