[PATCH 4 of 6 "] debugdiscovery: drop duplicated information
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Mar 26 13:04:57 EDT 2019
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at octobus.net>
# Date 1553617571 -3600
# Tue Mar 26 17:26:11 2019 +0100
# Node ID 28e411932f2aadb7e9076cb2edae70aeee216ca6
# Parent 23fcb5645eb86b7bb671c3b64900e4e5bc9c0b33
# EXP-Topic debug-discovery
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 28e411932f2a
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.
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:
More information about the Mercurial-devel
mailing list