Mercurial > hg > mercurial-source

comparison mercurial/localrepo.py @ 12070:fddacca3202e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sun, 29 Aug 2010 22:55:37 +0200
parents d01e28657429 a4fbbe0fbc38
children 36a65283c3af
comparison
equal deleted inserted replaced
12066:d01e28657429 12070:fddacca3202e
1203 1203
1204 if heads is None: 1204 if heads is None:
1205 cg = remote.changegroup(fetch, 'pull') 1205 cg = remote.changegroup(fetch, 'pull')
1206 else: 1206 else:
1207 if not remote.capable('changegroupsubset'): 1207 if not remote.capable('changegroupsubset'):
1208 raise util.Abort(_("Partial pull cannot be done because " 1208 raise util.Abort(_("partial pull cannot be done because "
1209 "other repository doesn't support " 1209 "other repository doesn't support "
1210 "changegroupsubset.")) 1210 "changegroupsubset."))
1211 cg = remote.changegroupsubset(fetch, heads, 'pull') 1211 cg = remote.changegroupsubset(fetch, heads, 'pull')
1212 return self.addchangegroup(cg, 'pull', remote.url(), lock=lock) 1212 return self.addchangegroup(cg, 'pull', remote.url(), lock=lock)
1213 finally: 1213 finally: