bundle2: remove 'n new obsolescence markers' message

Summary: This makes transition to mutation smoother.

Reviewed By: sfilipco

Differential Revision: D21913608

fbshipit-source-id: b9ba470572ed68dff75104bba9dbb5c8622dcfb0
This commit is contained in:
Jun Wu 2020-06-10 17:33:43 -07:00 committed by Facebook GitHub Bot
parent 9cd4491c02
commit 9044ccc3da
10 changed files with 0 additions and 18 deletions

View File

@ -2227,8 +2227,6 @@ def handleobsmarker(op, inpart):
return
new = op.repo.obsstore.mergemarkers(tr, markerdata)
op.repo.invalidatevolatilesets()
if new:
op.repo.ui.status(_("%i new obsolescence markers\n") % new)
op.records.add("obsmarkers", {"new": new})
reply = op.reply
if reply is not None:

View File

@ -147,7 +147,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd $TESTTMP/client
@ -170,7 +169,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

View File

@ -72,7 +72,6 @@ The first client works on several diffs while the second client lands one of her
adding manifests
adding file changes
added 4 changesets with 1 changes to 4 files
3 new obsolescence markers
updating bookmark master
remote: pushing 3 changesets:
remote: 1a07332e9fa1 add c

View File

@ -151,7 +151,6 @@ blocking. There shouldn't be any "[client1 push]" output here.
[client2 push] adding manifests
[client2 push] adding file changes
[client2 push] added 2 changesets with 1 changes to 2 files
[client2 push] 1 new obsolescence markers
[client2 push] remote: read manifest outside the lock :)
[client2 push] remote: read manifest outside the lock :)
[client2 push] remote: read manifest outside the lock :)
@ -184,7 +183,6 @@ Check that the first push is still running/blocked...
[client1 push] adding manifests
[client1 push] adding file changes
[client1 push] added 4 changesets with 2 changes to 3 files
[client1 push] 2 new obsolescence markers
[client1 push] remote: read manifest outside the lock :)
[client1 push] remote: read manifest outside the lock :)
[client1 push] remote: read manifest outside the lock :)

View File

@ -432,7 +432,6 @@ With evolution enabled, should set obsolescence markers
adding manifests
adding file changes
added 4 changesets with 2 changes to 4 files
2 new obsolescence markers
remote: pushing 2 changesets:
remote: 9467a8ee5d0d b => k
remote: e73acfaeee82 b => foobar
@ -730,7 +729,6 @@ Test date rewriting
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -T '{desc} {date|isodate}'
@ c 2001-09-09 01:46 +0000
@ -761,7 +759,6 @@ Test date rewriting with a merge commit
adding manifests
adding file changes
added 3 changesets with 0 changes to 2 files
3 new obsolescence markers
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
@ -802,7 +799,6 @@ Test pushrebase on merge commit where master is on the p2 side
adding manifests
adding file changes
added 2 changesets with 0 changes to 2 files
2 new obsolescence markers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R ../p2mergeserver log -G -T '{rev}: {desc}'
o 3: merge b and c
@ -918,7 +914,6 @@ phase is updated correctly with the marker information.
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files
1 new obsolescence markers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up tip -q
$ log --hidden

View File

@ -48,7 +48,6 @@ Make server treeonly and push trees to it
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
2 new obsolescence markers
updating bookmark foo
remote: pushing 2 changesets:
remote: e297a1e684b7 C

View File

@ -102,7 +102,6 @@ Push treeonly merge commit to a treeonly server
adding manifests
adding file changes
added 4 changesets with 9 changes to 9 files
3 new obsolescence markers
updating bookmark foo
remote: pushing 3 changesets:
remote: a1d68bae23ee Edit file

View File

@ -108,7 +108,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
updating bookmark master
remote: pushing 1 changeset:
remote: e68715a0fc4c x4

View File

@ -85,7 +85,6 @@ Push in from the client.
adding manifests
adding file changes
added 4 changesets with 1 changes to 3 files
3 new obsolescence markers
updating bookmark @
remote: pushing 5 changesets:
remote: c85f9ce7b342 alpha

View File

@ -153,7 +153,6 @@ sh % "hg push --to=master -r $F" == r"""
adding manifests
adding file changes
added 2 changesets with 0 changes to 4 files
2 new obsolescence markers
updating bookmark master"""
sh % "hg files -r master" == r"""
@ -240,7 +239,6 @@ sh % "hg push --to=master -r $J" == r"""
adding manifests
adding file changes
added 4 changesets with 0 changes to 2 files
4 new obsolescence markers
updating bookmark master"""
# Check server after pushrebasing the branch whose parent is E