Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: run findcommon incoming on unfiltered repo
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 16 Nov 2013 11:53:44 -0500
changeset 20222 228ae760942f
parent 20221 7401bb54fe76
child 20223 37e2bd560805
pull: run findcommon incoming on unfiltered repo The discovery is not yet ready for filtered repo. Pull was using filtered for its discovery which is wrong. It worked by dumb luck because discovery mainly use funtion that does not respect the filtering. Trying to makes discovery work on filtered repo revealed this bug.
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Tue Nov 05 18:37:44 2013 +0100
+++ b/mercurial/localrepo.py	Sat Nov 16 11:53:44 2013 -0500
@@ -1665,8 +1665,8 @@
         trname = 'pull\n' + util.hidepassword(remote.url())
         lock = self.lock()
         try:
-            tmp = discovery.findcommonincoming(self, remote, heads=heads,
-                                               force=force)
+            tmp = discovery.findcommonincoming(self.unfiltered(), remote,
+                                               heads=heads, force=force)
             common, fetch, rheads = tmp
             if not fetch:
                 self.ui.status(_("no changes found\n"))
mercurial