Patchwork [7,of,8,V3] largefiles: avoid using 'lfiles' variable for two purposes

login
register
mail settings
Submitter Martin von Zweigbergk
Date Sept. 24, 2014, 4:32 p.m.
Message ID <9720c5b5defdc166c596.1411576333@handduk2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/5963/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Sept. 24, 2014, 4:32 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@gmail.com>
# Date 1410933038 25200
#      Tue Sep 16 22:50:38 2014 -0700
# Node ID 9720c5b5defdc166c596a11b6aafbf804d66bc8b
# Parent  35fa8edd570c68243cd1839a76ed90578dc231fd
largefiles: avoid using 'lfiles' variable for two purposes

The variable 'lfiles' is first used for a set of the names of all the
large files. It is then overwritten with a tuple like the ones
returned from status(). To reduce confusion, let's create a separate
variable for the second use.

Patch

diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py
--- a/hgext/largefiles/reposetup.py
+++ b/hgext/largefiles/reposetup.py
@@ -224,9 +224,10 @@ 
                     normals = [[fn for fn in filelist
                                 if not lfutil.isstandin(fn)]
                                for filelist in result]
-                    lfiles = (modified, added, removed, missing, [], [], clean)
+                    lfstatus = (modified, added, removed, missing, [], [],
+                                clean)
                     result = [sorted(list1 + list2)
-                              for (list1, list2) in zip(normals, lfiles)]
+                              for (list1, list2) in zip(normals, lfstatus)]
                 else:
                     def toname(f):
                         if lfutil.isstandin(f):