Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 11156:b203a95fe68b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 11 May 2010 17:03:44 -0500
parents 71cf11f03b3d 17031fea4e95
children 5593ff6d1e5a
comparison
equal deleted inserted replaced
11155:245a67fe2574 11156:b203a95fe68b
13 import merge as mergemod 13 import merge as mergemod
14 import verify as verifymod 14 import verify as verifymod
15 import errno, os, shutil 15 import errno, os, shutil
16 16
17 def _local(path): 17 def _local(path):
18 return (os.path.isfile(util.drop_scheme('file', path)) and 18 path = util.expandpath(util.drop_scheme('file', path))
19 bundlerepo or localrepo) 19 return (os.path.isfile(path) and bundlerepo or localrepo)
20 20
21 def addbranchrevs(lrepo, repo, branches, revs): 21 def addbranchrevs(lrepo, repo, branches, revs):
22 if not branches: 22 if not branches:
23 return revs or None, revs and revs[0] or None 23 return revs or None, revs and revs[0] or None
24 revs = revs and list(revs) or [] 24 revs = revs and list(revs) or []