[PATCH 2 of 2] summary: don't indicate a clean wdir() with deleted files (issue5549)

[Matt Harbison]

# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1498705338 14400
#      Wed Jun 28 23:02:18 2017 -0400
# Node ID fcbab9a85517f363a9c0bdfa80362b88843258ac
# Parent  0fcbcb681899ad44a33380788750ea375aa70864
summary: don't indicate a clean wdir() with deleted files (issue5549)

It wasn't a BC when copy/rename was added (997ab9af81df), or when subrepos were
added (c4347e48b0d0).

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4870,8 +4870,8 @@
     elif (parents[0].closesbranch() and
           pnode in repo.branchheads(branch, closed=True)):
         t += _(' (head closed)')
-    elif not (status.modified or status.added or status.removed or renamed or
-              copied or subs):
+    elif not (status.modified or status.added or status.removed or
+              status.deleted or renamed or copied or subs):
         t += _(' (clean)')
         cleanworkdir = True
     elif pnode not in bheads:
diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -35,7 +35,7 @@
   parent: 3:cb66ec850af7 tip
    add b
   branch: default
-  commit: 1 deleted (clean)
+  commit: 1 deleted
   update: 1 new changesets, 2 branch heads (merge)
   phases: 4 draft