Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2803:987c31e2a08c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 16:47:06 -0500
parents fdc232d8a193 2d60c682a081
children 2a0c599f7bb0
comparison
equal deleted inserted replaced
2802:fdc232d8a193 2803:987c31e2a08c
290 290
291 def lookup(self, key): 291 def lookup(self, key):
292 try: 292 try:
293 return self.tags()[key] 293 return self.tags()[key]
294 except KeyError: 294 except KeyError:
295 if key == '.':
296 key = self.dirstate.parents()[0]
297 if key == nullid:
298 raise repo.RepoError(_("no revision checked out"))
295 try: 299 try:
296 return self.changelog.lookup(key) 300 return self.changelog.lookup(key)
297 except: 301 except:
298 raise repo.RepoError(_("unknown revision '%s'") % key) 302 raise repo.RepoError(_("unknown revision '%s'") % key)
299 303
1691 self.hook("incoming", node=hex(self.changelog.node(i)), 1695 self.hook("incoming", node=hex(self.changelog.node(i)),
1692 source=srctype, url=url) 1696 source=srctype, url=url)
1693 1697
1694 return newheads - oldheads + 1 1698 return newheads - oldheads + 1
1695 1699
1700
1696 def stream_in(self, remote): 1701 def stream_in(self, remote):
1697 fp = remote.stream_out() 1702 fp = remote.stream_out()
1698 resp = int(fp.readline()) 1703 resp = int(fp.readline())
1699 if resp != 0: 1704 if resp != 0:
1700 raise util.Abort(_('operation forbidden by server')) 1705 raise util.Abort(_('operation forbidden by server'))