# HG changeset patch # User FUJIWARA Katsunori # Date 1427259335 -32400 # Node ID 0142b59f5743eff0c795377f49c0eb09067cf152 # Parent 1bf71faf042e87eb58d34a112a625daddd9db63e update: replace workingctx.dirty and raising Abort by cmdutil.bailifchanged This patch makes wrapping "commands.update()" by largefiles extension useless, because "cmdutil.bailifchanged()" can detect changes of largefiles in the working directory. This patch also changes test-update-branches.t, because "cmdutil.bailifchanged()" shows more detailed information about dirty-ness of the working directory than "workingctx.dirty()". diff -r 1bf71faf042e -r 0142b59f5743 mercurial/commands.py --- a/mercurial/commands.py Wed Mar 25 13:55:35 2015 +0900 +++ b/mercurial/commands.py Wed Mar 25 13:55:35 2015 +0900 @@ -6337,9 +6337,7 @@ rev = cmdutil.finddate(ui, repo, date) if check: - c = repo[None] - if c.dirty(merge=False, branch=False, missing=True): - raise util.Abort(_("uncommitted changes")) + cmdutil.bailifchanged(repo, merge=False) if rev is None: rev = repo[repo[None].branch()].rev() diff -r 1bf71faf042e -r 0142b59f5743 tests/test-update-branches.t --- a/tests/test-update-branches.t Wed Mar 25 13:55:35 2015 +0900 +++ b/tests/test-update-branches.t Wed Mar 25 13:55:35 2015 +0900 @@ -161,7 +161,7 @@ M foo $ revtest '-c dirtysub linear' dirtysub 1 2 -c - abort: uncommitted changes + abort: uncommitted changes in subrepository 'sub' parent=1 M sub/suba