##// END OF EJS Templates
inline-changelog: fix pending transaction visibility when splitting...
marmoute -
r52531:1721d983 stable
parent child Browse files
Show More
@@ -1148,7 +1148,14 b' class _InnerRevlog:'
1148 )
1148 )
1149
1149
1150 def _divert_index(self):
1150 def _divert_index(self):
1151 return self.index_file + b'.a'
1151 index_file = self.index_file
1152 # when we encounter a legacy inline-changelog, split it. However it is
1153 # important to use the expected filename for pending content
1154 # (<radix>.a) otherwise hooks won't be seeing the content of the
1155 # pending transaction.
1156 if index_file.endswith(b'.s'):
1157 index_file = self.index_file[:-2]
1158 return index_file + b'.a'
1152
1159
1153 def delay(self):
1160 def delay(self):
1154 assert not self.is_open
1161 assert not self.is_open
@@ -98,9 +98,7 b' Before 6.7.3 this used to delete the cha'
98 $ echo b > b
98 $ echo b > b
99 $ hg add b
99 $ hg add b
100 $ hg commit -m "second changeset"
100 $ hg commit -m "second changeset"
101 pre-txn tip rev: 1 (missing-correct-output !)
101 pre-txn tip rev: 1
102 warning: ignoring unknown working parent 11b63e930bf2! (known-bad-output !)
103 pre-txn tip rev: 0 (known-bad-output !)
104 $ hg verify
102 $ hg verify
105 checking changesets
103 checking changesets
106 checking manifests
104 checking manifests
@@ -195,8 +193,7 b' Before 6.7.3 this used to delete the ser'
195 adding changesets
193 adding changesets
196 adding manifests
194 adding manifests
197 adding file changes
195 adding file changes
198 pre-txn tip rev: 1 (missing-correct-output !)
196 pre-txn tip rev: 1
199 pre-txn tip rev: 0 (known-bad-output !)
200 added 1 changesets with 1 changes to 1 files
197 added 1 changesets with 1 changes to 1 files
201 $ cd ..
198 $ cd ..
202
199
@@ -289,8 +286,7 b' Before 6.7.3 this used to delete the ser'
289 remote: adding changesets
286 remote: adding changesets
290 remote: adding manifests
287 remote: adding manifests
291 remote: adding file changes
288 remote: adding file changes
292 remote: pre-txn tip rev: 1 (missing-correct-output !)
289 remote: pre-txn tip rev: 1
293 remote: pre-txn tip rev: 0 (known-bad-output !)
294 remote: added 1 changesets with 1 changes to 1 files
290 remote: added 1 changesets with 1 changes to 1 files
295 $ cd ..
291 $ cd ..
296
292
General Comments 0
You need to be logged in to leave comments. Login now