mirror of
https://github.com/facebook/sapling.git
synced 2024-10-05 14:28:17 +03:00
edenapi_upload: change uploading commit message level
Summary: If there are multiple commits, it might be nosiy for users when pushing a long diff stack to remote server and the commits have not been uploaded by commit cloud. This diff changes the message level to `note`, users will be see it when using `-v` flag. Reviewed By: markbt Differential Revision: D52168058 fbshipit-source-id: a99da5c6942769b19c4b3b8aac97ab3d1710d919
This commit is contained in:
Zhaolong Zhu
Facebook GitHub Bot
parent
90de8eba1d
commit
29893d927d
@ -134,7 +134,6 @@ This test also checks file content deduplication. We upload 1 file content and 1
|
||||
edenapi: queue 2 trees for upload
|
||||
INFO edenapi::client: Requesting trees upload for 2 item(s)
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit '536d3fb3929eab4b01e63ab7fc9b25a5c8a08bc9'...
|
||||
INFO edenapi::client: Requesting changesets upload for 1 item(s)
|
||||
edenapi: uploaded 1 changeset
|
||||
|
||||
@ -188,7 +187,6 @@ The files of the second commit are identical to the files of the first commit, s
|
||||
edenapi: queue 1 tree for upload
|
||||
INFO edenapi::client: Requesting trees upload for 1 item(s)
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '65289540f44d80cecffca8a3fd655c0ca6243cd9'...
|
||||
INFO edenapi::client: Requesting changesets upload for 1 item(s)
|
||||
edenapi: uploaded 1 changeset
|
||||
|
||||
@ -258,7 +256,6 @@ Also, check that upload will not reupload file contents again.
|
||||
edenapi: queue 0 files for upload
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit 'a8c7c28d0391c5948f0a40f43e8b16d7172289cf'...
|
||||
edenapi: uploaded 1 changeset
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
@ -324,7 +321,6 @@ Also, dedup for file contents is expected to work (see queue 100 files but only
|
||||
edenapi: queue 2 trees for upload
|
||||
INFO edenapi::client: Requesting trees upload for 2 item(s)
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit '32551ca744171ab6eedf48245d4fab816292ae5f'...
|
||||
INFO edenapi::client: Requesting changesets upload for 1 item(s)
|
||||
edenapi: uploaded 1 changeset
|
||||
commitcloud: commits synchronized
|
||||
@ -368,7 +364,6 @@ No trees or filenodes are expected to be reuploaded.
|
||||
edenapi: queue 1 commit for upload
|
||||
edenapi: queue 0 files for upload
|
||||
edenapi: queue 0 trees for upload
|
||||
edenapi: uploading commit 'c8b3ca4878376f03b729cc867113280dc38baf23'...
|
||||
edenapi: uploaded 1 changeset
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
@ -417,9 +412,6 @@ Check the force flag for backup. Local cache checks must be ignoree
|
||||
edenapi: queue 6 trees for upload
|
||||
INFO edenapi::client: Requesting trees upload for 6 item(s)
|
||||
edenapi: uploaded 6 trees
|
||||
edenapi: uploading commit '536d3fb3929eab4b01e63ab7fc9b25a5c8a08bc9'...
|
||||
edenapi: uploading commit 'a8c7c28d0391c5948f0a40f43e8b16d7172289cf'...
|
||||
edenapi: uploading commit 'c8b3ca4878376f03b729cc867113280dc38baf23'...
|
||||
INFO edenapi::client: Requesting changesets upload for 3 item(s)
|
||||
edenapi: uploaded 3 changesets
|
||||
|
||||
|
||||
@ -124,9 +124,6 @@ Make commits in the first client, and sync it
|
||||
edenapi: uploaded 3 files
|
||||
edenapi: queue 3 trees for upload
|
||||
edenapi: uploaded 3 trees
|
||||
edenapi: uploading commit '929f2b9071cf032d9422b3cce9773cbe1c574822'...
|
||||
edenapi: uploading commit 'e3133a4a05d58526656505f837b4ec6a66fb2709'...
|
||||
edenapi: uploading commit 'c4f3cf0b6f491ac3a792a95a73a4f186836f08af'...
|
||||
edenapi: uploaded 3 changesets
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
@ -176,9 +173,6 @@ Make commits from the second client and sync it
|
||||
edenapi: uploaded 3 files
|
||||
edenapi: queue 3 trees for upload
|
||||
edenapi: uploaded 3 trees
|
||||
edenapi: uploading commit '4594cad5305da610864d2fac2e1f289af29f2c80'...
|
||||
edenapi: uploading commit '5267c897028ead469dbc2ac682c64dd20e1e1453'...
|
||||
edenapi: uploading commit 'c981069f3f0504264ce2fc76e96d49d74d8b18ba'...
|
||||
edenapi: uploaded 3 changesets
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
@ -226,9 +220,6 @@ On the first client rebase the stack
|
||||
edenapi: queue 0 files for upload
|
||||
edenapi: queue 3 trees for upload
|
||||
edenapi: uploaded 3 trees
|
||||
edenapi: uploading commit 'd79a28423f1418c8d38f273372df978e45738f4a'...
|
||||
edenapi: uploading commit '8da26d088b8f7fb4b56dc4db5d0d356a643bfc25'...
|
||||
edenapi: uploading commit 'f5aa28a22f7bb48c14c733d0c731e6ca65882d4b'...
|
||||
edenapi: uploaded 3 changesets
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
@ -368,8 +359,6 @@ The purpose of the test is to check syncing of remote bookmarks and to verify th
|
||||
edenapi: uploaded 2 files
|
||||
edenapi: queue 2 trees for upload
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit '2c6d1f3b1bd6973bd6d4478ed139525d0800ce42'...
|
||||
edenapi: uploading commit 'f141e512974a53a739b7d7ab33aca9f18c8feef0'...
|
||||
edenapi: uploaded 2 changesets
|
||||
commitcloud: commits synchronized
|
||||
finished in * (glob)
|
||||
|
||||
@ -31,7 +31,6 @@ Pushrebase commit 1
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit 'a0c9c57910584da709d7f4ed9852d66693a45ba7'...
|
||||
edenapi: uploaded 1 changeset
|
||||
updating remote bookmark master_bookmark
|
||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -85,7 +84,6 @@ Push rebase fails with conflict in the bottom of the stack
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '0c67ec8c24b924e95a718ea8217267b85d7af608'...
|
||||
edenapi: uploaded 1 changeset
|
||||
updating remote bookmark master_bookmark
|
||||
abort: Server error: Conflicts while pushrebasing: [PushrebaseConflict { left: NonRootMPath("1"), right: NonRootMPath("1") }]
|
||||
@ -103,8 +101,6 @@ Push rebase fails with conflict in the top of the stack
|
||||
edenapi: queue 0 files for upload
|
||||
edenapi: queue 2 trees for upload
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit 'c9b2673d32182756f799beff4ee8dc6a28645167'...
|
||||
edenapi: uploading commit '8d2ff619947e17ac013521d001c0a1e4c2f89a94'...
|
||||
edenapi: uploaded 2 changesets
|
||||
updating remote bookmark master_bookmark
|
||||
abort: Server error: Conflicts while pushrebasing: [PushrebaseConflict { left: NonRootMPath("1"), right: NonRootMPath("1") }]
|
||||
@ -123,8 +119,6 @@ Push stack
|
||||
edenapi: uploaded 2 files
|
||||
edenapi: queue 2 trees for upload
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit 'e91cd89a81a52269b7767c800db21e62b9cf98db'...
|
||||
edenapi: uploading commit '7a68f123d810d76ef65e286a3e4eb46461955530'...
|
||||
edenapi: uploaded 2 changesets
|
||||
updating remote bookmark master_bookmark
|
||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -159,7 +153,6 @@ Push fast-forward
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '59e5396444cfbcb86719d32e14c930bf0558fe98'...
|
||||
edenapi: uploaded 1 changeset
|
||||
updating remote bookmark master_bookmark
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
@ -363,7 +356,6 @@ Test creating a bookmark and new head
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '7a037594e2026b6ceb5dd9bc01eaf96b28dc3ce4'...
|
||||
edenapi: uploaded 1 changeset
|
||||
creating remote bookmark newbook
|
||||
|
||||
@ -394,7 +386,6 @@ Test non-fast-forward force pushrebase
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '4899f9112d9b79c3ecbc343169db37fbe1efdd20'...
|
||||
edenapi: uploaded 1 changeset
|
||||
moving remote bookmark newbook from 7a037594e202 to 4899f9112d9b
|
||||
-- "20 draft newbook" gets moved to 26 and 20 gets hidden.
|
||||
@ -437,7 +428,6 @@ Check that a force pushrebase with mutation markers.
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 1 tree for upload
|
||||
edenapi: uploaded 1 tree
|
||||
edenapi: uploading commit '*'... (glob)
|
||||
edenapi: uploaded 1 changeset
|
||||
abort: forced push blocked because commit * contains mutation metadata (glob)
|
||||
(use 'hg amend --config mutation.record=false' to remove the metadata)
|
||||
@ -458,7 +448,6 @@ Check that we can replace a file with a directory
|
||||
edenapi: uploaded 1 file
|
||||
edenapi: queue 2 trees for upload
|
||||
edenapi: uploaded 2 trees
|
||||
edenapi: uploading commit '4e5fec14573fa557760d017acfa25e0021088623'...
|
||||
edenapi: uploaded 1 changeset
|
||||
updating remote bookmark newbook
|
||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
|
||||
@ -300,7 +300,7 @@ def uploadhgchangesets(repo, revs, force=False, skipknowncheck=False):
|
||||
# Uploading changesets
|
||||
changesets = []
|
||||
for node in uploadcommitqueue.iterrev():
|
||||
repo.ui.status(
|
||||
repo.ui.note(
|
||||
_("uploading commit '%s'...\n") % nodemod.hex(node), component="edenapi"
|
||||
)
|
||||
ctx = repo[node]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user