Mercurial > hg-stable
comparison mercurial/localrepo.py @ 16030:308406677e9d stable
phases: allow phase name in phases.new-commit settings
Before this commit only phase index where accepted
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Mon, 30 Jan 2012 17:46:15 +0100 |
parents | 90f8b8dd0326 |
children | b254f827b7a6 3f75fb837638 |
comparison
equal
deleted
inserted
replaced
16029:ee1c8385e5b0 | 16030:308406677e9d |
---|---|
1266 xp1, xp2 = p1.hex(), p2 and p2.hex() or '' | 1266 xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
1267 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | 1267 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
1268 parent2=xp2, pending=p) | 1268 parent2=xp2, pending=p) |
1269 self.changelog.finalize(trp) | 1269 self.changelog.finalize(trp) |
1270 # set the new commit is proper phase | 1270 # set the new commit is proper phase |
1271 targetphase = self.ui.configint('phases', 'new-commit', | 1271 targetphase = phases.newcommitphase(self.ui) |
1272 phases.draft) | |
1273 if targetphase: | 1272 if targetphase: |
1274 # retract boundary do not alter parent changeset. | 1273 # retract boundary do not alter parent changeset. |
1275 # if a parent have higher the resulting phase will | 1274 # if a parent have higher the resulting phase will |
1276 # be compliant anyway | 1275 # be compliant anyway |
1277 # | 1276 # |