##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

transaction: issue "new obsmarkers" message at the end of the transaction...
marmoute -
r43164:38392d5b default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -2193,8 +2193,6 b' def handleobsmarker(op, inpart):'
2193 2193 return
2194 2194 new = op.repo.obsstore.mergemarkers(tr, markerdata)
2195 2195 op.repo.invalidatevolatilesets()
2196 if new:
2197 op.repo.ui.status(_('%i new obsolescence markers\n') % new)
2198 2196 op.records.add('obsmarkers', {'new': new})
2199 2197 if op.reply is not None:
2200 2198 rpart = op.reply.newpart('reply:obsmarkers')
Show file before | Show file after | Hide comments
@@ -1766,7 +1766,6 b' def debugobsolete(ui, repo, precursor=No'
1766 1766 repo.obsstore.create(tr, prec, succs, opts['flags'],
1767 1767 parents=parents, date=date,
1768 1768 metadata=metadata, ui=ui)
1769 repo.ui.status(('1 new obsolescence markers\n'))
1770 1769 tr.close()
1771 1770 except ValueError as exc:
1772 1771 raise error.Abort(_('bad obsmarker input: %s') %
Show file before | Show file after | Hide comments
@@ -1766,6 +1766,9 b' def registersummarycallback(repo, otr, t'
1766 1766 @reportsummary
1767 1767 def reportobsoleted(repo, tr):
1768 1768 obsoleted = obsutil.getobsoleted(repo, tr)
1769 newmarkers = len(tr.changes.get('obsmarkers', ()))
1770 if newmarkers:
1771 repo.ui.status(_('%i new obsolescence markers\n') % newmarkers)
1769 1772 if obsoleted:
1770 1773 repo.ui.status(_('obsoleted %i changesets\n')
1771 1774 % len(obsoleted))
Show file before | Show file after | Hide comments
@@ -74,13 +74,13 b' Real world exchange'
74 74 Add more obsolescence information
75 75
76 76 $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
77 pre-close-tip:02de42196ebe draft
77 78 1 new obsolescence markers
78 pre-close-tip:02de42196ebe draft
79 79 postclose-tip:02de42196ebe draft
80 80 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
81 81 $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
82 pre-close-tip:02de42196ebe draft
82 83 1 new obsolescence markers
83 pre-close-tip:02de42196ebe draft
84 84 postclose-tip:02de42196ebe draft
85 85 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
86 86
@@ -95,8 +95,8 b' clone --pull'
95 95 adding manifests
96 96 adding file changes
97 97 added 2 changesets with 2 changes to 2 files
98 pre-close-tip:9520eea781bc draft
98 99 1 new obsolescence markers
99 pre-close-tip:9520eea781bc draft
100 100 new changesets cd010b8cd998:9520eea781bc (1 drafts)
101 101 postclose-tip:9520eea781bc draft
102 102 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
@@ -124,8 +124,8 b' pull'
124 124 adding manifests
125 125 adding file changes
126 126 added 1 changesets with 1 changes to 1 files (+1 heads)
127 pre-close-tip:24b6387c8c8c draft
127 128 1 new obsolescence markers
128 pre-close-tip:24b6387c8c8c draft
129 129 new changesets 24b6387c8c8c (1 drafts)
130 130 postclose-tip:24b6387c8c8c draft
131 131 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
@@ -194,8 +194,8 b' add extra data to test their exchange du'
194 194 postclose-tip:02de42196ebe draft
195 195 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
196 196 $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
197 pre-close-tip:02de42196ebe draft
197 198 1 new obsolescence markers
198 pre-close-tip:02de42196ebe draft
199 199 postclose-tip:02de42196ebe draft
200 200 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
201 201 $ hg -R main bookmark --rev 02de42196ebe book_02de
@@ -203,8 +203,8 b' add extra data to test their exchange du'
203 203 postclose-tip:02de42196ebe draft book_02de
204 204 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
205 205 $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
206 pre-close-tip:02de42196ebe draft book_02de
206 207 1 new obsolescence markers
207 pre-close-tip:02de42196ebe draft book_02de
208 208 postclose-tip:02de42196ebe draft book_02de
209 209 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
210 210 $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc
@@ -212,8 +212,8 b' add extra data to test their exchange du'
212 212 postclose-tip:02de42196ebe draft book_02de
213 213 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
214 214 $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16`
215 pre-close-tip:02de42196ebe draft book_02de
215 216 1 new obsolescence markers
216 pre-close-tip:02de42196ebe draft book_02de
217 217 postclose-tip:02de42196ebe draft book_02de
218 218 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
219 219 $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd
@@ -221,8 +221,8 b' add extra data to test their exchange du'
221 221 postclose-tip:02de42196ebe draft book_02de
222 222 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
223 223 $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8`
224 pre-close-tip:02de42196ebe draft book_02de
224 225 1 new obsolescence markers
225 pre-close-tip:02de42196ebe draft book_02de
226 226 postclose-tip:02de42196ebe draft book_02de
227 227 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
228 228 $ hg -R main bookmark --rev 32af7686d403 book_32af
@@ -230,8 +230,8 b' add extra data to test their exchange du'
230 230 postclose-tip:02de42196ebe draft book_02de
231 231 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
232 232 $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
233 pre-close-tip:02de42196ebe draft book_02de
233 234 1 new obsolescence markers
234 pre-close-tip:02de42196ebe draft book_02de
235 235 postclose-tip:02de42196ebe draft book_02de
236 236 txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
237 237
@@ -269,8 +269,8 b' push'
269 269 remote: adding manifests
270 270 remote: adding file changes
271 271 remote: added 1 changesets with 0 changes to 0 files (-1 heads)
272 remote: pre-close-tip:eea13746799a public book_eea1
272 273 remote: 1 new obsolescence markers
273 remote: pre-close-tip:eea13746799a public book_eea1
274 274 remote: pushkey: lock state after "bookmarks"
275 275 remote: lock: free
276 276 remote: wlock: free
@@ -304,9 +304,9 b' pull over ssh'
304 304 adding manifests
305 305 adding file changes
306 306 added 1 changesets with 1 changes to 1 files (+1 heads)
307 1 new obsolescence markers
308 307 updating bookmark book_02de
309 308 pre-close-tip:02de42196ebe draft book_02de
309 1 new obsolescence markers
310 310 new changesets 02de42196ebe (1 drafts)
311 311 postclose-tip:02de42196ebe draft book_02de
312 312 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
@@ -330,9 +330,9 b' pull over http'
330 330 adding manifests
331 331 adding file changes
332 332 added 1 changesets with 1 changes to 1 files (+1 heads)
333 1 new obsolescence markers
334 333 updating bookmark book_42cc
335 334 pre-close-tip:42ccdea3bb16 draft book_42cc
335 1 new obsolescence markers
336 336 new changesets 42ccdea3bb16 (1 drafts)
337 337 postclose-tip:42ccdea3bb16 draft book_42cc
338 338 txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
@@ -355,8 +355,8 b' push over ssh'
355 355 remote: adding manifests
356 356 remote: adding file changes
357 357 remote: added 1 changesets with 1 changes to 1 files
358 remote: pre-close-tip:5fddd98957c8 draft book_5fdd
358 359 remote: 1 new obsolescence markers
359 remote: pre-close-tip:5fddd98957c8 draft book_5fdd
360 360 remote: pushkey: lock state after "bookmarks"
361 361 remote: lock: free
362 362 remote: wlock: free
@@ -406,8 +406,8 b' push over http'
406 406 remote: adding manifests
407 407 remote: adding file changes
408 408 remote: added 1 changesets with 1 changes to 1 files
409 remote: pre-close-tip:32af7686d403 public book_32af
409 410 remote: 1 new obsolescence markers
410 remote: pre-close-tip:32af7686d403 public book_32af
411 411 remote: pushkey: lock state after "bookmarks"
412 412 remote: lock: free
413 413 remote: wlock: free
General Comments 0
You need to be logged in to leave comments. Login now