Mercurial > public > mercurial-scm > hg

diff mercurial/lock.py @ 4959:8933b8ea871a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use format string for lockname again (was changed by 3e25a6eb5c9a)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:39:42 +0200
parents 3e25a6eb5c9a
children 7197812e8d44
line wrap: on
line diff
--- a/mercurial/lock.py	Sat Jul 21 10:36:51 2007 +0200
+++ b/mercurial/lock.py	Sat Jul 21 10:39:42 2007 +0200
@@ -60,7 +60,7 @@
     def trylock(self):
         if lock._host is None:
             lock._host = socket.gethostname()
-        lockname = lock._host + ':' + str(os.getpid())
+        lockname = '%s:%s' % (lock._host, os.getpid())
         while not self.held:
             try:
                 util.makelock(lockname, self.f)