Mercurial > hg
comparison mercurial/dispatch.py @ 11714:aae1dd12fce6
merge with stable
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sat, 31 Jul 2010 11:41:58 +0900 |
| parents | 708291e9389c 9cbc62f68328 |
| children | 81edef14922e |
comparison
equal
deleted
inserted
replaced
| 11713:57a8894e3f75 | 11714:aae1dd12fce6 |
|---|---|
| 393 | 393 |
| 394 # read the local repository .hgrc into a local ui object | 394 # read the local repository .hgrc into a local ui object |
| 395 try: | 395 try: |
| 396 wd = os.getcwd() | 396 wd = os.getcwd() |
| 397 except OSError, e: | 397 except OSError, e: |
| 398 raise util.Abort(_("error getting current working directory: %s") % | 398 raise util.Abort(_("error getting current working directory: %s") % |
| 399 e.strerror) | 399 e.strerror) |
| 400 path = cmdutil.findrepo(wd) or "" | 400 path = cmdutil.findrepo(wd) or "" |
| 401 if not path: | 401 if not path: |
| 402 lui = ui | 402 lui = ui |
| 403 else: | 403 else: |