facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

pushrebase: fix typo

Browse Source 
Test Plan: unit tests

Reviewers: #fbhgext, ryanmce

Reviewed By: #fbhgext, ryanmce

Differential Revision: https://phab.mercurial-scm.org/D177
This commit is contained in:
Jeroen Vaelen 2017-07-24 11:42:24 -07:00
parent 8d71aaf0cf
commit f786cd6bdb
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext3rd/pushrebase.py
View File

@ -936,7 +936,7 @@ def getontotarget(op, params, bundle):
def printpushmessage(op, revs, bundle):
# Notify the user of what is being pushed
plural = 's' if len(revs) > 1 else ''
op.repo.ui.warn(_("pushing %s changset%s:\n") % (len(revs), plural))
op.repo.ui.warn(_("pushing %s changeset%s:\n") % (len(revs), plural))
maxoutput = 10
for i in range(0, min(len(revs), maxoutput)):
firstline = bundle[revs[i]].description().split('\n')[0][:50]

4
tests/test-pull-createmarkers-hide-later.t
View File

@ -86,7 +86,7 @@ when a diff is landed with landcastle.
$ hg push -r . --to master
pushing rev cc68f5e5f8d6 to destination ssh://user@dummy/server bookmark master
searching for changes
remote: pushing 2 changsets:
remote: pushing 2 changesets:
remote: e0672eeeb97c add b
remote: cc68f5e5f8d6 add c
updating bookmark master
@ -147,7 +147,7 @@ Now land the last diff.
$ hg push -r . --to master
pushing rev 296f9d37d5c1 to destination ssh://user@dummy/server bookmark master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 296f9d37d5c1 add d
updating bookmark master

4
tests/test-pull-createmarkers.t
View File

@ -61,7 +61,7 @@ The first client works on several diffs while the second client lands one of her
$ hg push --to master
pushing rev 2e73b79a63d8 to destination ssh://user@dummy/server bookmark master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 2e73b79a63d8 add b
updating bookmark master
$ cd ../client
@ -85,7 +85,7 @@ The first client works on several diffs while the second client lands one of her
$ hg push --to master
pushing rev d5895ab36037 to destination ssh://user@dummy/server bookmark master
searching for changes
remote: pushing 3 changsets:
remote: pushing 3 changesets:
remote: 1a07332e9fa1 add c
remote: ee96b78ae17d add d
remote: d5895ab36037 add e

2
tests/test-pushrebase-fastmanifest.t
View File

@ -78,5 +78,5 @@ Test that pushing to a remotename gets rebased (client1 -> client2)
$ hg push --to mybook ssh://user@dummy/client2
pushing to ssh://user@dummy/client2
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: eb7a4df38d10 dummy commit

4
tests/test-pushrebase-manifests.t
View File

