# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1487015882 28800
# Node ID 7beb3ec344433134cf85deac65f557b124bbe900
# Parent  11c253997b0e793751c24232fcc30fbd74798e0a
update: move check for dirty wdir into hg.updatetotally()

The function has a "check" parameter that's currently unused, and it
makes sense to me to have it honor it. That way other callers than
commands.update() could set it if they needed.

diff -r 11c253997b0e -r 7beb3ec34443 mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 13 11:32:09 2017 -0800
+++ b/mercurial/commands.py	Mon Feb 13 11:58:02 2017 -0800
@@ -5363,9 +5363,6 @@
         brev = rev
         rev = scmutil.revsingle(repo, rev, rev).rev()
 
-        if check:
-            cmdutil.bailifchanged(repo, merge=False)
-
         repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
 
         return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check)
diff -r 11c253997b0e -r 7beb3ec34443 mercurial/hg.py
--- a/mercurial/hg.py	Mon Feb 13 11:32:09 2017 -0800
+++ b/mercurial/hg.py	Mon Feb 13 11:58:02 2017 -0800
@@ -739,6 +739,8 @@
         if clean:
             ret = _clean(repo, checkout)
         else:
+            if check:
+                cmdutil.bailifchanged(repo, merge=False)
             ret = _update(repo, checkout)
 
         if not ret and movemarkfrom: