# HG changeset patch # User Adrian Buehlmann # Date 2011-06-03 11:10:22 # Node ID 4276e320258580718d80cea0a3bfba7681cb48d0 # Parent 826a13720fbc9048a1b22dc654eecb989c7c6cdf prepush: show details about new remote heads with --verbose previously, this info was only shown with --debug Note that the new remote heads are only shown if the command aborts, that is, they are *not* shown if --force was specified. See also change 91cb08a9e7fb. diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -173,9 +173,9 @@ def prepush(repo, remote, force, revs, n else: hint = _("did you forget to merge? " "use push -f to force") - repo.ui.debug("new remote heads on branch '%s'\n" % branch) + repo.ui.note("new remote heads on branch '%s'\n" % branch) for h in dhs: - repo.ui.debug("new remote head %s\n" % short(h)) + repo.ui.note("new remote head %s\n" % short(h)) if error: raise util.Abort(error, hint=hint) diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t --- a/tests/test-push-warn.t +++ b/tests/test-push-warn.t @@ -124,16 +124,22 @@ (did you forget to merge? use push -f to force) [255] - $ hg push -r 3 -r 4 ../c + $ hg push -v -r 3 -r 4 ../c pushing to ../c searching for changes + all remote heads known locally + new remote heads on branch 'default' + new remote head a5dda829a167 + new remote head ee8fbc7a0295 abort: push creates new remote head a5dda829a167! (did you forget to merge? use push -f to force) [255] - $ hg push -f -r 3 -r 4 ../c + $ hg push -v -f -r 3 -r 4 ../c pushing to ../c searching for changes + all remote heads known locally + 2 changesets found adding changesets adding manifests adding file changes