Mercurial > hg
comparison mercurial/localrepo.py @ 20222:228ae760942f
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.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Sat, 16 Nov 2013 11:53:44 -0500 |
| parents | 7401bb54fe76 |
| children | 76d9364119fc |
comparison
equal
deleted
inserted
replaced
| 20221:7401bb54fe76 | 20222:228ae760942f |
|---|---|
| 1663 # rollback call | 1663 # rollback call |
| 1664 tr = None | 1664 tr = None |
| 1665 trname = 'pull\n' + util.hidepassword(remote.url()) | 1665 trname = 'pull\n' + util.hidepassword(remote.url()) |
| 1666 lock = self.lock() | 1666 lock = self.lock() |
| 1667 try: | 1667 try: |
| 1668 tmp = discovery.findcommonincoming(self, remote, heads=heads, | 1668 tmp = discovery.findcommonincoming(self.unfiltered(), remote, |
| 1669 force=force) | 1669 heads=heads, force=force) |
| 1670 common, fetch, rheads = tmp | 1670 common, fetch, rheads = tmp |
| 1671 if not fetch: | 1671 if not fetch: |
| 1672 self.ui.status(_("no changes found\n")) | 1672 self.ui.status(_("no changes found\n")) |
| 1673 result = 0 | 1673 result = 0 |
| 1674 else: | 1674 else: |