Mercurial > hg
comparison hgext/mq.py @ 27828:823069f73ff9
with: use context manager for wlock in qpush
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Fri, 15 Jan 2016 13:14:47 -0800 |
parents | a5b168953013 |
children | bab359a3cf49 |
comparison
equal
deleted
inserted
replaced
27827:a5b168953013 | 27828:823069f73ff9 |
---|---|
1316 def push(self, repo, patch=None, force=False, list=False, mergeq=None, | 1316 def push(self, repo, patch=None, force=False, list=False, mergeq=None, |
1317 all=False, move=False, exact=False, nobackup=False, | 1317 all=False, move=False, exact=False, nobackup=False, |
1318 keepchanges=False): | 1318 keepchanges=False): |
1319 self.checkkeepchanges(keepchanges, force) | 1319 self.checkkeepchanges(keepchanges, force) |
1320 diffopts = self.diffopts() | 1320 diffopts = self.diffopts() |
1321 wlock = repo.wlock() | 1321 with repo.wlock(): |
1322 try: | |
1323 heads = [] | 1322 heads = [] |
1324 for hs in repo.branchmap().itervalues(): | 1323 for hs in repo.branchmap().itervalues(): |
1325 heads.extend(hs) | 1324 heads.extend(hs) |
1326 if not heads: | 1325 if not heads: |
1327 heads = [nullid] | 1326 heads = [nullid] |
1458 msg = _("errors during apply, please fix and qrefresh %s\n") | 1457 msg = _("errors during apply, please fix and qrefresh %s\n") |
1459 self.ui.write(msg % top) | 1458 self.ui.write(msg % top) |
1460 else: | 1459 else: |
1461 self.ui.write(_("now at: %s\n") % top) | 1460 self.ui.write(_("now at: %s\n") % top) |
1462 return ret[0] | 1461 return ret[0] |
1463 | |
1464 finally: | |
1465 wlock.release() | |
1466 | 1462 |
1467 def pop(self, repo, patch=None, force=False, update=True, all=False, | 1463 def pop(self, repo, patch=None, force=False, update=True, all=False, |
1468 nobackup=False, keepchanges=False): | 1464 nobackup=False, keepchanges=False): |
1469 self.checkkeepchanges(keepchanges, force) | 1465 self.checkkeepchanges(keepchanges, force) |
1470 wlock = repo.wlock() | 1466 wlock = repo.wlock() |