Patchwork D6434: narrow: remove unrequired compat code for old versions of hg

login
register
mail settings
Submitter phabricator
Date May 22, 2019, 9:47 p.m.
Message ID <differential-rev-PHID-DREV-qivs76qlf2ygsaynwwj2-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/40196/
State Superseded
Headers show

Comments

phabricator - May 22, 2019, 9:47 p.m.
pulkit created this revision.
Herald added a reviewer: durin42.
Herald added a reviewer: martinvonz.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  As the comment says, that if is only required for servers having hg version 3.1
  and 3.2. Any client connecting having hg 3.1 or 3.2 locally and trying to use
  narrow should already be broken taking in account the changes which have been
  done since narrow moved to core.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/narrow/narrowbundle2.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -51,15 +51,11 @@ 
     assert repo.ui.configbool('experimental', 'narrowservebrokenellipses')
 
     cgversions = b2caps.get('changegroup')
-    if cgversions:  # 3.1 and 3.2 ship with an empty value
-        cgversions = [v for v in cgversions
-                      if v in changegroup.supportedoutgoingversions(repo)]
-        if not cgversions:
-            raise ValueError(_('no common changegroup version'))
-        version = max(cgversions)
-    else:
-        raise ValueError(_("server does not advertise changegroup version,"
-                           " can't negotiate support for ellipsis nodes"))
+    cgversions = [v for v in cgversions
+                  if v in changegroup.supportedoutgoingversions(repo)]
+    if not cgversions:
+        raise ValueError(_('no common changegroup version'))
+    version = max(cgversions)
 
     include = sorted(filter(bool, kwargs.get(r'includepats', [])))
     exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))