Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 22070:c1ca47204590
phase: add a transaction argument to retractboundary
We now pass a transaction option to this phase movement function. The
object is currently not used by the function, but it will be in the
future.
All call sites have been updated. Most call sites were already enclosed in a
transaction for a long time. The handful of others have been recently
updated in previous commit.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 05 Aug 2014 23:52:21 -0700 |
parents | bdb6d97f0a04 |
children | 37f46575d9c2 |
comparison
equal
deleted
inserted
replaced
22069:616a455b02ca | 22070:c1ca47204590 |
---|---|
1440 # retract boundary do not alter parent changeset. | 1440 # retract boundary do not alter parent changeset. |
1441 # if a parent have higher the resulting phase will | 1441 # if a parent have higher the resulting phase will |
1442 # be compliant anyway | 1442 # be compliant anyway |
1443 # | 1443 # |
1444 # if minimal phase was 0 we don't need to retract anything | 1444 # if minimal phase was 0 we don't need to retract anything |
1445 phases.retractboundary(self, targetphase, [n]) | 1445 phases.retractboundary(self, tr, targetphase, [n]) |
1446 tr.close() | 1446 tr.close() |
1447 branchmap.updatecache(self.filtered('served')) | 1447 branchmap.updatecache(self.filtered('served')) |
1448 return n | 1448 return n |
1449 finally: | 1449 finally: |
1450 if tr: | 1450 if tr: |