Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 1607:d72d27ee72b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add '_' to several strings
author Muli Ben-Yehuda <mulix@mulix.org>
date Thu, 29 Dec 2005 14:59:19 -0600
parents fb4149eebdd4
children 83238c1db6de
comparison
equal deleted inserted replaced
1606:ba625c8083d8 1607:d72d27ee72b9
729 729
730 else: 730 else:
731 revs = None 731 revs = None
732 if opts['rev']: 732 if opts['rev']:
733 if not other.local(): 733 if not other.local():
734 error = "clone -r not supported yet for remote repositories." 734 error = _("clone -r not supported yet for remote repositories.")
735 raise util.Abort(error) 735 raise util.Abort(error)
736 else: 736 else:
737 revs = [other.lookup(rev) for rev in opts['rev']] 737 revs = [other.lookup(rev) for rev in opts['rev']]
738 repo = hg.repository(ui, dest, create=1) 738 repo = hg.repository(ui, dest, create=1)
739 repo.pull(other, heads = revs) 739 repo.pull(other, heads = revs)
1712 ui.setconfig("ui", "remotecmd", opts['remotecmd']) 1712 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
1713 1713
1714 other = hg.repository(ui, source) 1714 other = hg.repository(ui, source)
1715 revs = None 1715 revs = None
1716 if opts['rev'] and not other.local(): 1716 if opts['rev'] and not other.local():
1717 raise util.Abort("pull -r doesn't work for remote repositories yet") 1717 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
1718 elif opts['rev']: 1718 elif opts['rev']:
1719 revs = [other.lookup(rev) for rev in opts['rev']] 1719 revs = [other.lookup(rev) for rev in opts['rev']]
1720 r = repo.pull(other, heads=revs) 1720 r = repo.pull(other, heads=revs)
1721 if not r: 1721 if not r:
1722 if opts['update']: 1722 if opts['update']:
1970 ui.setconfig("web", o, opts[o]) 1970 ui.setconfig("web", o, opts[o])
1971 1971
1972 try: 1972 try:
1973 httpd = hgweb.create_server(repo) 1973 httpd = hgweb.create_server(repo)
1974 except socket.error, inst: 1974 except socket.error, inst:
1975 raise util.Abort('cannot start server: ' + inst.args[1]) 1975 raise util.Abort(_('cannot start server: ') + inst.args[1])
1976 1976
1977 if ui.verbose: 1977 if ui.verbose:
1978 addr, port = httpd.socket.getsockname() 1978 addr, port = httpd.socket.getsockname()
1979 if addr == '0.0.0.0': 1979 if addr == '0.0.0.0':
1980 addr = socket.gethostname() 1980 addr = socket.gethostname()