[PATCH 6 of 6] rename some variables to avoid shadowing module names/functions

[timeless]

# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1304269084 -7200
# Node ID d04a2cd57b76603b18c2c0058acf68e3b27e197e
# Parent  ecb0abeb482d17f1a842d3e7319941d94cbb970a
rename some variables to avoid shadowing module names/functions

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1150,8 +1150,8 @@ def debugcheckstate(ui, repo):
             ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
             errors += 1
     if errors:
-        error = _(".hg/dirstate inconsistent with current parent's manifest")
-        raise util.Abort(error)
+        msg = _(".hg/dirstate inconsistent with current parent's manifest")
+        raise util.Abort(msg)
 
 def showconfig(ui, repo, *values, **opts):
     """show combined config settings from all hgrc files
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -699,7 +699,7 @@ class localrepository(repo.repository):
         return tr
 
     def recover(self):
-        lock = self.lock()
+        repolock = self.lock()
         try:
             if os.path.exists(self.sjoin("journal")):
                 self.ui.status(_("rolling back interrupted transaction\n"))
@@ -711,13 +711,13 @@ class localrepository(repo.repository):
                 self.ui.warn(_("no interrupted transaction available\n"))
                 return False
         finally:
-            lock.release()
+            repolock.release()
 
     def rollback(self, dryrun=False):
-        wlock = lock = None
+        wlock = repolock = None
         try:
             wlock = self.wlock()
-            lock = self.lock()
+            repolock = self.lock()
             if os.path.exists(self.sjoin("undo")):
                 try:
                     args = self.opener("undo.desc", "r").read().splitlines()
@@ -761,7 +761,7 @@ class localrepository(repo.repository):
                 self.ui.warn(_("no rollback information available\n"))
                 return 1
         finally:
-            release(lock, wlock)
+            release(repolock, wlock)
 
     def invalidatecaches(self):
         self._tags = None
@@ -1040,14 +1040,14 @@ class localrepository(repo.repository):
         Revision information is passed via the context argument.
         """
 
-        tr = lock = None
+        tr = repolock = None
         removed = list(ctx.removed())
         p1, p2 = ctx.p1(), ctx.p2()
         m1 = p1.manifest().copy()
         m2 = p2.manifest()
         user = ctx.user()
 
-        lock = self.lock()
+        repolock = self.lock()
         try:
             tr = self.transaction("commit")
             trp = weakref.proxy(tr)
@@ -1101,7 +1101,7 @@ class localrepository(repo.repository):
         finally:
             if tr:
                 tr.release()
-            lock.release()
+            repolock.release()
 
     def destroyed(self):
         '''Inform the repository that nodes have been destroyed.
@@ -1323,7 +1323,7 @@ class localrepository(repo.repository):
         return r
 
     def pull(self, remote, heads=None, force=False):
-        lock = self.lock()
+        repolock = self.lock()
         try:
             tmp = discovery.findcommonincoming(self, remote, heads=heads,
                                                force=force)
@@ -1350,9 +1350,9 @@ class localrepository(repo.repository):
                 else:
                     cg = remote.changegroupsubset(fetch, heads, 'pull')
                 result = self.addchangegroup(cg, 'pull', remote.url(),
-                                             lock=lock)
+                                             lock=repolock)
         finally:
-            lock.release()
+            repolock.release()
 
         return result
 
@@ -1380,10 +1380,10 @@ class localrepository(repo.repository):
         # servers, http servers).
 
         self.checkpush(force, revs)
-        lock = None
+        repolock = None
         unbundle = remote.capable('unbundle')
         if not unbundle:
-            lock = remote.lock()
+            repolock = remote.lock()
         try:
             cg, remote_heads = discovery.prepush(self, remote, force, revs,
                                                  newbranch)
@@ -1402,10 +1402,10 @@ class localrepository(repo.repository):
                 else:
                     # we return an integer indicating remote head count change
                     ret = remote.addchangegroup(cg, 'push', self.url(),
-                                                lock=lock)
+                                                lock=repolock)
         finally:
-            if lock is not None:
-                lock.release()
+            if repolock is not None:
+                repolock.release()
 
         self.ui.debug("checking for updated bookmarks\n")
         rb = remote.listkeys('bookmarks')
@@ -1833,7 +1833,7 @@ class localrepository(repo.repository):
             return dh + 1
 
     def stream_in(self, remote, requirements):
-        lock = self.lock()
+        repolock = self.lock()
         try:
             fp = remote.stream_out()
             l = fp.readline()
@@ -1889,7 +1889,7 @@ class localrepository(repo.repository):
             self.invalidate()
             return len(self.heads()) + 1
         finally:
-            lock.release()
+            repolock.release()
 
     def clone(self, remote, heads=[], stream=False):
         '''clone remote repository.
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -82,7 +82,7 @@ def compress(text):
     if not text:
         return ("", text)
     l = len(text)
-    bin = None
+    binary = None
     if l < 44:
         pass
     elif l > 1000000:
@@ -97,26 +97,26 @@ def compress(text):
             pos = pos2
         p.append(z.flush())
         if sum(map(len, p)) < l:
-            bin = "".join(p)
+            binary = "".join(p)
     else:
-        bin = _compress(text)
-    if bin is None or len(bin) > l:
+        binary = _compress(text)
+    if binary is None or len(binary) > l:
         if text[0] == '\0':
             return ("", text)
         return ('u', text)
-    return ("", bin)
+    return ("", binary)
 
-def decompress(bin):
+def decompress(binary):
     """ decompress the given input """
-    if not bin:
-        return bin
-    t = bin[0]
+    if not binary:
+        return binary
+    t = binary[0]
     if t == '\0':
-        return bin
+        return binary
     if t == 'x':
-        return _decompress(bin)
+        return _decompress(binary)
     if t == 'u':
-        return bin[1:]
+        return binary[1:]
     raise RevlogError(_("unknown compression type %r") % t)
 
 indexformatv0 = ">4l20s20s20s"