Patchwork [4,of,6,"V2] debugdiscovery: drop duplicated information

login
register
mail settings
Submitter Pierre-Yves David
Date March 27, 2019, 11:23 a.m.
Message ID <f4139bc0601f18619f45.1553685792@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/39395/
State Accepted
Headers show

Comments

Pierre-Yves David - March 27, 2019, 11:23 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1553617571 -3600
#      Tue Mar 26 17:26:11 2019 +0100
# Node ID f4139bc0601f18619f45d65ff2a62dc9f00be6a7
# Parent  d593a516f74bdf4dd90e46bd16a6611356503036
# EXP-Topic debug-discovery
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r f4139bc0601f
debugdiscovery: drop duplicated information

The old line informing about the local being a superset or subset of the remote
is redundant with the newly introduced data. So we drop it.

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -851,10 +851,6 @@  def debugdiscovery(ui, repo, remoteurl="
 
     ui.write(("common heads: %s\n") %
              " ".join(sorted(short(n) for n in common)))
-    if lheads <= common:
-        ui.write(("local is subset\n"))
-    elif rheads <= common:
-        ui.write(("remote is subset\n"))
 
 _chunksize = 4 << 10
 
diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -57,7 +57,6 @@  Small superset:
     common:                      7
     missing:                     0
   common heads: 01241442b3c2 b5714e113bc0
-  local is subset
   
   % -- a -> b set
   comparing with b
@@ -78,7 +77,6 @@  Small superset:
     common:                      7
     missing:                     0
   common heads: 01241442b3c2 b5714e113bc0
-  local is subset
   
   % -- a -> b set (tip only)
   comparing with b
@@ -118,7 +116,6 @@  Small superset:
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
-  remote is subset
   
   % -- b -> a set
   comparing with a
@@ -139,7 +136,6 @@  Small superset:
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
-  remote is subset
   
   % -- b -> a set (tip only)
   comparing with a
@@ -160,7 +156,6 @@  Small superset:
     common:                      7
     missing:                     8
   common heads: 01241442b3c2 b5714e113bc0
-  remote is subset
 
 
 Many new: