Mercurial > hg

comparison mercurial/discovery.py @ 14184:4ab6e2d597cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix errors reported by pyflakes test
author Sune Foldager <cryo@cyanite.org>
date Wed, 04 May 2011 19:27:55 +0200
parents cb98fed52495
children 30273f0c776b
comparison
equal deleted inserted replaced
14183:333def42e785 14184:4ab6e2d597cc
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from node import nullid, short 8 from node import nullid, short
9 from i18n import _ 9 from i18n import _
10 import util, error, setdiscovery, treediscovery 10 import util, setdiscovery, treediscovery
11 11
12 def findcommonincoming(repo, remote, heads=None, force=False): 12 def findcommonincoming(repo, remote, heads=None, force=False):
13 """Return a tuple (common, anyincoming, heads) used to identify the common 13 """Return a tuple (common, anyincoming, heads) used to identify the common
14 subset of nodes between repo and remote. 14 subset of nodes between repo and remote.
15 15