##// END OF EJS Templates
commit: make commit acquire store lock before processing for consistency...
FUJIWARA Katsunori -
r27291:a18328aa default
parent child Browse files
Show More
@@ -1471,6 +1471,8 b' class localrepository(object):'
1471 wlock = lock = tr = None
1471 wlock = lock = tr = None
1472 try:
1472 try:
1473 wlock = self.wlock()
1473 wlock = self.wlock()
1474 lock = self.lock() # for recent changelog (see issue4368)
1475
1474 wctx = self[None]
1476 wctx = self[None]
1475 merge = len(wctx.parents()) > 1
1477 merge = len(wctx.parents()) > 1
1476
1478
@@ -1598,7 +1600,6 b' class localrepository(object):'
1598 subrepo.writestate(self, newstate)
1600 subrepo.writestate(self, newstate)
1599
1601
1600 p1, p2 = self.dirstate.parents()
1602 p1, p2 = self.dirstate.parents()
1601 lock = self.lock()
1602 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
1603 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
1603 try:
1604 try:
1604 self.hook("precommit", throw=True, parent1=hookp1,
1605 self.hook("precommit", throw=True, parent1=hookp1,
General Comments 0
You need to be logged in to leave comments. Login now