D516: pull: do not prompt "hg update" if update.requiredest is set

quark (Jun Wu) phabricator at mercurial-scm.org
Fri Aug 25 03:31:05 UTC 2017


quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D516

AFFECTED FILES
  mercurial/commands.py
  tests/test-update-dest.t

CHANGE DETAILS

diff --git a/tests/test-update-dest.t b/tests/test-update-dest.t
--- a/tests/test-update-dest.t
+++ b/tests/test-update-dest.t
@@ -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
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3845,7 +3845,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',



To: quark, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list