# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1394580939 18000
# Node ID 2edb8648c500cdd1b8071461a84b339532b3a5d8
# Parent  d19164a018a175cda640066a1f32651834e4f011
localrepo: always set the variable r in status method

This is a small patch to help streamline keeping tracking of the list of files
for status in a variable already called 'r' ('s' is for subrepos in this
method). We now move the setting of it out of an 'if' block so that we can
later refactor more code into the context objects.

diff -r d19164a018a1 -r 2edb8648c500 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Apr 20 16:44:45 2014 -0700
+++ b/mercurial/localrepo.py	Tue Mar 11 18:35:39 2014 -0500
@@ -1558,10 +1558,12 @@
                     self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
             match.bad = bad
 
+        r = [[], [], [], [], [], [], []]
         if working: # we need to scan the working dir
             r = ctx2._dirstatestatus(match=match, ignored=listignored,
                                      clean=listclean, unknown=listunknown)
-            modified, added, removed, deleted, unknown, ignored, clean = r
+
+        modified, added, removed, deleted, unknown, ignored, clean = r
 
         if not parentworking:
             mf1 = mfmatches(ctx1)