mercurial/localrepo.py
changeset 20222 228ae760942f
parent 20221 7401bb54fe76
child 20226 76d9364119fc
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: