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

changegroup: do not show "(+/- ? heads)"

Browse Source 
Summary:
In an upcoming change we'll replace `cl.heads()` with `repo.heads()`.  In
changegroup code path the repo can be in an inconsistent state (ex. a bookmark
refers to an unknown commit) which breaks `repo.heads()`.

Since the whole purpose of the heads calculation is just to show
`(+/- ?  heads)`, which does not affect any real features, let's just
remove it.

Reviewed By: markbt

Differential Revision: D18366735

fbshipit-source-id: 893be2cec0c32b64a80b3ef4ca65b69f8ed76b27
This commit is contained in:
Jun Wu 2019-11-07 10:50:10 -08:00 committed by Facebook Github Bot
parent e33d12fcb7
commit 4b2f1c9625
91 changed files with 230 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
edenscm/mercurial/changegroup.py
View File

@ -313,7 +313,6 @@ class cg1unpacker(object):
# will not see an inconsistent view
cl = repo.changelog
cl.delayupdate(tr)
oldheads = set(cl.heads())
trp = weakref.proxy(tr)
# pull off the changeset group
@ -369,16 +368,7 @@ class cg1unpacker(object):
revisions += newrevs
files += newfiles
deltaheads = 0
if oldheads:
heads = cl.heads()
deltaheads = len(heads) - len(oldheads)
for h in heads:
if h not in oldheads and repo[h].closesbranch():
deltaheads -= 1
htext = ""
if deltaheads:
htext = _(" (%+d heads)") % deltaheads
repo.ui.status(
_("added %d changesets" " with %d changes to %d files%s\n")
@ -447,14 +437,6 @@ class cg1unpacker(object):
repo.hook("changegroup", **pycompat.strkwargs(hookargs))
newheads = [h for h in repo.heads() if h not in oldheads]
repo.ui.log(
"incoming",
"%s incoming changes - new heads: %s\n",
len(added),
", ".join([hex(c[:6]) for c in newheads]),
)
tr.addpostclose(
"changegroup-runhooks-%020i" % clstart,
lambda tr: repo._afterlock(runhooks),
@ -464,10 +446,7 @@ class cg1unpacker(object):
finally:
repo.ui.flush()
# never return 0 here:
if deltaheads < 0:
ret = deltaheads - 1
else:
ret = deltaheads + 1
ret = 1
return ret
def deltaiter(self):

2
tests/test-audit-path.t
View File

@ -77,7 +77,7 @@ unbundle tampered bundle
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 6 files (+4 heads)
added 5 changesets with 6 changes to 6 files
new changesets b7da9bf6b037:fc1393d727bc
attack .hg/test

10
tests/test-bookmarks.t
View File

@ -569,7 +569,7 @@ test clone with pull protocol
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
added 3 changesets with 3 changes to 3 files
new changesets f7b1eb17ad24:db815d6d32e6
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -645,7 +645,7 @@ create bundle with two heads
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets 125c9a1d6df6:9c404beeabc2
update to active bookmark if it's not the parent
@ -687,7 +687,7 @@ pull --update works the same as pull && update
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
updating bookmark Y
updating bookmark Z
new changesets 125c9a1d6df6:9c404beeabc2
@ -712,7 +712,7 @@ pull --update works the same as pull && update
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
updating bookmark Y
updating bookmark Z
new changesets 125c9a1d6df6:9c404beeabc2
@ -737,7 +737,7 @@ We warn about divergent during bare update to the active bookmark
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
updating bookmark Y
updating bookmark Z
new changesets 125c9a1d6df6:9c404beeabc2

8
tests/test-bundle-r.t
View File

@ -5,7 +5,7 @@
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets bfaf4b5cbf01:916f1afdef90
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -145,7 +145,7 @@
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
added 4 changesets with 2 changes to 3 files
new changesets c70afb1ee985:faa2e4234c7a
$ hg verify
checking changesets
@ -223,7 +223,7 @@ revision 2
adding changesets
adding manifests
adding file changes
added 6 changesets with 4 changes to 4 files (+1 heads)
added 6 changesets with 4 changes to 4 files
new changesets 93ee6ab32777:916f1afdef90
revision 8
@ -266,7 +266,7 @@ revision 4
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files (+1 heads)
added 4 changesets with 3 changes to 3 files
new changesets c70afb1ee985:faa2e4234c7a
revision 6

12
tests/test-bundle.t
View File

@ -102,7 +102,7 @@ Pull full.hg into empty (using --cwd)
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
Rollback empty
@ -118,7 +118,7 @@ Pull full.hg into empty again (using --cwd)
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
Pull full.hg into test (using -R)
@ -148,7 +148,7 @@ Pull full.hg into empty again (using -R)
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
Log -R full.hg in fresh empty
@ -232,7 +232,7 @@ hg -R ../full.hg verify
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle*../full.hg (glob)
@ -256,7 +256,7 @@ Pull full.hg into empty again (using -R; with hook)
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg
@ -545,7 +545,7 @@ Direct clone from bundle (all-history)
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets f9ee2f85a263:aa35859c02ea
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

10
tests/test-bundle2-exchange.t
View File

@ -49,7 +49,7 @@ The extension requires a repo (currently unused)
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
added 8 changesets with 7 changes to 7 files
pre-close-tip:02de42196ebe draft
new changesets cd010b8cd998:02de42196ebe
postclose-tip:02de42196ebe draft
@ -111,7 +111,7 @@ pull
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
pre-close-tip:24b6387c8c8c draft
new changesets 24b6387c8c8c
@ -249,7 +249,7 @@ push
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 0 files (-1 heads)
remote: added 1 changesets with 0 changes to 0 files
remote: 1 new obsolescence markers
remote: pre-close-tip:eea13746799a public book_eea1
remote: postclose-tip:eea13746799a public book_eea1
@ -281,7 +281,7 @@ pull over ssh
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
updating bookmark book_02de
pre-close-tip:02de42196ebe draft book_02de
@ -307,7 +307,7 @@ pull over http
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
updating bookmark book_42cc
pre-close-tip:42ccdea3bb16 draft book_42cc

2
tests/test-bundle2-format.t
View File

@ -823,7 +823,7 @@ Support for changegroup
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg log -G

10
tests/test-bundle2-multiple-changegroups.t
View File

@ -150,18 +150,18 @@ pullop.cgresult
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_PENDING=$TESTTMP/clone HG_SHAREDPENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
remote: changegroup2
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
added 3 changesets with 3 changes to 3 files
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SHAREDPENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
new changesets b3325c91a4d9:5cd59d311f65
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
pullop.cgresult is 3
pullop.cgresult is 1
$ hg log -G
o 7:5cd59d311f65 public test H
|
@ -218,7 +218,7 @@ pullop.cgresult
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (-1 heads)
added 1 changesets with 0 changes to 0 files
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_PENDING=$TESTTMP/clone HG_SHAREDPENDING=$TESTTMP/clone HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
remote: changegroup2
adding changesets
@ -229,7 +229,7 @@ pullop.cgresult
new changesets 71bd7b46de72:9d18e5bd9ab0
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
pullop.cgresult is -2
pullop.cgresult is 1
$ hg log -G
o 9:9d18e5bd9ab0 public test H
|

34
tests/test-bundle2-remote-changegroup.t
View File

@ -94,7 +94,7 @@ Start a simple HTTP server to serve bundles
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg -R repo log -G
@ -136,7 +136,7 @@ Test a pull with an remote-changegroup
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
added 5 changesets with 5 changes to 5 files
new changesets cd010b8cd998:9520eea781bc
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -147,7 +147,7 @@ Test a pull with an remote-changegroup
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
added 3 changesets with 2 changes to 2 files
new changesets 24b6387c8c8c:02de42196ebe
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
@ -193,12 +193,12 @@ Test a pull with an remote-changegroup and a following changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
remote: changegroup
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
added 3 changesets with 2 changes to 2 files
new changesets 32af7686d403:02de42196ebe
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
@ -244,12 +244,12 @@ Test a pull with a changegroup followed by an remote-changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
remote: remote-changegroup
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
added 3 changesets with 2 changes to 2 files
new changesets 32af7686d403:02de42196ebe
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
@ -300,7 +300,7 @@ Test a pull with two remote-changegroups and a changegroup
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
remote: remote-changegroup
adding changesets
adding manifests
@ -310,7 +310,7 @@ Test a pull with two remote-changegroups and a changegroup
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 32af7686d403:02de42196ebe
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H
@ -347,7 +347,7 @@ Hash digest tests
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -362,7 +362,7 @@ Hash digest tests
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -379,7 +379,7 @@ Hash digest mismatch throws an error
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: (glob)
@ -397,7 +397,7 @@ Multiple hash digests can be given
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -414,7 +414,7 @@ If either of the multiple hash digests mismatches, an error is thrown
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: (glob)
@ -430,7 +430,7 @@ If either of the multiple hash digests mismatches, an error is thrown
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle6.hg is corrupted: (glob)
@ -460,7 +460,7 @@ Corruption tests
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
remote: remote-changegroup
adding changesets
adding manifests
@ -530,7 +530,7 @@ Size mismatch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
transaction abort!
rollback completed
abort: bundle at http://localhost:$HGPORT/bundle4.hg is corrupted: (glob)

2
tests/test-clone-r.t
View File

@ -217,7 +217,7 @@
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
added 4 changesets with 2 changes to 3 files
new changesets 095197eb4973:a6a34bfa0076
$ hg verify
checking changesets

8
tests/test-clone.t
View File

@ -242,7 +242,7 @@ Testing clone --pull -u:
adding changesets
adding manifests
adding file changes
added 16 changesets with 16 changes to 3 files (+1 heads)
added 16 changesets with 16 changes to 3 files
new changesets acb14030fe0a:7b0a8591eda2
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -712,7 +712,7 @@ Clone with existing share dir should result in pull + share
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files (+4 heads)
added 4 changesets with 4 changes to 1 files
adding remote bookmark branch1
adding remote bookmark branch2
adding remote bookmark head1
@ -796,7 +796,7 @@ remote naming mode works as advertised
adding changesets
adding manifests
adding file changes
added 6 changesets with 6 changes to 1 files (+4 heads)
added 6 changesets with 6 changes to 1 files
new changesets b5f04eac9d8f:79168763a548
searching for changes
no changes found
@ -847,7 +847,7 @@ making another clone should only pull down requested rev
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
adding remote bookmark head1
adding remote bookmark head2
new changesets 99f71071f117

2
tests/test-commitcloud-backup-remotefilelog.t
View File

@ -144,7 +144,7 @@ the client doesn't receive the public commit file data during the pull.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
adding changesets
adding manifests
adding file changes

4
tests/test-commitcloud-backup-restore-markers.t
View File

@ -129,7 +129,7 @@ Clone fresh repo and try to restore from backup
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
new changesets 3969cd9723d1
$ hg sl --all
@ changeset: 2:948715751816
@ -186,7 +186,7 @@ Test createlandedasmarkers option disabled
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
new changesets 9b3ead1d8005:3969cd9723d1
$ hg sl --all
@ changeset: 2:948715751816

2
tests/test-commitcloud-backup-restore-obsolete.t
View File

@ -56,5 +56,5 @@ Restore the repo
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets b75a450e74d5:edb281c9cc7e

4
tests/test-commitcloud-backup-restore.t
View File

@ -110,7 +110,7 @@ Check bookmarks escaping
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 89ecc969c0ac
$ hg book
abook 1:89ecc969c0ac
@ -139,7 +139,7 @@ Create a repo with `/bookmarks/` in path
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets a2a9ae518b62
$ hg book
abook 1:89ecc969c0ac

4
tests/test-commitcloud-lazypull-phab.t
View File

@ -174,7 +174,7 @@ Test for `hg diff --since-last-submit`
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
diff -r a8080066a666 -r 95847be64d6a feature2.body.txt
--- a/feature2.body.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/feature2.body.txt Thu Jan 01 00:00:00 1970 +0000
@ -213,5 +213,5 @@ Test for `hg diff --since-last-submit`
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
a8080066a666ffa51c0a171e87d5a0396ecb559a Differential Revision: https://phabricator.fb.com/D1 (no-eol)

6
tests/test-commitcloud-lazypull.t
View File

@ -128,7 +128,7 @@ Sync from the second client and `hg unamend` there
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
$ tglog
@ 2: 1cf4a5a0e8fc 'feature1'
@ -191,11 +191,11 @@ Now cloud sync in the other client. The cycle means we can't reliably pick a de
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
new changesets cb45bbd0ae75:74b668b6b779
commitcloud: commits synchronized
finished in * sec (glob)

4
tests/test-commitcloud-sync-bookmarks.t
View File

@ -77,7 +77,7 @@ Fake land the commit
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
added 3 changesets with 2 changes to 2 files
new changesets 031d760782fb:67d363c9001e
obsoleted 1 changesets
$ tglogp
@ -143,7 +143,7 @@ Pull so that we have the public commit and sync again.
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
added 3 changesets with 2 changes to 2 files
new changesets 031d760782fb:67d363c9001e
$ hg cloud sync
commitcloud: synchronizing 'server' with 'user/test/default'

2
tests/test-commitcloud-sync-migration.t
View File

@ -154,7 +154,7 @@ The first client can now successfully sync using the new server.
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 3 files (+1 heads)
added 2 changesets with 2 changes to 3 files
new changesets 02f6fc2b7154:c701070be855
commitcloud: commits synchronized
finished in * (glob)

16
tests/test-commitcloud-sync-omission.t
View File

@ -185,7 +185,7 @@ Connect to commit cloud
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
1f9ebd6d1390ebc603e401171eda0c444a0f8754 not found, omitting oldbook bookmark
new changesets 1c1b7955142c:7f958333fe84
commitcloud: commits synchronized
@ -228,7 +228,7 @@ Sync these commits to the first client - it has everything
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets ff52de2f760c
commitcloud: commits synchronized
finished in * (glob)
@ -400,7 +400,7 @@ Second client syncs the old stack in, and now has the bookmark
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
added 3 changesets with 3 changes to 3 files
new changesets 1f9ebd6d1390:2b8dce7bd745
commitcloud: commits synchronized
finished in * (glob)
@ -459,14 +459,14 @@ Connect to commit cloud
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
added 3 changesets with 3 changes to 3 files
pulling 2b8dce7bd745
pulling from ssh://user@dummy/server
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
added 3 changesets with 3 changes to 3 files
1c1b7955142cd8a3beec705c9cca9d775ecb0fa8 not found, omitting midbook bookmark
new changesets ff52de2f760c:2b8dce7bd745
commitcloud: commits synchronized
@ -593,7 +593,7 @@ A full sync pulls the old commits in
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets 1c1b7955142c:d133b886da68
commitcloud: commits synchronized
finished in * (glob)
@ -815,7 +815,7 @@ Pull this into client1
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets f770b7f72fa5
Move midbook to the public commit.
@ -865,7 +865,7 @@ from the cloud workspace, but the sync should still work.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 3 files (+1 heads)
added 1 changesets with 0 changes to 3 files
f770b7f72fa59cf01503318ed2b26904cb255d03 not found, omitting midbook bookmark
obsoleted 1 changesets
new changesets 2ace67ee4791

8
tests/test-commitcloud-sync-oscillation.t
View File

@ -123,7 +123,7 @@ Share commits A B C D and E into the repo manually with a bundle
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
added 5 changesets with 5 changes to 5 files
new changesets 04b96a2be922:27ad02806080
$ cd client2
$ tglogp
@ -157,7 +157,7 @@ Connect to commit cloud
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 3 files (+1 heads)
added 2 changesets with 2 changes to 3 files
detected obsmarker inconsistency (fixing by obsoleting [] and reviving [449486ddff7a, 65299708466c, 27ad02806080])
new changesets 64b4d9634423:878302dcadc7
commitcloud: commits synchronized
@ -264,7 +264,7 @@ Pull it into one client
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 5817a557f93f
$ tglogp
o 8: 5817a557f93f public 'next'
@ -514,7 +514,7 @@ with commit cloud inactive.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 48be23e24839
$ cd client1
$ hg hide tip --config extensions.commitcloud=!

28
tests/test-commitcloud-sync.t
View File

@ -313,7 +313,7 @@ Sync the amended commit to the other client
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
obsoleted 2 changesets
new changesets a7bb357e7299:48610b1a7ec0
commitcloud: commits synchronized
@ -383,7 +383,7 @@ Expected result: the message telling that revision has been moved to another rev
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 2 files (+1 heads)
added 1 changesets with 0 changes to 2 files
obsoleted 1 changesets
new changesets 41f3b9359864
commitcloud: commits synchronized
@ -446,7 +446,7 @@ Expected result: client2 should be moved to the amended version
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
obsoleted 1 changesets
new changesets 8134e74ecdc8
commitcloud: commits synchronized
@ -504,11 +504,11 @@ Expected result: move should not happen, expect a message that move is ambiguous
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
new changesets abd5311ab3c6:cebbb614447e
commitcloud: commits synchronized
finished in * (glob)
@ -568,7 +568,7 @@ Expected result: client2 should be moved to fada67350ab0
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
obsoleted 1 changesets
new changesets fada67350ab0
commitcloud: commits synchronized
@ -931,11 +931,11 @@ And the commits should now be availble in the other client.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 3 files (+1 heads)
added 1 changesets with 0 changes to 3 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
new changesets a6b97eebbf74:9bd68ef10d6b
commitcloud: commits synchronized
finished in * (glob)
@ -1009,11 +1009,11 @@ Commit still becomes available in the other repo
adding changesets
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files (+1 heads)
added 2 changesets with 3 changes to 3 files
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets e58a6603d256:799d22972c4e
commitcloud: commits synchronized
finished in * (glob)
@ -1079,7 +1079,7 @@ Sync this onto the second client, the remote bookmarks don't change.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
adding changesets
adding manifests
adding file changes
@ -1108,7 +1108,7 @@ Do a pull on this client. The remote bookmarks now get updated.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 97250524560a
$ hg trglog
o 97250524560a 'public 2' default/publicbookmark2
@ -1139,7 +1139,7 @@ Rebase the commits again, and resync to the first client.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
adding changesets
adding manifests
adding file changes
@ -1247,7 +1247,7 @@ Reconnect to the default repository. This should work and pull in the commits.
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
adding changesets
adding manifests
adding file changes

2
tests/test-debugstrip.t
View File

@ -222,7 +222,7 @@ TODO: Make this test compatibile with obsstore enabled.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 264128213d29
$ rm .hg/strip-backup/*
$ hg log --graph

4
tests/test-default-push.t
View File

@ -123,7 +123,7 @@ Windows needs a leading slash to make a URL that passes all of the checks
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
$ hg --config 'paths.default:pushrev=draft()' push -f
pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
@ -131,7 +131,7 @@ Windows needs a leading slash to make a URL that passes all of the checks
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
Invalid :pushrev raises appropriately

4
tests/test-empty-group-t.py
View File

@ -119,7 +119,7 @@ sh % "hg -R b pull a" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 1ec3c74fc0e0"""
sh % "hg -R c pull a" == r"""
@ -128,5 +128,5 @@ sh % "hg -R c pull a" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets d15a0c284984"""

10
tests/test-eol-hook.t
View File

@ -118,7 +118,7 @@ Create repo
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
error: pretxnchangegroup hook failed: end-of-line check failed:
b.txt in fbcf9b1025f5 should not have CRLF line endings
transaction abort!
@ -139,7 +139,7 @@ Test checkheadshook alias
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
error: pretxnchangegroup hook failed: end-of-line check failed:
b.txt in fbcf9b1025f5 should not have CRLF line endings
transaction abort!
@ -160,7 +160,7 @@ We can fix the head and push again
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
added 3 changesets with 3 changes to 2 files
$ hg -R ../main rollback
repository tip rolled back to revision 5 (undo push)
@ -176,7 +176,7 @@ Test it still fails with checkallhook
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
added 3 changesets with 3 changes to 2 files
error: pretxnchangegroup hook failed: end-of-line check failed:
b.txt in fbcf9b1025f5 should not have CRLF line endings
transaction abort!
@ -206,7 +206,7 @@ Test multiple files/revisions output
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
added 3 changesets with 3 changes to 2 files
error: pretxnchangegroup hook failed: end-of-line check failed:
b.txt in fbcf9b1025f5 should not have CRLF line endings
d.txt in a7040e68714f should not have CRLF line endings

2
tests/test-fastdiscovery.t
View File

@ -67,5 +67,5 @@ Set knownserverbookmarks - fastdiscovery is used
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 85d8b0ac7dad

2
tests/test-fb-hgext-lfs-pushrebase.t
View File

@ -173,7 +173,7 @@ TODO: Make this test compatibile with obsstore enabled.
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
# This should work even if the HG server does not have access to LFS server

4
tests/test-fb-hgext-lfspushrebase-verify-blobs.t
View File

@ -149,7 +149,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
obsoleted 1 changesets
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -173,7 +173,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
1 new obsolescence markers
obsoleted 1 changesets
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

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

@ -100,7 +100,7 @@ hide them since there is a non-hidden successor.
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 2 files (+1 heads)
added 2 changesets with 0 changes to 2 files
new changesets e0672eeeb97c:cc68f5e5f8d6
obsoleted 3 changesets
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()'
@ -161,7 +161,7 @@ until now had non-hidden successors.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
new changesets 296f9d37d5c1
obsoleted 2 changesets
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' -r 'all()'

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

@ -86,7 +86,7 @@ The first client works on several diffs while the second client lands one of her
adding changesets
adding manifests
adding file changes
added 4 changesets with 1 changes to 4 files (+1 heads)
added 4 changesets with 1 changes to 4 files
3 new obsolescence markers
updating bookmark master
obsoleted 3 changesets
@ -172,7 +172,7 @@ changesets
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
new changesets a4884e89c0d5
obsoleted 1 changesets

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

@ -157,7 +157,7 @@ blocking. There shouldn't be any "[client1 push]" output here.
[client2 push] adding changesets
[client2 push] adding manifests
[client2 push] adding file changes
[client2 push] added 2 changesets with 1 changes to 2 files (+1 heads)
[client2 push] added 2 changesets with 1 changes to 2 files
[client2 push] 1 new obsolescence markers
[client2 push] obsoleted 1 changesets
[client2 push] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -194,7 +194,7 @@ Check that the first push is still running/blocked...
[client1 push] adding changesets
[client1 push] adding manifests
[client1 push] adding file changes
[client1 push] added 4 changesets with 2 changes to 3 files (+1 heads)
[client1 push] added 4 changesets with 2 changes to 3 files
[client1 push] 2 new obsolescence markers
[client1 push] obsoleted 2 changesets
[client1 push] 2 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-fb-hgext-pushrebase-pushkey.t
View File

@ -84,7 +84,7 @@ Push without pushrebase, and check that the hook sees the commit that was actual
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: added 1 changesets with 1 changes to 1 files
remote: log bookmarks master commitA -> commitC
remote: pushkey-abort: prepushkey.log hook failed
remote: transaction abort!

2
tests/test-fb-hgext-pushrebase-recording.t
View File

@ -192,7 +192,7 @@ Make sure that we don't record anything on non-pushrebase push
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 4 changesets with 1 changes to 3 files (+2 heads)
remote: added 4 changesets with 1 changes to 3 files
$ mysql -h $DBHOST -P $DBPORT -D $DBNAME -u $DBUSER $DBPASSOPT -e 'select count(*) from pushrebaserecording'
count(*)
3

8
tests/test-fb-hgext-pushrebase-remotenames.t
View File

@ -85,7 +85,7 @@ Test that pushing to a remotename gets rebased
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
updating bookmark master
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
@ -210,7 +210,7 @@ Test a push that comes with out-of-date bookmark discovery
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
updating bookmark bm
$ hg -R server log -G -T '{rev} "{desc}" {bookmarks}'
o 2 "cc" bm
@ -301,7 +301,7 @@ Test force pushes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 86cf3bb05fcf
$ hg log -G -T '{rev} {desc} {remotebookmarks}'
o 2 aa
@ -350,7 +350,7 @@ Test 'hg push' with a tracking bookmark
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
updating bookmark master
$ hg log -T '{rev} {desc}' -G
o 3 b

2
tests/test-fb-hgext-pushrebase-set-dates.t
View File

@ -92,7 +92,7 @@ Make a push from the client
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
$ log
o client push [draft:a8078509f8d1]
|

14
tests/test-fb-hgext-pushrebase.t
View File

@ -118,7 +118,7 @@ Stack of non-conflicting commits should be accepted
adding file changes
adding a revisions
adding b revisions
added 3 changesets with 1 changes to 2 files (+1 heads)
added 3 changesets with 1 changes to 2 files
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 15 bytes
@ -170,7 +170,7 @@ Push using changegroup2
adding changesets
adding manifests
adding file changes
added 3 changesets with 1 changes to 2 files (+1 heads)
added 3 changesets with 1 changes to 2 files
$ cd ../client
$ hg debugstrip 1
@ -359,7 +359,7 @@ Pushing a merge should rebase only the latest side of the merge
adding changesets
adding manifests
adding file changes
added 4 changesets with 1 changes to 3 files (+1 heads)
added 4 changesets with 1 changes to 3 files
updating bookmark master
$ cd ../server
$ log
@ -441,7 +441,7 @@ With evolution enabled, should set obsolescence markers
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 4 files (+1 heads)
added 4 changesets with 2 changes to 4 files
2 new obsolescence markers
obsoleted 2 changesets
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -770,7 +770,7 @@ Test date rewriting with a merge commit
adding changesets
adding manifests
adding file changes
added 3 changesets with 0 changes to 2 files (+1 heads)
added 3 changesets with 0 changes to 2 files
3 new obsolescence markers
obsoleted 3 changesets
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -871,7 +871,7 @@ Test force pushes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 86cf3bb05fcf
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 2 aa
@ -930,7 +930,7 @@ phase is updated correctly with the marker information.
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads)
added 2 changesets with 1 changes to 2 files
1 new obsolescence markers
obsoleted 1 changesets
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-fb-hgext-remotefilelog-linknodes.t
View File

@ -136,7 +136,7 @@ TODO: Make this test compatibile with obsstore enabled.
adding changesets
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+1 heads)
added 3 changesets with 0 changes to 0 files
new changesets 01979f9404f8:7200df4e0aca
$ hg update tip -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

2
tests/test-fb-hgext-remotefilelog-local.t
View File

@ -101,7 +101,7 @@ TODO: Make this test compatibile with obsstore enabled.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets fed61014d323
$ hg rebase -d tip

2
tests/test-fb-hgext-remotefilelog-push-pull.t
View File

@ -247,7 +247,7 @@ the server supports our custom getfiles method.
adding changesets
adding manifests
adding file changes
added 5 changesets with 4 changes to 3 files (+2 heads)
added 5 changesets with 4 changes to 3 files
new changesets cb9a9f314b8b:d8f06a4c6d38
{ metrics : { ssh : { connections : 1,
read : { bytes : 2966},

4
tests/test-fb-hgext-snapshot-sync.t
View File

@ -167,7 +167,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 7917335ca006
commitcloud: commits synchronized
finished in 0.00 sec
@ -235,7 +235,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 5e55990d9843
commitcloud: commits synchronized
finished in 0.00 sec

4
tests/test-fb-hgext-treemanifest-infinitepush.t
View File

@ -106,7 +106,7 @@ Pull a treeonly scratch branch into a normal client
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
added 2 changesets with 2 changes to 1 files
new changesets 02c12aef64ff:5a7a7de8a420
- Verify no new manifest revlog entry was written
- ...but we can still read the manifest
@ -183,7 +183,7 @@ Pull just part of a normal scratch branch (this causes rebundling on the server)
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 3ef288300b64
$ hg log -r 3ef288300b64 --stat
changeset: 3:3ef288300b64

2
tests/test-fb-hgext-treemanifest-pushrebase2.t
View File

@ -104,7 +104,7 @@ Push treeonly merge commit to a treeonly server
adding changesets
adding manifests
adding file changes
added 4 changesets with 9 changes to 9 files (+1 heads)
added 4 changesets with 9 changes to 9 files
3 new obsolescence markers
updating bookmark foo
obsoleted 3 changesets

2
tests/test-fb-hgext-treemanifest-remotenames-out-of-sync.t
View File

@ -111,7 +111,7 @@
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
updating bookmark master
obsoleted 1 changesets

10
tests/test-fb-hgext-treemanifest-treeonly.t
View File

@ -174,7 +174,7 @@ Test unbundling the original commit
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 43903a6bf43f
# Verify the packs were brought back and the data is accessible
$ ls_l .hg/store/packs/manifests | wc -l
@ -204,7 +204,7 @@ Test pulling new commits from a hybrid server
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 098a163f13ea
$ hg debugindex -m --config treemanifest.treeonly=False
@ -449,7 +449,7 @@ Test prefetch
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets dad1be784127
$ cd ..
@ -486,7 +486,7 @@ Test pulling to a treeonly client from a treeonly server
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
added 2 changesets with 0 changes to 0 files
new changesets dad1be784127:7253109af085
$ hg log -r tip -T '{desc}\n' --stat
fetching tree '' 9bd1ef658bef2ded12bd295198d1abbe1cf4115b, found via dad1be784127
@ -679,7 +679,7 @@ with pullprefetchrevs configured.
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
added 3 changesets with 3 changes to 2 files
new changesets d618f764f9a1:dad1be784127
prefetching tree for dad1be784127
2 trees fetched over * (glob)

4
tests/test-fb-hgext-tweakdefaults-pullrebaseffwd-t.py
View File

@ -52,10 +52,10 @@ sh % "hg pull --rebase -d default" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 177f92b77385
rebasing 86d71924e1d0 "x"
saved backup bundle to $TESTTMP/* (glob)"""
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/86d71924e1d0-48875604-rebase.hg"""
sh % "hg log -G -T '{rev} {desc}'" == r"""
@ 3 x
|

2
tests/test-fb-hgext-tweakdefaults-pullrebaseremotenames-t.py
View File

@ -56,7 +56,7 @@ sh % "hg pull --rebase" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 177f92b77385
rebasing 86d71924e1d0 "x" (localbookmark)
saved backup bundle to $TESTTMP/clone/.hg/strip-backup/86d71924e1d0-48875604-rebase.hg"""

2
tests/test-fb-hgext-tweakdefaults-remotenames.t
View File

@ -114,7 +114,7 @@ Test that hg pull --rebase also works with a --tool argument
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets e8aa3bc9f3f0
rebasing ba0f83735c95 "d"
merging d

2
tests/test-filebranch.t
View File

@ -53,7 +53,7 @@ Merging:
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
added 1 changesets with 2 changes to 2 files
new changesets bdd988058d16
$ hg merge -v

4
tests/test-flags.t
View File

@ -44,7 +44,7 @@ the changelog should mention file a:
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 7f4313b42a34
$ hg heads
changeset: 2:7f4313b42a34
@ -96,7 +96,7 @@ the changelog should mention file a:
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 7f4313b42a34
$ hg heads
changeset: 2:7f4313b42a34

6
tests/test-generaldelta.t
View File

@ -85,7 +85,7 @@ delta coming from the server base delta server are not recompressed.
adding changesets
adding manifests
adding file changes
added 4 changesets with 6 changes to 3 files (+2 heads)
added 4 changesets with 6 changes to 3 files
new changesets 0ea3fcf9d01d:bba78d330d9c
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -94,7 +94,7 @@ delta coming from the server base delta server are not recompressed.
adding changesets
adding manifests
adding file changes
added 4 changesets with 6 changes to 3 files (+2 heads)
added 4 changesets with 6 changes to 3 files
new changesets 0ea3fcf9d01d:bba78d330d9c
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -237,7 +237,7 @@ test maxdeltachainspan
adding changesets
adding manifests
adding file changes
added 53 changesets with 53 changes to 53 files (+2 heads)
added 53 changesets with 53 changes to 53 files
new changesets 61246295ee1e:99cae3713489
updating to branch default
14 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-globalopts.t
View File

@ -31,7 +31,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets b6c483daf290
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-glog-topological-t.py
View File

@ -26,7 +26,7 @@ sh % 'hg unbundle "$TESTDIR/bundles/remote.hg"' == r"""
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets bfaf4b5cbf01:916f1afdef90"""
sh % "hg log -G" == r"""

2
tests/test-hgsql-pushpull.t
View File

@ -118,7 +118,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
exporting bookmark bar
$ hg log -R ../master -T '{rev} {bookmarks}\n' -G
o 4 bar

2
tests/test-hgsql-sqlverify.t
View File

@ -26,7 +26,7 @@ Run with incorrect local revlogs
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 7c3bad9141dc
$ hg log -r tip --forcesync -T '{desc}\n'

2
tests/test-histedit-base.t
View File

@ -15,7 +15,7 @@ Create repo a:
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-import-merge.t
View File

@ -44,7 +44,7 @@ Test import and merge diffs
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 102a90ea7b4a
Test without --exact and diff.p1 == workingdir.p1

10
tests/test-infinitepush-bundlestore.t
View File

@ -361,7 +361,7 @@ Use --force because this push creates new head
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 2 changesets with 2 changes to 2 files (+1 heads)
remote: added 2 changesets with 2 changes to 2 files
$ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}'
o newcommit public
|
@ -593,7 +593,7 @@ Pull two bookmarks from the second client
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets * (glob)
$ hg log -r scratch/secondpart -T '{node}'
8db3891c220e216f6da214e8254bd4371f55efca (no-eol)
@ -635,7 +635,7 @@ Make sure phase on the client is public.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets a79b6597f322
$ hg log -G -T '{desc} {phase} {bookmarks} {node|short}'
o publiccommit public a79b6597f322
@ -659,7 +659,7 @@ Make sure phase on the client is public.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
adding changesets
adding manifests
adding file changes
@ -732,7 +732,7 @@ Test debugfillinfinitepushmetadata
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets 33910bfe6ffe:d8fde0ddfc96
'd8fde0ddfc962183977f92d2bc52d303b8840f9d' found remotely
pull finished in * sec (glob)

6
tests/test-infinitepush-remotenames.t
View File

@ -143,7 +143,7 @@ Go back to client, make pull and make sure that we pulled remote branches
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+2 heads)
added 2 changesets with 2 changes to 2 files
new changesets 64d557aa86fd:dc4b2ecb723b
$ cat .hg/store/remotenames | sort
620472ff5c0c4a560a3ffd98c07f0c9ecad33f64 bookmarks default/scratch/mybranch
@ -193,7 +193,7 @@ Create new bookmark and try to pull it
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets 36667a3f76e4:2885148f6198
'scratch/branchtoupdateto1' found remotely
pull finished in * sec (glob)
@ -212,7 +212,7 @@ Create new bookmark and try to pull it
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 2 files (+1 heads)
added 1 changesets with 1 changes to 2 files
new changesets 1f558bd20eaa
'scratch/branchtoupdateto2' found remotely
pull finished in * sec (glob)

2
tests/test-issue1502.t
View File

@ -19,7 +19,7 @@ Initialize repository
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 273d008d6e8e
$ hg -R foo1 book branchy

2
tests/test-issue1802.t
View File

@ -43,7 +43,7 @@ Create extension that can disable exec checks:
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets 2d8bcf2dda39
$ hg manifest -v -r tip

4
tests/test-issue586.t
View File

@ -22,7 +22,7 @@ dirstate
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets cb9a9f314b8b
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -72,7 +72,7 @@ create test repos
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 5ddceb349652
merge both repos

2
tests/test-merge-commit.t
View File

@ -108,7 +108,7 @@ on the remote parent:
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
added 3 changesets with 3 changes to 2 files
new changesets 2665aaee66e9:0f2ff26688b9
$ cd b

2
tests/test-merge10-t.py
View File

@ -46,7 +46,7 @@ sh % "hg pull ../a" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets cc7000b01af9"""
sh % "hg up -C 2" == "0 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg merge" == r"""

4
tests/test-merge6.t
View File

@ -43,7 +43,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets b90e70beeb58
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -60,7 +60,7 @@ bar should remain deleted.
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets e1adc944e717
$ hg merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved

4
tests/test-merge7.t
View File

@ -43,7 +43,7 @@ now pull and merge from test-a
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 96b70246a118
$ hg merge
merging test.txt
@ -79,7 +79,7 @@ pull and merge from test-a again
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 40d11a4173a8
$ hg merge --debug
searching for copies back to rev 1

2
tests/test-obsmarker-template-t.py
View File

@ -1330,7 +1330,7 @@ sh % "hg pull" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
2 new obsolescence markers
obsoleted 1 changesets
new changesets 7a230b46bf61"""

8
tests/test-obsolete-changeset-exchange-t.py
View File

@ -75,7 +75,7 @@ sh % "hg pull ../other" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
added 1 changesets with 0 changes to 1 files
new changesets f89bcc95eba5"""
# check that bundle is not affected
@ -86,7 +86,7 @@ sh % "hg unbundle ../f89bcc95eba5.hg" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)"""
added 1 changesets with 0 changes to 1 files"""
# check-that bundle can contain markers:
@ -147,7 +147,7 @@ sh % "hg pull --debug" == r"""
searching for changes
taking quick initial sample
query 2; still undecided: 2, sample size is: 2
2 total queries in *.????s (glob)
2 total queries in 0.0000s
1 changesets found
list of changesets:
bec0734cd68e84477ba7fc1d13e6cff53ab70129
@ -163,7 +163,7 @@ sh % "hg pull --debug" == r"""
adding manifests
adding file changes
adding foo revisions
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
bundle2-input-part: total payload size 476
bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-part: "phase-heads" supported

16
tests/test-phases-exchange.t
View File

@ -81,7 +81,7 @@
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
added 2 changesets with 2 changes to 2 files
new changesets 54acac6f23ab:b555f63b6063
test-debug-phase: new rev 3: x -> 0
test-debug-phase: new rev 4: x -> 0
@ -149,7 +149,7 @@ update must update phase of common changeset too
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets f54f1bb90ff3
test-debug-phase: new rev 4: x -> 0
@ -203,7 +203,7 @@ changegroup are added without phase movement
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
added 5 changesets with 5 changes to 5 files
new changesets 054250a37db4:b555f63b6063
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
@ -257,7 +257,7 @@ Even for common
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets f54f1bb90ff3
test-debug-phase: new rev 3: x -> 1
$ hgph
@ -711,7 +711,7 @@ Pushing to Publish=False (common changeset that change phase + unknown one)
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
test-debug-phase: move rev 2: 1 -> 0
test-debug-phase: move rev 5: 1 -> 0
test-debug-phase: new rev 9: x -> 1
@ -840,7 +840,7 @@ Bare push with next changeset and common changeset needing sync (issue3575)
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
test-debug-phase: new rev 10: x -> 0
test-debug-phase: move rev 8: 1 -> 0
test-debug-phase: move rev 9: 1 -> 0
@ -1037,7 +1037,7 @@ pull new changeset with common draft locally
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
test-debug-phase: new rev 11: x -> 1
$ cd ../mu
$ hg phase --secret --force 1c5cfd894796
@ -1256,7 +1256,7 @@ server won't turn changeset public.
adding changesets
adding manifests
adding file changes
added 14 changesets with 14 changes to 14 files (+3 heads)
added 14 changesets with 14 changes to 14 files
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0

6
tests/test-phases.t
View File

@ -164,7 +164,7 @@ Test secret changeset are not pushed
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
added 5 changesets with 5 changes to 5 files
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 1
@ -219,7 +219,7 @@ head shadowed by the remote secret head.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
test-debug-phase: new rev 6: x -> 1
test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061: -> draft
@ -240,7 +240,7 @@ Test secret changeset are not pull
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
added 5 changesets with 5 changes to 5 files
new changesets 4a2df7238c3b:cf9fe039dfd6
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0

2
tests/test-pull-pull-corruption.t
View File

@ -50,7 +50,7 @@ start a pull...
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets ca3c05af513e
$ cat pull.out
pulling from ../source1

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

@ -48,7 +48,7 @@ don't show "(+1 heads)" message when pulling closed head
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
added 2 changesets with 1 changes to 1 files
new changesets 8c900227dd5d:1a1aa123db21
$ hg heads -q --closed
4:1a1aa123db21
@ -122,7 +122,7 @@ We use http because http is better is our racy-est option.
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets effea6de0384
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G

8
tests/test-pull-update-t.py
View File

@ -36,7 +36,7 @@ sh % "hg --config 'commands.update.check=abort' pull -u ../tt" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 107cefe13e42
abort: uncommitted changes
[255]"""
@ -51,7 +51,7 @@ sh % "hg pull -u ../tt" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 107cefe13e42
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "800c91d5bfc1: m"
@ -67,7 +67,7 @@ sh % "hg pull -u ../t" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 800c91d5bfc1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "107cefe13e42: m"
@ -89,7 +89,7 @@ sh % "hg pull -u ../tt" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 483b76ad4309
1 files updated, 0 files merged, 0 files removed, 0 files unresolved"""

4
tests/test-push.t
View File

@ -13,7 +13,7 @@ Testing of the '--rev' flag
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets bfaf4b5cbf01:916f1afdef90
$ for i in 0 1 2 3 4 5 6 7 8; do
@ -139,7 +139,7 @@ Testing of the '--rev' flag
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
added 4 changesets with 2 changes to 3 files
new changesets c70afb1ee985:faa2e4234c7a
$ hg verify

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

@ -98,7 +98,7 @@ Push in from the client.
adding changesets
adding manifests
adding file changes
added 4 changesets with 1 changes to 3 files (+1 heads)
added 4 changesets with 1 changes to 3 files
3 new obsolescence markers
updating bookmark @
obsoleted 3 changesets

2
tests/test-rebase-conflicts.t
View File

@ -154,7 +154,7 @@ Check that the right ancestors is used while rebasing a merge (issue4041)
adding changesets
adding manifests
adding file changes
added 11 changesets with 8 changes to 3 files (+1 heads)
added 11 changesets with 8 changes to 3 files
new changesets 24797d4f68de:2f2496ddf49d
updating to branch f1
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

4
tests/test-rebase-obsolete.t
View File

@ -27,7 +27,7 @@ Setup rebase canonical repo
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -543,7 +543,7 @@ test on rebase dropping a merge
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg up 3
4 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-rebase-parameters.t
View File

@ -17,7 +17,7 @@
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

8
tests/test-rebase-pull-t.py
View File

@ -61,7 +61,7 @@ sh % "hg pull --rebase" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 77ae9631bcca
rebasing ff8d69a621f9 "L1"'''
@ -237,7 +237,7 @@ sh % "hg pull --rebase" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 00e3b7781125
rebasing 518d153c0ba3 "L1"'''
sh % "tglog" == r"""
@ -284,7 +284,7 @@ sh % "hg pull --rebase" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 88dd24261747
rebasing 0d0727eb7ce0 "L1"
rebasing c1f58876e3bf "L2"'''
@ -322,7 +322,7 @@ sh % "hg pull --rebase" == r'''
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 65bc164c1d9b
nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

4
tests/test-rebase-scenario-global.t
View File

@ -16,7 +16,7 @@ TODO: Make this test compatibile with obsstore enabled.
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
added 8 changesets with 7 changes to 7 files
new changesets cd010b8cd998:02de42196ebe
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -413,7 +413,7 @@ All destination are B
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 9 files (+2 heads)
added 9 changesets with 9 changes to 9 files
new changesets 9ae2ed22e576:479ddb54a924
$ tglog
o 8: 479ddb54a924 'I'

4
tests/test-remotenames-pull-rebase.t
View File

@ -86,7 +86,7 @@ Tests 'hg pull --rebase' defaults to original (rebase->pullrebase) behaviour whe
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+2 heads)
added 2 changesets with 2 changes to 2 files
new changesets 7a820e70c81f:4557926d2166
updating to active bookmark bmnottracking
nothing to rebase
@ -189,7 +189,7 @@ Test pull with --rebase and --tool
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
added 1 changesets with 2 changes to 2 files
new changesets b1a3b9086dc9
rebasing 1d01e32a0efb "somelocalchanges" (tracking2)
merging editedbyboth

4
tests/test-remotenames-pushto.t
View File

@ -159,7 +159,7 @@ Test that --non-forward-move allows moving bookmark around arbitrarily
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
updating bookmark @
$ hg push --to @ -r 0
pushing rev cb9a9f314b8b to destination $TESTTMP/repo1 bookmark @
@ -222,7 +222,7 @@ Test that rebasing and pushing works as expected
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 1846eede8b68
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
o 2 b default/@

4
tests/test-remotenames-selective-pull.t
View File

@ -83,7 +83,7 @@ Specify bookmark to pull
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets ed7a9fd254d1
$ hg bookmarks --list-subscriptions
default/master 1:0238718db2b1
@ -287,7 +287,7 @@ Clone remote repo with the selectivepull enabled
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files (+1 heads)
added 4 changesets with 4 changes to 1 files
new changesets 1449e7934ec1:c47dca9795c9
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

2
tests/test-rename-after-merge.t
View File

@ -35,7 +35,7 @@ Merge repositories:
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets d2ae7f538514
$ hg merge

2
tests/test-rename-dir-merge.t
View File

@ -216,7 +216,7 @@ Second scenario with two repos:
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 7d51ed18da25
$ hg merge

2
tests/test-revlog-group-emptyiter-t.py
View File

@ -38,6 +38,6 @@ sh % "hg push -f ../a" == r"""
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)"""
added 1 changesets with 0 changes to 0 files"""
sh % "cd .."

8
tests/test-ssh-clone-r.t
View File

@ -9,7 +9,7 @@ creating 'remote' repo
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
added 9 changesets with 7 changes to 4 files
new changesets bfaf4b5cbf01:916f1afdef90
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -139,7 +139,7 @@ clone remote via stream
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
added 4 changesets with 2 changes to 3 files
new changesets c70afb1ee985:faa2e4234c7a
$ hg verify
checking changesets
@ -155,7 +155,7 @@ clone remote via stream
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
added 1 changesets with 0 changes to 0 files
new changesets c70afb1ee985
$ hg verify
checking changesets
@ -179,7 +179,7 @@ clone remote via stream
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
added 2 changesets with 0 changes to 0 files
new changesets c70afb1ee985:f03ae5a9b979
$ hg verify
checking changesets

4
tests/test-ssh.t
View File

@ -299,7 +299,7 @@ clone bookmarks
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 4 files (+1 heads)
added 4 changesets with 5 changes to 4 files
new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -400,7 +400,7 @@ Test hg-ssh in read-only mode:
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 4 files (+1 heads)
added 4 changesets with 5 changes to 4 files
new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

4
tests/test-treemanifest.t
View File

@ -411,7 +411,7 @@ Pushing to an empty repo works
adding changesets
adding manifests
adding file changes
added 11 changesets with 15 changes to 10 files (+3 heads)
added 11 changesets with 15 changes to 10 files
$ grep treemanifest clone/.hg/requires
treemanifest
$ hg -R clone verify
@ -875,7 +875,7 @@ other branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 73699489fb7c
Committing a empty commit does not duplicate root treemanifest

2
tests/test-unrelated-pull.t
View File

@ -25,7 +25,7 @@
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
added 1 changesets with 1 changes to 1 files
new changesets 9a79c33a9db3
$ hg heads

8
tests/test-visibility-cloudsync.t
View File

@ -275,15 +275,15 @@ Introduce a third client that is still using obsmarker-based mutation and visibi
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 2 files (+1 heads)
added 1 changesets with 1 changes to 2 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 3 files (+1 heads)
added 1 changesets with 1 changes to 3 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 2 files (+1 heads)
added 1 changesets with 0 changes to 2 files
new changesets dae3b312bb78:6caded0e9807
commitcloud: commits synchronized
finished in * sec (glob)
@ -341,7 +341,7 @@ Introduce a third client that is still using obsmarker-based mutation and visibi
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 3 files (+1 heads)
added 1 changesets with 0 changes to 3 files
new changesets 1ef69cfd595b
commitcloud: commits synchronized
finished in * sec (glob)