Mercurial > hg

changeset 4162:b2d9e553cdc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
incoming/outgoing: print the name of the other repo
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 07 Mar 2007 15:26:03 -0300
parents 939de0d20a67
children fe41d9a186ab 5c1e18bb804c
files mercurial/commands.py tests/test-bundle.out tests/test-empty-group.out tests/test-incoming-outgoing.out tests/test-init.out tests/test-ssh.out
diffstat 6 files changed, 21 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Mar 07 15:26:00 2007 -0300
+++ b/mercurial/commands.py	Wed Mar 07 15:26:03 2007 -0300
@@ -1535,6 +1535,7 @@
     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 @@
         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"))
--- a/tests/test-bundle.out	Wed Mar 07 15:26:00 2007 -0300
+++ b/tests/test-bundle.out	Wed Mar 07 15:26:03 2007 -0300
@@ -150,6 +150,7 @@
 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 @@
 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 @@
 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
--- a/tests/test-empty-group.out	Wed Mar 07 15:26:00 2007 -0300
+++ b/tests/test-empty-group.out	Wed Mar 07 15:26:03 2007 -0300
@@ -21,6 +21,7 @@
 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 @@
 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 @@
 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 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     m1
 
+comparing with b
 searching for changes
 changeset:   3:fdb3c546e859
 tag:         tip
--- a/tests/test-incoming-outgoing.out	Wed Mar 07 15:26:00 2007 -0300
+++ b/tests/test-incoming-outgoing.out	Wed Mar 07 15:26:03 2007 -0300
@@ -4,6 +4,7 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     13
 
+comparing with http://localhost:20059/
 searching for changes
 changeset:   9:3741c3ad1096
 user:        test
--- a/tests/test-init.out	Wed Mar 07 15:26:00 2007 -0300
+++ b/tests/test-init.out	Wed Mar 07 15:26:03 2007 -0300
@@ -3,6 +3,7 @@
 #test failure
 abort: repository local already exists!
 # init+push to remote2
+comparing with local
 changeset:   0:c4e059d443be
 tag:         tip
 user:        test
--- a/tests/test-ssh.out	Wed Mar 07 15:26:00 2007 -0300
+++ b/tests/test-ssh.out	Wed Mar 07 15:26:03 2007 -0300
@@ -33,6 +33,7 @@
 # local change
 # updating rc
 # find outgoing
+comparing with ssh://user@dummy/remote
 searching for changes
 changeset:   1:572896fe480d
 tag:         tip
@@ -41,6 +42,7 @@
 summary:     add
 
 # find incoming on the remote side
+comparing with ssh://user@dummy/local
 searching for changes
 changeset:   1:572896fe480d
 tag:         tip