Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: also use 'destupdate' for pull and unbundle
authorPierre-Yves David <pierre-yves.david@fb.com>
Mon, 05 Oct 2015 21:31:32 -0700
changeset 26642 70ac5f724fbd
parent 26641 5c57d01fe64e
child 26643 d2e16419d3f4
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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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))
Mercurial