Mercurial > hg-stable
changeset 33998:8abbae93045a
pull: do not prompt "hg update" if update.requiredest is set
Previously, after pull, we show:
(run 'hg update' to get a working copy)
unconditionally. People might run `hg update` and get an exception if
`update.requiredest` is set, and get a bit frustrated. This patch changes
the code to not prompt `hg update` in that case.
Differential Revision: https://phab.mercurial-scm.org/D516
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Thu, 24 Aug 2017 20:25:16 -0700 |
| parents | 3939b30d0cb7 |
| children | 5cb0a8fe096e |
| files | mercurial/commands.py tests/test-update-dest.t |
| diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Aug 25 22:05:10 2017 -0700 +++ b/mercurial/commands.py Thu Aug 24 20:25:16 2017 -0700 @@ -3849,7 +3849,7 @@ "merge)\n")) else: ui.status(_("(run 'hg heads' to see heads)\n")) - else: + elif not ui.configbool('commands', 'update.requiredest'): ui.status(_("(run 'hg update' to get a working copy)\n")) @command('^pull',
--- a/tests/test-update-dest.t Fri Aug 25 22:05:10 2017 -0700 +++ b/tests/test-update-dest.t Thu Aug 24 20:25:16 2017 -0700 @@ -33,3 +33,16 @@ abort: update destination required by configuration (use hg pull followed by hg update DEST) [255] + + $ cd .. + +update.requiredest should silent the "hg update" text after pull + $ hg init repo1 + $ cd repo1 + $ hg pull ../repo + pulling from ../repo + requesting all changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 1 files