Mercurial > hg
comparison mercurial/localrepo.py @ 15483:9ae766f2f452
phases: set new commit in 1-phase
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 11 Nov 2011 00:15:22 +0100 |
| parents | abcaaf51d568 |
| children | a44446ff9ad8 |
comparison
equal
deleted
inserted
replaced
| 15482:a667c89e49b3 | 15483:9ae766f2f452 |
|---|---|
| 1241 p = lambda: self.changelog.writepending() and self.root or "" | 1241 p = lambda: self.changelog.writepending() and self.root or "" |
| 1242 xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | 1242 xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
| 1243 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | 1243 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
| 1244 parent2=xp2, pending=p) | 1244 parent2=xp2, pending=p) |
| 1245 self.changelog.finalize(trp) | 1245 self.changelog.finalize(trp) |
| 1246 # ensure the new commit is 1-phase | |
| 1247 phases.retractboundary(self, 1, [n]) | |
| 1246 tr.close() | 1248 tr.close() |
| 1247 | 1249 |
| 1248 if self._branchcache: | 1250 if self._branchcache: |
| 1249 self.updatebranchcache() | 1251 self.updatebranchcache() |
| 1250 return n | 1252 return n |