Mercurial > hg-git

changeset 933:7b89630a2a48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git_handler: rename local variable to not shadow import name
author Sean Farley <sean@farley.io>
date Thu, 14 May 2015 15:15:37 -0700
parents 07f03124e1b9
children 674f799afb04
files hggit/git_handler.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py	Fri May 15 14:02:55 2015 -0700
+++ b/hggit/git_handler.py	Thu May 14 15:15:37 2015 -0700
@@ -1085,7 +1085,7 @@
         return new_refs
 
     def fetch_pack(self, remote_name, heads=None):
-        client, path = self.get_transport_and_path(remote_name)
+        localclient, path = self.get_transport_and_path(remote_name)
 
         # The dulwich default walk only checks refs/heads/. We also want to
         # consider remotes when doing discovery, so we build our own list.  We
@@ -1103,8 +1103,8 @@
         try:
             progress = GitProgress(self.ui)
             f = StringIO.StringIO()
-            ret = client.fetch_pack(path, determine_wants, graphwalker,
-                                    f.write, progress.progress)
+            ret = localclient.fetch_pack(path, determine_wants, graphwalker,
+                                         f.write, progress.progress)
             if(f.pos != 0):
                 f.seek(0)
                 self.git.object_store.add_thin_pack(f.read, None)