Patchwork [2,of,2,deprecations] mergemod: drop support for merge.update without a target

login
register
mail settings
Submitter Augie Fackler
Date Nov. 22, 2016, 3:01 a.m.
Message ID <e46571ef16ffc14d1b88.1479783697@imladris.local>
Download mbox | patch
Permalink /patch/17676/
State Accepted
Headers show

Comments

Augie Fackler - Nov. 22, 2016, 3:01 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1479783139 18000
#      Mon Nov 21 21:52:19 2016 -0500
# Node ID e46571ef16ffc14d1b887bf98d78b4f65e702b14
# Parent  de8e9f6a830166fe1cdb14bca0433fa328681ece
mergemod: drop support for merge.update without a target

This was to be deleted after 3.9.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1484,11 +1484,6 @@  def update(repo, node, branchmerge, forc
         if ancestor is not None:
             pas = [repo[ancestor]]
 
-        if node is None:
-            repo.ui.deprecwarn('update with no target', '3.9')
-            rev, _mark, _act = destutil.destupdate(repo)
-            node = repo[rev].node()
-
         overwrite = force and not branchmerge
 
         p2 = repo[node]