Mercurial > hg
comparison mercurial/dispatch.py @ 14866:ad6a58581ecd
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 13 Jul 2011 16:29:28 -0500 |
| parents | 67add0f24f83 1c148e935244 |
| children | 9a3831d64ae2 |
comparison
equal
deleted
inserted
replaced
| 14860:67add0f24f83 | 14866:ad6a58581ecd |
|---|---|
| 631 | 631 |
| 632 repo = None | 632 repo = None |
| 633 cmdpats = args[:] | 633 cmdpats = args[:] |
| 634 if cmd not in commands.norepo.split(): | 634 if cmd not in commands.norepo.split(): |
| 635 # use the repo from the request only if we don't have -R | 635 # use the repo from the request only if we don't have -R |
| 636 if not rpath: | 636 if not rpath and not cwd: |
| 637 repo = req.repo | 637 repo = req.repo |
| 638 | 638 |
| 639 if repo: | 639 if repo: |
| 640 # set the descriptors of the repo ui to those of ui | 640 # set the descriptors of the repo ui to those of ui |
| 641 repo.ui.fin = ui.fin | 641 repo.ui.fin = ui.fin |