diff hgext/histedit.py @ 42979:b4093d1d3b18

update: clarify calculateupdate() call sites by specifying argument names merge.calculateupdate() takes a lot of parameters and I get confused all the time which is which. See also b14fdf1fb615 (update: clarify update() call sites by specifying argument names, 2017-02-09). Differential Revision: https://phab.mercurial-scm.org/D6883
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 25 Sep 2019 14:35:08 -0700
parents 699102b10530
children 2372284d9457
line wrap: on
line diff
--- a/hgext/histedit.py	Wed Sep 25 17:57:16 2019 -0400
+++ b/hgext/histedit.py	Wed Sep 25 14:35:08 2019 -0700
@@ -1986,11 +1986,8 @@
                 repo, wctx, c, ancs,
                 # These parameters were determined by print-debugging
                 # what happens later on inside histedit.
-                False, # branchmerge
-                False, # force
-                False, # acceptremote
-                False, # followcopies
-            )
+                branchmerge=False, force=False, acceptremote=False,
+                followcopies=False)
         except error.Abort:
             raise error.Abort(
        _("untracked files in working directory conflict with files in %s") % (