comparison mercurial/dispatch.py @ 6142:50a277e6ceae

merge backout
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 18 Feb 2008 19:21:33 +0100
parents 90e5c82a3859 6480af8fd53c
children aafdea37f796
comparison
equal deleted inserted replaced
6141:90e5c82a3859 6142:50a277e6ceae
338 repo = None 338 repo = None
339 if cmd not in commands.norepo.split(): 339 if cmd not in commands.norepo.split():
340 try: 340 try:
341 repo = hg.repository(ui, path=path) 341 repo = hg.repository(ui, path=path)
342 ui = repo.ui 342 ui = repo.ui
343 ui.setconfig("bundle", "mainreporoot", repo.root)
344 if not repo.local(): 343 if not repo.local():
345 raise util.Abort(_("repository '%s' is not local") % path) 344 raise util.Abort(_("repository '%s' is not local") % path)
345 ui.setconfig("bundle", "mainreporoot", repo.root)
346 except hg.RepoError: 346 except hg.RepoError:
347 if cmd not in commands.optionalrepo.split(): 347 if cmd not in commands.optionalrepo.split():
348 if not path: 348 if not path:
349 raise hg.RepoError(_("There is no Mercurial repository here" 349 raise hg.RepoError(_("There is no Mercurial repository here"
350 " (.hg not found)")) 350 " (.hg not found)"))