upstream/mercurial-mirror Files · mercurial/lock.py

Fix 3-way-merge of original parent, workdir and new parent....

Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

mpm@selenic.com - - Load All Authors

File last commit:

r705:57486910 default


                r862:d70c1c31

default

Download file

             lock.py
        
                    49 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / lock.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # lock.py - simple locking scheme for mercurial

      #

      # Copyright 2005 Matt Mackall <mpm@selenic.com>

      #

      # This software may be used and distributed according to the terms

      # of the GNU General Public License, incorporated herein by reference.

      import os, time

      import util

      class LockHeld(Exception):

          pass

      class lock:

          def __init__(self, file, wait = 1):

              self.f = file

              self.held = 0

              self.wait = wait

              self.lock()

          def __del__(self):

              self.release()

          def lock(self):

              while 1:

                  try:

                      self.trylock()

                      return 1

                  except LockHeld, inst:

                      if self.wait:

                          time.sleep(1)

                          continue

                      raise inst

          def trylock(self):

              pid = os.getpid()

              try:

                  util.makelock(str(pid), self.f)

                  self.held = 1

              except (OSError, IOError):

                  raise LockHeld(util.readlock(self.f))

          def release(self):

              if self.held:

                  self.held = 0

                  try:

                      os.unlink(self.f)

                  except: pass

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# lock.py - simple locking scheme for mercurial
				#
				# Copyright 2005 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms
				# of the GNU General Public License, incorporated herein by reference.

				import os, time
				import util

				class LockHeld(Exception):
				pass

				class lock:
				def __init__(self, file, wait = 1):
				self.f = file
				self.held = 0
				self.wait = wait
				self.lock()

				def __del__(self):
				self.release()

				def lock(self):
				while 1:
				try:
				self.trylock()
				return 1
				except LockHeld, inst:
				if self.wait:
				time.sleep(1)
				continue
				raise inst

				def trylock(self):
				pid = os.getpid()
				try:
				util.makelock(str(pid), self.f)
				self.held = 1
				except (OSError, IOError):
				raise LockHeld(util.readlock(self.f))

				def release(self):
				if self.held:
				self.held = 0
				try:
				os.unlink(self.f)
				except: pass