Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 33998:8abbae93045a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5cd6d4826f9f
children abf91c4f9608
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',