# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1444105892 25200
# Node ID 70ac5f724fbdc3b86de8e7d3e854e1045c672f60
# Parent  5c57d01fe64e32fb3b3e70943abdc40960851690
update: also use 'destupdate' for pull and unbundle

Update can also be performed by 'hg pull --update' and 'hg unbundle'. We use the
destupdate function in these case too.

diff -r 5c57d01fe64e -r 70ac5f724fbd mercurial/commands.py
--- a/mercurial/commands.py	Tue Sep 29 01:03:26 2015 -0700
+++ b/mercurial/commands.py	Mon Oct 05 21:31:32 2015 -0700
@@ -5185,8 +5185,12 @@
     if modheads == 0:
         return
     if optupdate:
-        checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
         try:
+            brev = checkout
+            movemarkfrom = None
+            if not checkout:
+                updata =  destutil.destupdate(repo)
+                checkout, movemarkfrom, brev = updata
             ret = hg.update(repo, checkout)
         except error.Abort as inst:
             ui.warn(_("not updating: %s\n") % str(inst))