[PATCH 6 of 9 phases] phases: set new commit in 1-phase
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Mon Nov 7 11:43:18 CST 2011
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1320685499 -3600
# Node ID 0e17a82201b3a86e9e53d6910ac30cf9498d4dbd
# Parent d2f964cc3fcc967a0f31787d9d9cc675952b8c77
phases: set new commit in 1-phase
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1243,6 +1243,8 @@
self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
parent2=xp2, pending=p)
self.changelog.finalize(trp)
+ # ensure the new commit is 1-phase
+ phases.moveboundary(self, 1, [n], exact=True)
tr.close()
if self._branchcache:
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -74,6 +74,7 @@
.hg/data/tst.d.hg/foo.i
.hg/dirstate
.hg/last-message.txt
+ .hg/phaseroots
.hg/requires
.hg/undo
.hg/undo.bookmarks
@@ -103,6 +104,7 @@
.hg/store/data
.hg/store/data/tst.d.hg
.hg/store/data/tst.d.hg/_foo.i
+ .hg/store/phaseroots
.hg/store/undo
.hg/store/undo.phaseroots
.hg/undo.bookmarks
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -45,6 +45,7 @@
1 r1/.hg/store/data/d1/f2.i
1 r1/.hg/store/data/f1.i
1 r1/.hg/store/fncache
+ 1 r1/.hg/store/phaseroots
1 r1/.hg/store/undo
1 r1/.hg/store/undo.phaseroots
@@ -74,6 +75,7 @@
2 r1/.hg/store/data/d1/f2.i
2 r1/.hg/store/data/f1.i
2 r1/.hg/store/fncache
+ 1 r1/.hg/store/phaseroots
1 r1/.hg/store/undo
1 r1/.hg/store/undo.phaseroots
@@ -113,6 +115,7 @@
1 r3/.hg/store/data/d1/f2.i
1 r3/.hg/store/data/f1.i
1 r3/.hg/store/fncache
+ 1 r3/.hg/store/phaseroots
1 r3/.hg/store/undo
1 r3/.hg/store/undo.phaseroots
@@ -197,6 +200,7 @@
2 r4/.hg/store/data/d1/f2.i
2 r4/.hg/store/data/f1.i
2 r4/.hg/store/fncache
+ 2 r4/.hg/store/phaseroots
2 r4/.hg/store/undo
2 r4/.hg/store/undo.phaseroots
2 r4/.hg/undo.bookmarks
@@ -227,6 +231,7 @@
2 r4/.hg/store/data/d1/f2.i
2 r4/.hg/store/data/f1.i
2 r4/.hg/store/fncache
+ 2 r4/.hg/store/phaseroots
2 r4/.hg/store/undo
2 r4/.hg/store/undo.phaseroots
2 r4/.hg/undo.bookmarks
diff --git a/tests/test-inherit-mode.t b/tests/test-inherit-mode.t
--- a/tests/test-inherit-mode.t
+++ b/tests/test-inherit-mode.t
@@ -76,6 +76,7 @@
00660 ./.hg/store/data/dir/bar.i
00660 ./.hg/store/data/foo.i
00660 ./.hg/store/fncache
+ 00660 ./.hg/store/phaseroots
00660 ./.hg/store/undo
00660 ./.hg/store/undo.phaseroots
00660 ./.hg/undo.bookmarks
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -7,4 +7,4 @@
$ hg ci -m 'first'
$ hglog
- 0 0 first
+ 0 1 first
More information about the Mercurial-devel
mailing list