@ -162,7 +162,7 @@ blocking. There shouldn't be any "[client1 push]" output here.
[client2 push] remote: read manifest outside the lock :)
[client2 push] remote: read manifest outside the lock :)
[client2 push] remote: (?)
[client2 push] remote: pushing 1 changset:
[client2 push] remote: pushing 1 changeset:
[client2 push] remote: 4ab7e28729f6 c2 => yyy (second)
[client2 push] remote: read flat manifest :(
[client2 push] remote: (?)
@ -192,7 +192,7 @@ Check that the first push is still running/blocked...
[client1 push] searching for changes
[client1 push] remote: read manifest outside the lock :)
[client1 push] remote: read manifest outside the lock :)
[client1 push] remote: pushing 2 changsets:
[client1 push] remote: pushing 2 changesets:
[client1 push] remote: 8cf3b846b3a4 c1 => xxx (third)
[client1 push] remote: 1fe62957ca8a c1 => baz (fourth)
[client1 push] remote: read flat manifest :(

2
tests/test-pushrebase-protection.t
View File

@ -58,7 +58,7 @@ Pushrebase pushes should be allowed
$ hg push --config "extensions.bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py" --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
pushing to $TESTTMP/server (glob)
searching for changes
pushing 1 changset:
pushing 1 changeset:
1846eede8b68 b
exporting bookmark master

12
tests/test-pushrebase-remotenames.t
View File

@ -60,7 +60,7 @@ Test that pushing to a remotename gets rebased
$ hg push --to master
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 5c3cfb78df2f client's commit
remote: 2 new changesets from the server will be downloaded
adding changesets
@ -99,7 +99,7 @@ Test pushing a new bookmark
$ hg -R client push --to newbook --create
pushing rev 5c3cfb78df2f to destination ssh://user@dummy/server bookmark newbook
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 5c3cfb78df2f client's commit
exporting bookmark newbook
$ hg -R server book
@ -185,7 +185,7 @@ Test a push that comes with out-of-date bookmark discovery
pushing rev 5db65b93a12b to destination ssh://user@dummy/server bookmark bm
searching for changes
remote: moved bookmark to rev 1
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 5db65b93a12b cc
remote: 2 new changesets from the server will be downloaded
adding changesets
@ -230,7 +230,7 @@ Test that we still don't allow non-ff bm changes
pushing rev efec53e7b035 to destination ssh://user@dummy/server bookmark bm
searching for changes
remote: moved bookmark to rev 1
remote: pushing 2 changsets:
remote: pushing 2 changesets:
remote: 5db65b93a12b cc
remote: efec53e7b035 dd
remote: 1 new changeset from the server will be downloaded
@ -275,7 +275,7 @@ Test force pushes
$ hg push -f --to master
pushing rev 1846eede8b68 to destination * (glob)
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 1846eede8b68 b
updating bookmark master
$ hg pull
@ -329,7 +329,7 @@ Test 'hg push' with a tracking bookmark
$ hg push
pushing rev d2ae7f538514 to destination ssh://user@dummy/trackingserver bookmark master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: d2ae7f538514 b
remote: 2 new changesets from the server will be downloaded
adding changesets

22
tests/test-pushrebase.t
View File

@ -128,7 +128,7 @@ Stack of non-conflicting commits should be accepted
46a2df24e27273bb06dbf28b085fcc2e911bf986
0e3997dc073308e42715a44d345466690abfd09a
sending unbundle command
remote: pushing 2 changsets:
remote: pushing 2 changesets:
remote: 46a2df24e272 b => xxx
remote: 0e3997dc0733 b => baz
remote: 3 new changesets from the server will be downloaded
@ -192,7 +192,7 @@ Regular commits should go through without changing hash
$ hg push --to default
pushing to ssh://user@dummy/server
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 741fd2094512 b => quux
$ cd ../server
@ -331,7 +331,7 @@ Pushing a merge should rebase only the latest side of the merge
$ hg push --to master -B master
pushing to ssh://user@dummy/server
searching for changes
remote: pushing 5 changsets:
remote: pushing 5 changesets:
remote: e6b7549904cd branch left
remote: add5ec74853d branch start
remote: 5a0cbf3df4ef branch middle
@ -416,7 +416,7 @@ With evolution enabled, should set obsolescence markers
$ hg push --to default
pushing to ssh://user@dummy/server
searching for changes
remote: pushing 2 changsets:
remote: pushing 2 changesets:
remote: 9467a8ee5d0d b => k
remote: e73acfaeee82 b => foobar
remote: 4 new changesets from the server will be downloaded
@ -491,7 +491,7 @@ Test pushing master bookmark, fast forward
$ hg push --to master
pushing to ssh://user@dummy/server
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 56b2e0949966 b => babar
updating bookmark master
$ hg log -r master -R ../server -T"{node}\n"
@ -622,7 +622,7 @@ Test that hooks are fired with the correct variables
searching for changes
prepushrebase hook: HG_BUNDLE2=1 HG_HOOKNAME=prepushrebase HG_HOOKTYPE=prepushrebase HG_HOOK_BUNDLEPATH=* HG_NODE=4fcee35c508c1019667f72cae9b843efa8908701 HG_NODE_ONTO=e95be919ac60f0c114075e32a0a4301afabadb60 HG_SOURCE=push (glob)
prechangegroup hook: HG_BUNDLE2=1 HG_HOOKNAME=prechangegroup HG_HOOKTYPE=prechangegroup HG_SOURCE=push HG_TXNID=TXN:* HG_URL=file:$TESTTMP/hookserver (glob)
pushing 3 changsets:
pushing 3 changesets:
4fcee35c508c first
11be4ca7f3f4 second
a5e72ac0df88 last
@ -684,7 +684,7 @@ Test date rewriting
$ hg push --to master
pushing to $TESTTMP/rewritedate (glob)
searching for changes
pushing 1 changset:
pushing 1 changeset:
d5e255ef74f8 c
1 new changeset from the server will be downloaded
adding changesets
@ -714,7 +714,7 @@ Test date rewriting with a merge commit
$ hg push --to master
pushing to $TESTTMP/rewritedate (glob)
searching for changes
pushing 3 changsets:
pushing 3 changesets:
a5f9a9a43049 x
c1392466a61e y
4514adb1f536 merge
@ -757,7 +757,7 @@ Test pushrebase on merge commit where master is on the p2 side
$ hg push --to master
pushing to $TESTTMP/p2mergeserver (glob)
searching for changes
pushing 3 changsets:
pushing 3 changesets:
cde40f86152f add b
6c337f0241b3 add c
4ae459502279 merge b and c
@ -817,7 +817,7 @@ Test force pushes
$ hg push -f --to master -B master
pushing to $TESTTMP/forcepushserver (glob)
searching for changes
pushing 1 changset:
pushing 1 changeset:
1846eede8b68 b
exporting bookmark master
$ hg pull
@ -880,7 +880,7 @@ phase is updated correctly with the marker information.
$ hg push -r . --to default
pushing to $TESTTMP/server1 (glob)
searching for changes
pushing 1 changset:
pushing 1 changeset:
045279cde9f0 a2
2 new changesets from the server will be downloaded
adding changesets

4
tests/test-treemanifest-server.t
View File

@ -92,7 +92,7 @@ Test pushing only flat fails if forcetreereceive is on
$ hg push --to mybook
pushing to ssh://user@dummy/master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 15486e46ccf6 add subdir2/z
remote: error: pushes must contain tree manifests when the server has pushrebase.forcetreereceive enabled
abort: push failed on remote
@ -130,7 +130,7 @@ Test pushing only trees (no flats) with pushrebase creates trees on the server
$ hg push --to mybook
pushing to ssh://user@dummy/master
searching for changes
remote: pushing 1 changset:
remote: pushing 1 changeset:
remote: 15486e46ccf6 add subdir2/z
$ ls ../master/.hg/store/meta
subdir