From patchwork Fri Feb 7 16:25:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2, of, 2, re] discovery: make "note: unsynced remote changes!" less serious than a warning From: Mads Kiilerich X-Patchwork-Id: 3511 Message-Id: To: mercurial-devel@selenic.com Date: Fri, 07 Feb 2014 17:25:09 +0100 # HG changeset patch # User Mads Kiilerich # Date 1391790252 -3600 # Fri Feb 07 17:24:12 2014 +0100 # Node ID b0540dc31d24a7a53939586ee818be32f694466f # Parent c024b6d06d945181f595888b6b731ce43bf03793 discovery: make "note: unsynced remote changes!" less serious than a warning This situation is not necessarily a problem and do not deserve a warning. It is just some information that can guide the user in understanding what is going on. Making it 'debug' would usually not give the hint when it is relevant so we make it a 'status' message. diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -315,11 +315,11 @@ if unsynced: heads = ' '.join(short(h) for h in unsynced) if branch is None: - repo.ui.warn(_("remote has heads that are " - "not known locally: %s\n") % heads) + repo.ui.status(_("remote has heads that are " + "not known locally: %s\n") % heads) else: - repo.ui.warn(_("remote has heads on branch '%s' that are " - "not known locally: %s\n") % (branch, heads)) + repo.ui.status(_("remote has heads on branch '%s' that are " + "not known locally: %s\n") % (branch, heads)) if remoteheads is None: if len(newhs) > 1: dhs = list(newhs)