##// END OF EJS Templates
commit: look-up new revision once...
Joerg Sonnenberger -
r47066:72f5280e default
parent child Browse files
Show More
@@ -96,6 +96,7 b' def commitctx(repo, ctx, error=False, or'
96 ctx.date(),
96 ctx.date(),
97 extra,
97 extra,
98 )
98 )
99 rev = repo[n].rev()
99 xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
100 xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
100 repo.hook(
101 repo.hook(
101 b'pretxncommit',
102 b'pretxncommit',
@@ -108,7 +109,7 b' def commitctx(repo, ctx, error=False, or'
108 targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
109 targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
109
110
110 # prevent unmarking changesets as public on recommit
111 # prevent unmarking changesets as public on recommit
111 waspublic = oldtip == repo.changelog.tiprev() and not repo[n].phase()
112 waspublic = oldtip == repo.changelog.tiprev() and not repo[rev].phase()
112
113
113 if targetphase and not waspublic:
114 if targetphase and not waspublic:
114 # retract boundary do not alter parent changeset.
115 # retract boundary do not alter parent changeset.
@@ -116,7 +117,7 b' def commitctx(repo, ctx, error=False, or'
116 # be compliant anyway
117 # be compliant anyway
117 #
118 #
118 # if minimal phase was 0 we don't need to retract anything
119 # if minimal phase was 0 we don't need to retract anything
119 phases.registernew(repo, tr, targetphase, [repo[n].rev()])
120 phases.registernew(repo, tr, targetphase, [rev])
120 return n
121 return n
121
122
122
123
General Comments 0
You need to be logged in to leave comments. Login now