# HG changeset patch # User Alexis S. L. Carvalho # Date 1173291963 10800 # Node ID b2d9e553cdc8ca99f134b78de7ccd3c39cfa3c7d # Parent 939de0d20a67d103a03f37b5e9ef2532e68bf13f incoming/outgoing: print the name of the other repo diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1535,6 +1535,7 @@ def incoming(ui, repo, source="default", setremoteconfig(ui, opts) other = hg.repository(ui, source) + ui.status(_('comparing with %s\n') % source) incoming = repo.findincoming(other, force=opts["force"]) if not incoming: try: @@ -1819,6 +1820,7 @@ def outgoing(ui, repo, dest=None, **opts revs = [repo.lookup(rev) for rev in opts['rev']] other = hg.repository(ui, dest) + ui.status(_('comparing with %s\n') % dest) o = repo.findoutgoing(other, force=opts['force']) if not o: ui.status(_("no changes found\n")) diff --git a/tests/test-bundle.out b/tests/test-bundle.out --- a/tests/test-bundle.out +++ b/tests/test-bundle.out @@ -150,6 +150,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 +comparing with bundle://../full.hg searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 @@ -179,6 +180,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.3m +comparing with ../partial2 searching for changes changeset: 4:5f4f3ceb285e parent: 0:5649c9d34dd8 @@ -211,6 +213,7 @@ summary: 0.3m abort: No such file or directory: ../does-not-exist.hg 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes +comparing with ../bundle.hg searching for changes changeset: 2:ed1b79f46b9a tag: tip diff --git a/tests/test-empty-group.out b/tests/test-empty-group.out --- a/tests/test-empty-group.out +++ b/tests/test-empty-group.out @@ -21,6 +21,7 @@ adding manifests adding file changes added 4 changesets with 3 changes to 3 files 3 files updated, 0 files merged, 0 files removed, 0 files unresolved +comparing with b searching for changes changeset: 4:fdb3c546e859 tag: tip @@ -30,6 +31,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m2 +comparing with c searching for changes changeset: 3:f40f830c0024 parent: 2:de997049e034 @@ -38,6 +40,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m1 +comparing with c searching for changes changeset: 3:f40f830c0024 tag: tip @@ -47,6 +50,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m1 +comparing with b searching for changes changeset: 3:fdb3c546e859 tag: tip diff --git a/tests/test-incoming-outgoing.out b/tests/test-incoming-outgoing.out --- a/tests/test-incoming-outgoing.out +++ b/tests/test-incoming-outgoing.out @@ -4,6 +4,7 @@ checking manifests crosschecking files in changesets and manifests checking files 1 files, 9 changesets, 9 total revisions +comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -50,6 +51,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 +comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -75,6 +77,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 +comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -121,6 +124,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 +comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -146,6 +150,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 4 +comparing with http://localhost:20059/ changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -192,6 +197,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 +comparing with test changeset: 0:9cb21d99fe27 user: test date: Mon Jan 12 13:46:40 1970 +0000 @@ -266,6 +272,7 @@ checking manifests crosschecking files in changesets and manifests checking files 1 files, 14 changesets, 14 total revisions +comparing with test searching for changes changeset: 9:3741c3ad1096 user: test @@ -293,6 +300,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 13 +comparing with http://localhost:20059/ searching for changes changeset: 9:3741c3ad1096 user: test @@ -320,6 +328,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 13 +comparing with http://localhost:20059/ searching for changes changeset: 9:3741c3ad1096 user: test diff --git a/tests/test-init.out b/tests/test-init.out --- a/tests/test-init.out +++ b/tests/test-init.out @@ -3,6 +3,7 @@ adding foo #test failure abort: repository local already exists! # init+push to remote2 +comparing with local changeset: 0:c4e059d443be tag: tip user: test diff --git a/tests/test-ssh.out b/tests/test-ssh.out --- a/tests/test-ssh.out +++ b/tests/test-ssh.out @@ -33,6 +33,7 @@ no changes found # local change # updating rc # find outgoing +comparing with ssh://user@dummy/remote searching for changes changeset: 1:572896fe480d tag: tip @@ -41,6 +42,7 @@ date: Mon Jan 12 13:46:40 1970 +0 summary: add # find incoming on the remote side +comparing with ssh://user@dummy/local searching for changes changeset: 1:572896fe480d tag: tip