[PATCH] hg: fix _incoming (broken by 72c84f24b420)

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Sun May 1 09:40:46 CDT 2011


# HG changeset patch
# User Peter Arrenbrecht <peter.arrenbrecht at gmail.com>
# Date 1304260811 -7200
# Node ID 04aee572fbf33712ab743bf023dffa66937f642c
# Parent  72c84f24b420f152ca5cf2d4117de3091e6617e4
hg: fix _incoming (broken by 72c84f24b420)

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -433,7 +433,7 @@
         return subreporecurse()
 
     try:
-        chlist = other.changelog.findmissing(common, revs)
+        chlist = other.changelog.findmissing(common + repo.heads(), revs)
         displayer = cmdutil.show_changeset(ui, other, opts, buffered)
 
         # XXX once graphlog extension makes it into core,
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -70,6 +70,24 @@
   adding bar
   $ cd ..
 
+incoming via HTTP
+
+  $ hg clone http://localhost:$HGPORT1/ --rev 0 partial
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 4 changes to 4 files
+  updating to branch default
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd partial
+  $ touch LOCAL
+  $ hg ci -qAm LOCAL
+  $ hg incoming http://localhost:$HGPORT1/ --template '{desc}\n'
+  comparing with http://localhost:$HGPORT1/
+  searching for changes
+  2
+  $ cd ..
+
 pull
 
   $ cd copy-pull


More information about the Mercurial-devel mailing list