Patchwork [02,of,17,V4] lfutil: avoid creating unnecessary copy of status tuple

login
register
mail settings
Submitter Martin von Zweigbergk
Date Oct. 12, 2014, 5:44 a.m.
Message ID <7309c75e96a9a2f6d0e0.1413092659@handduk2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6218/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Oct. 12, 2014, 5:44 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@gmail.com>
# Date 1412396480 25200
#      Fri Oct 03 21:21:20 2014 -0700
# Node ID 7309c75e96a9a2f6d0e0f796a4d13e595e9ea958
# Parent  6b0dd84f33b7ce6a932e9a46f6751eeda381ecfc
lfutil: avoid creating unnecessary copy of status tuple

In lfdirstatestatus(), the status tuple gets deconstructed, the lists
get updated, and then an identical status tuple gets created and
returned. Change it so we simply return the original tuple.

Patch

diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py
+++ b/hgext/largefiles/lfutil.py
@@ -137,7 +137,7 @@ 
 def lfdirstatestatus(lfdirstate, repo, rev):
     match = match_.always(repo.root, repo.getcwd())
     unsure, s = lfdirstate.status(match, [], False, False, False)
-    modified, added, removed, missing, unknown, ignored, clean = s
+    modified, _added, _removed, _missing, _unknown, _ignored, clean = s
     for lfile in unsure:
         try:
             fctx = repo[rev][standin(lfile)]
@@ -148,7 +148,7 @@ 
         else:
             clean.append(lfile)
             lfdirstate.normal(lfile)
-    return (modified, added, removed, missing, unknown, ignored, clean)
+    return s
 
 def listlfiles(repo, rev=None, matcher=None):
     '''return a list of largefiles in the working copy or the