This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9603

branchmap: refactor revbranchmap and use it as topicmap [PoC]
Needs RevisionPublic

Authored by joerg.sonnenberger on Dec 14 2020, 4:38 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit added a subscriber: pulkit.Dec 17 2020, 6:03 AM

While it's still POC, having some commit message on how we are tackling the problem will be helpful.

joerg.sonnenberger added a comment.Dec 17 2020, 7:06 AM

The proof of concept part is primarily that we can get the benefit with minimal refactoring of the existing rbc implementation. The actual use is a bit more complicated as the actual topicmap would be part of an extension and therefore hook up differently. But the interaction is much easier to understand like this, IMO.

pulkit added a comment.Dec 18 2020, 2:43 PM

I like where this is headed. Thank you for doing this work. I can see this patch can be split into at least 3 different patches which will help speed up review.

mercurial/branchmap.py
547

This movement of variables can be a separate patch and will be easy one to queue making this patch a bit lighter to review.

782

Probably we can have an interface for generic name-cache.

mercurial/changelog.py
599

This and related changes should be a separate patch.

pulkit added a comment.Dec 18 2020, 2:46 PM
In D9603#145191, @pulkit wrote:

I like where this is headed. Thank you for doing this work. I can see this patch can be split into at least 3 different patches which will help speed up review.

... of course when it's not a POC anymore.

mercurial/branchmap.py
599

Also, what does a caller passing extra as None is expecting here? It will be nice to not have this an optional argument.

We can also pass a rev/node here and do changelog.changelogrevision thing in this function.

joerg.sonnenberger added inline comments.Dec 18 2020, 3:19 PM
mercurial/branchmap.py
547

Right, the primary goal of this PoC is to outline what changes are necessary and what the impact is for supporting more than just the branch mapping. It doesn't make sense as is since it is provided for the benefit out of currently out-of-tree target. So the goal is to get a consensus on whether the cache is useful enough for the topic extension and if it is, split this patch into smaller pieces, figure out a few details in the method naming (e.g. branchinfo is tight to the current functionality) in core and how to integrate the rest backwards compatible in the topic extension.

599

As mentioned in the review for the parent, doing a lookup here is expensive and should be avoided. The extra=None case is essentially only used for nullrev. The function name is not terribly good, parsechangeset or so would make a lot more sense in the generalized cache.

mercurial/changelog.py
599

Yes, but it is a breaking change for topic.

baymax requested changes to this revision.May 25 2021, 5:32 AM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.May 25 2021, 5:32 AM

Revision Contents
Changeset List

Diff 24342

mercurial/branchmap.py

"""Replace the branchmap cache for a repo with a branch mapping. """Replace the branchmap cache for a repo with a branch mapping.
This is likely only called during clone with a branch map from a This is likely only called during clone with a branch map from a
remote. remote.
""" """
cl = repo.changelog cl = repo.changelog
clrev = cl.rev clrev = cl.rev
clbranchinfo = cl.branchinfo clbranchinfo = repo.revbranchcache().branchinfo
rbheads = [] rbheads = []
closed = set() closed = set()
for bheads in pycompat.itervalues(remotebranchmap): for bheads in pycompat.itervalues(remotebranchmap):
rbheads += bheads rbheads += bheads
for h in bheads: for h in bheads:
r = clrev(h) r = clrev(h)
b, c = clbranchinfo(r) b, c = clbranchinfo(r)
if c: if c:
def write(self, repo): def write(self, repo):
pass pass
# Revision branch info cache # Revision branch info cache
_rbcversion = b'-v1' _rbcversion = b'-v1'
_rbcnames = b'rbc-names' + _rbcversion
_rbcrevs = b'rbc-revs' + _rbcversion
# [4 byte hash prefix][4 byte branch name number with sign bit indicating open] # [4 byte hash prefix][4 byte branch name number with sign bit indicating open]
_rbcrecfmt = b'>4sI' _rbcrecfmt = b'>4sI'
_rbcrecsize = calcsize(_rbcrecfmt) _rbcrecsize = calcsize(_rbcrecfmt)
_rbcmininc = 64 * _rbcrecsize _rbcmininc = 64 * _rbcrecsize
_rbcnodelen = 4 _rbcnodelen = 4
_rbcbranchidxmask = 0x7FFFFFFF _rbcbranchidxmask = 0x7FFFFFFF
_rbccloseflag = 0x80000000 _rbccloseflag = 0x80000000
while converging towards full recovery ... assuming no incorrectly matching while converging towards full recovery ... assuming no incorrectly matching
node hashes. node hashes.
The record also contains 4 bytes where 31 bits contains the index of the The record also contains 4 bytes where 31 bits contains the index of the
branch and the last bit indicate that it is a branch close commit. branch and the last bit indicate that it is a branch close commit.
The usage pattern for rbc-revs is thus somewhat similar to 00changelog.i The usage pattern for rbc-revs is thus somewhat similar to 00changelog.i
and will grow with it but be 1/8th of its size. and will grow with it but be 1/8th of its size.
""" """
names_cache = b'rbc-names' + _rbcversion
pulkitUnsubmitted
Not Done

This movement of variables can be a separate patch and will be easy one to queue making this patch a bit lighter to review.

pulkit: This movement of variables can be a separate patch and will be easy one to queue making this…
joerg.sonnenbergerAuthorUnsubmitted
Done

Right, the primary goal of this PoC is to outline what changes are necessary and what the impact is for supporting more than just the branch mapping. It doesn't make sense as is since it is provided for the benefit out of currently out-of-tree target. So the goal is to get a consensus on whether the cache is useful enough for the topic extension and if it is, split this patch into smaller pieces, figure out a few details in the method naming (e.g. branchinfo is tight to the current functionality) in core and how to integrate the rest backwards compatible in the topic extension.

joerg.sonnenberger: Right, the primary goal of this PoC is to outline what changes are necessary and what the…
revisions_cache = b'rbc-revs' + _rbcversion
phase_name = b'write-revbranchcache'
def __init__(self, repo, readonly=True): def __init__(self, repo, readonly=True):
assert repo.filtername is None assert repo.filtername is None
self._repo = repo self._repo = repo
self._names = [] # branch names in local encoding with static index self._names = [] # branch names in local encoding with static index
self._rbcrevs = bytearray() self._rbcrevs = bytearray()
self._rbcsnameslen = 0 # length of names read at _rbcsnameslen self._rbcsnameslen = 0 # length of names read at _rbcsnameslen
try: try:
bndata = repo.cachevfs.read(_rbcnames) bndata = repo.cachevfs.read(self.names_cache)
self._rbcsnameslen = len(bndata) # for verification before writing self._rbcsnameslen = len(bndata) # for verification before writing
if bndata: if bndata:
self._names = [ self._names = [
encoding.tolocal(bn) for bn in bndata.split(b'\0') encoding.tolocal(bn) for bn in bndata.split(b'\0')
] ]
except (IOError, OSError): except (IOError, OSError):
if readonly: if readonly:
# don't try to use cache - fall back to the slow path # don't try to use cache - fall back to the slow path
self.branchinfo = self._branchinfo self.branchinfo = self._branchinfo
if self._names: if self._names:
try: try:
data = repo.cachevfs.read(_rbcrevs) data = repo.cachevfs.read(self.revisions_cache)
self._rbcrevs[:] = data self._rbcrevs[:] = data
except (IOError, OSError) as inst: except (IOError, OSError) as inst:
repo.ui.debug( repo.ui.debug(
b"couldn't read revision branch cache: %s\n" b"couldn't read revision branch cache: %s\n"
% stringutil.forcebytestr(inst) % stringutil.forcebytestr(inst)
) )
# remember number of good records on disk # remember number of good records on disk
self._rbcrevslen = min( self._rbcrevslen = min(
self._rbcrevslen = len(self._repo.changelog) self._rbcrevslen = len(self._repo.changelog)
self._rbcrevs = bytearray(self._rbcrevslen * _rbcrecsize) self._rbcrevs = bytearray(self._rbcrevslen * _rbcrecsize)
util.clearcachedproperty(self, b'_namesreverse') util.clearcachedproperty(self, b'_namesreverse')
@util.propertycache @util.propertycache
def _namesreverse(self): def _namesreverse(self):
return {b: r for r, b in enumerate(self._names)} return {b: r for r, b in enumerate(self._names)}
def getbranchinfo(self, extra=None):
pulkitUnsubmitted
Not Done

Also, what does a caller passing extra as None is expecting here? It will be nice to not have this an optional argument.

We can also pass a rev/node here and do changelog.changelogrevision thing in this function.

pulkit: Also, what does a caller passing extra as None is expecting here? It will be nice to not have…
joerg.sonnenbergerAuthorUnsubmitted
Done

As mentioned in the review for the parent, doing a lookup here is expensive and should be avoided. The extra=None case is essentially only used for nullrev. The function name is not terribly good, parsechangeset or so would make a lot more sense in the generalized cache.

joerg.sonnenberger: As mentioned in the review for the parent, doing a lookup here is expensive and should be…
if extra is None:
extra = {}
return (
encoding.tolocal(extra.get(b"branch", b"default")),
b'close' in extra,
)
def branchinfo(self, rev): def branchinfo(self, rev):
"""Return branch name and close flag for rev, using and updating """Return branch name and close flag for rev, using and updating
persistent cache.""" persistent cache."""
changelog = self._repo.changelog changelog = self._repo.changelog
rbcrevidx = rev * _rbcrecsize rbcrevidx = rev * _rbcrecsize
# avoid negative index, changelog.read(nullrev) is fast without cache # avoid negative index, changelog.read(nullrev) is fast without cache
if rev == nullrev: if rev == nullrev:
return changelog.branchinfo(rev) return self.getbranchinfo()
# if requested rev isn't allocated, grow and cache the rev info # if requested rev isn't allocated, grow and cache the rev info
if len(self._rbcrevs) < rbcrevidx + _rbcrecsize: if len(self._rbcrevs) < rbcrevidx + _rbcrecsize:
return self._branchinfo(rev) return self._branchinfo(rev)
# fast path: extract data from cache, use it if node is matching # fast path: extract data from cache, use it if node is matching
reponode = changelog.node(rev)[:_rbcnodelen] reponode = changelog.node(rev)[:_rbcnodelen]
cachenode, branchidx = unpack_from( cachenode, branchidx = unpack_from(
self._rbcrevslen = min(self._rbcrevslen, truncate) self._rbcrevslen = min(self._rbcrevslen, truncate)
# fall back to slow path and make sure it will be written to disk # fall back to slow path and make sure it will be written to disk
return self._branchinfo(rev) return self._branchinfo(rev)
def _branchinfo(self, rev): def _branchinfo(self, rev):
"""Retrieve branch info from changelog and update _rbcrevs""" """Retrieve branch info from changelog and update _rbcrevs"""
changelog = self._repo.changelog changelog = self._repo.changelog
b, close = changelog.branchinfo(rev) b, close = self.getbranchinfo(changelog.changelogrevision(rev).extra)
if b in self._namesreverse: if b in self._namesreverse:
branchidx = self._namesreverse[b] branchidx = self._namesreverse[b]
else: else:
branchidx = len(self._names) branchidx = len(self._names)
self._names.append(b) self._names.append(b)
self._namesreverse[b] = branchidx self._namesreverse[b] = branchidx
reponode = changelog.node(rev) reponode = changelog.node(rev)
if close: if close:
rbccur = len(self._rbcrevs) rbccur = len(self._rbcrevs)
if rbccur < requiredsize: if rbccur < requiredsize:
self._rbcrevs.extend(b'\0' * max(_rbcmininc, requiredsize)) self._rbcrevs.extend(b'\0' * max(_rbcmininc, requiredsize))
pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx) pack_into(_rbcrecfmt, self._rbcrevs, rbcrevidx, node, branchidx)
self._rbcrevslen = min(self._rbcrevslen, rev) self._rbcrevslen = min(self._rbcrevslen, rev)
tr = self._repo.currenttransaction() tr = self._repo.currenttransaction()
if tr: if tr:
tr.addfinalize(b'write-revbranchcache', self.write) tr.addfinalize(self.phase_name, self.write)
def write(self, tr=None): def write(self, tr=None):
"""Save branch cache if it is dirty.""" """Save branch cache if it is dirty."""
repo = self._repo repo = self._repo
wlock = None wlock = None
step = b'' step = b''
try: try:
# write the new names # write the new names
) )
finally: finally:
if wlock is not None: if wlock is not None:
wlock.release() wlock.release()
def _writenames(self, repo): def _writenames(self, repo):
""" write the new branch names to revbranchcache """ """ write the new branch names to revbranchcache """
if self._rbcnamescount != 0: if self._rbcnamescount != 0:
f = repo.cachevfs.open(_rbcnames, b'ab') f = repo.cachevfs.open(self.names_cache, b'ab')
if f.tell() == self._rbcsnameslen: if f.tell() == self._rbcsnameslen:
f.write(b'\0') f.write(b'\0')
else: else:
f.close() f.close()
repo.ui.debug(b"%s changed - rewriting it\n" % _rbcnames) repo.ui.debug(b"%s changed - rewriting it\n" % self.names_cache)
self._rbcnamescount = 0 self._rbcnamescount = 0
self._rbcrevslen = 0 self._rbcrevslen = 0
if self._rbcnamescount == 0: if self._rbcnamescount == 0:
# before rewriting names, make sure references are removed # before rewriting names, make sure references are removed
repo.cachevfs.unlinkpath(_rbcrevs, ignoremissing=True) repo.cachevfs.unlinkpath(self.revisions_cache, ignoremissing=True)
f = repo.cachevfs.open(_rbcnames, b'wb') f = repo.cachevfs.open(self.names_cache, b'wb')
f.write( f.write(
b'\0'.join( b'\0'.join(
encoding.fromlocal(b) encoding.fromlocal(b)
for b in self._names[self._rbcnamescount :] for b in self._names[self._rbcnamescount :]
) )
) )
self._rbcsnameslen = f.tell() self._rbcsnameslen = f.tell()
f.close() f.close()
self._rbcnamescount = len(self._names) self._rbcnamescount = len(self._names)
def _writerevs(self, repo, start): def _writerevs(self, repo, start):
""" write the new revs to revbranchcache """ """ write the new revs to revbranchcache """
revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize) revs = min(len(repo.changelog), len(self._rbcrevs) // _rbcrecsize)
with repo.cachevfs.open(_rbcrevs, b'ab') as f: with repo.cachevfs.open(self.revisions_cache, b'ab') as f:
if f.tell() != start: if f.tell() != start:
repo.ui.debug( repo.ui.debug(
b"truncating cache/%s to %d\n" % (_rbcrevs, start) b"truncating cache/%s to %d\n"
% (self.revisions_cache, start)
) )
f.seek(start) f.seek(start)
if f.tell() != start: if f.tell() != start:
start = 0 start = 0
f.seek(start) f.seek(start)
f.truncate() f.truncate()
end = revs * _rbcrecsize end = revs * _rbcrecsize
f.write(self._rbcrevs[start:end]) f.write(self._rbcrevs[start:end])
self._rbcrevslen = revs self._rbcrevslen = revs
class topicbranchcache(revbranchcache):
pulkitUnsubmitted
Not Done

Probably we can have an interface for generic name-cache.

pulkit: Probably we can have an interface for generic name-cache.
names_cache = b'topic-names' + _rbcversion
revisions_cache = b'topic-revs' + _rbcversion
phase_name = b'write-topicbranchcache'
def getbranchinfo(self, extra=None):
if extra is None:
extra = {}
return encoding.tolocal(extra.get(b"topic", b"")), False

mercurial/cacheutil.py

"""return the list of cache file valuable to copy during a clone""" """return the list of cache file valuable to copy during a clone"""
# In local clones we're copying all nodes, not just served # In local clones we're copying all nodes, not just served
# ones. Therefore copy all branch caches over. # ones. Therefore copy all branch caches over.
cachefiles = [b'branch2'] cachefiles = [b'branch2']
cachefiles += [b'branch2-%s' % f for f in repoview.filtertable] cachefiles += [b'branch2-%s' % f for f in repoview.filtertable]
cachefiles += [b'rbc-names-v1', b'rbc-revs-v1'] cachefiles += [b'rbc-names-v1', b'rbc-revs-v1']
cachefiles += [b'tags2'] cachefiles += [b'tags2']
cachefiles += [b'tags2-%s' % f for f in repoview.filtertable] cachefiles += [b'tags2-%s' % f for f in repoview.filtertable]
cachefiles += [b'topic-names-v1', b'topic-revs-v1']
cachefiles += [b'hgtagsfnodes1'] cachefiles += [b'hgtagsfnodes1']
return cachefiles return cachefiles

mercurial/changelog.py

extra = encodeextra(extra) extra = encodeextra(extra)
parseddate = b"%s %s" % (parseddate, extra) parseddate = b"%s %s" % (parseddate, extra)
l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc]
text = b"\n".join(l) text = b"\n".join(l)
return self.addrevision( return self.addrevision(
text, transaction, len(self), p1, p2, sidedata=sidedata, flags=flags text, transaction, len(self), p1, p2, sidedata=sidedata, flags=flags
) )
def branchinfo(self, rev):
pulkitUnsubmitted
Not Done

This and related changes should be a separate patch.

pulkit: This and related changes should be a separate patch.
joerg.sonnenbergerAuthorUnsubmitted
Done

Yes, but it is a breaking change for topic.

joerg.sonnenberger: Yes, but it is a breaking change for topic.
"""return the branch name and open/close state of a revision
This function exists because creating a changectx object
just to access this is costly."""
extra = self.changelogrevision(rev).extra
return encoding.tolocal(extra.get(b"branch")), b'close' in extra
def _nodeduplicatecallback(self, transaction, node): def _nodeduplicatecallback(self, transaction, node):
# keep track of revisions that got "re-added", eg: unbunde of know rev. # keep track of revisions that got "re-added", eg: unbunde of know rev.
# #
# We track them in a list to preserve their order from the source bundle # We track them in a list to preserve their order from the source bundle
duplicates = transaction.changes.setdefault(b'revduplicates', []) duplicates = transaction.changes.setdefault(b'revduplicates', [])
duplicates.append(self.rev(node)) duplicates.append(self.rev(node))

mercurial/interfaces/repository.py

"""Return a mapping of branch to heads in that branch.""" """Return a mapping of branch to heads in that branch."""
def revbranchcache(): def revbranchcache():
pass pass
def registerchangeset(node, changesetrevision): def registerchangeset(node, changesetrevision):
pass pass
def topicbranchcache():
pass
def branchtip(branchtip, ignoremissing=False): def branchtip(branchtip, ignoremissing=False):
"""Return the tip node for a given branch.""" """Return the tip node for a given branch."""
def lookup(key): def lookup(key):
"""Resolve the node for a revision.""" """Resolve the node for a revision."""
def lookupbranch(key): def lookupbranch(key):
"""Look up the branch name of the given revision or branch name.""" """Look up the branch name of the given revision or branch name."""

mercurial/localrepo.py

self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit) self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
else: # standard vfs else: # standard vfs
self.svfs.audit = self._getsvfsward(self.svfs.audit) self.svfs.audit = self._getsvfsward(self.svfs.audit)
self._dirstatevalidatewarned = False self._dirstatevalidatewarned = False
self._branchcaches = branchmap.BranchMapCache() self._branchcaches = branchmap.BranchMapCache()
self._revbranchcache = None self._revbranchcache = None
self._topicbranchcache = None
self._filterpats = {} self._filterpats = {}
self._datafilters = {} self._datafilters = {}
self._transref = self._lockref = self._wlockref = None self._transref = self._lockref = self._wlockref = None
# A cache for various files under .hg/ that tracks file changes, # A cache for various files under .hg/ that tracks file changes,
# (used by the filecache decorator) # (used by the filecache decorator)
# #
# Maps a property name to its util.filecacheentry # Maps a property name to its util.filecacheentry
return checksvfs return checksvfs
def close(self): def close(self):
self._writecaches() self._writecaches()
def _writecaches(self): def _writecaches(self):
if self._revbranchcache: if self._revbranchcache:
self._revbranchcache.write() self._revbranchcache.write()
if self._topicbranchcache:
self._topicbranchcache.write()
def _restrictcapabilities(self, caps): def _restrictcapabilities(self, caps):
if self.ui.configbool(b'experimental', b'bundle2-advertise'): if self.ui.configbool(b'experimental', b'bundle2-advertise'):
caps = set(caps) caps = set(caps)
capsblob = bundle2.encodecaps( capsblob = bundle2.encodecaps(
bundle2.getrepocaps(self, role=b'client') bundle2.getrepocaps(self, role=b'client')
) )
caps.add(b'bundle2=' + urlreq.quote(capsblob)) caps.add(b'bundle2=' + urlreq.quote(capsblob))
return self._branchcaches[self] return self._branchcaches[self]
@unfilteredmethod @unfilteredmethod
def revbranchcache(self): def revbranchcache(self):
if not self._revbranchcache: if not self._revbranchcache:
self._revbranchcache = branchmap.revbranchcache(self.unfiltered()) self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
return self._revbranchcache return self._revbranchcache
@unfilteredmethod
def topicbranchcache(self):
if not self._topicbranchcache:
self._topicbranchcache = branchmap.topicbranchcache(
self.unfiltered()
)
return self._topicbranchcache
def registerchangeset(self, node, changesetrevision): def registerchangeset(self, node, changesetrevision):
self.revbranchcache().setdata(node, changesetrevision.extra) self.revbranchcache().setdata(node, changesetrevision.extra)
self.topicbranchcache().setdata(node, changesetrevision.extra)
def branchtip(self, branch, ignoremissing=False): def branchtip(self, branch, ignoremissing=False):
"""return the tip node for a given branch """return the tip node for a given branch
If ignoremissing is True, then this method will not raise an error. If ignoremissing is True, then this method will not raise an error.
This is helpful for callers that only expect None for a missing branch This is helpful for callers that only expect None for a missing branch
(e.g. namespace). (e.g. namespace).
if full: if full:
unfi = self.unfiltered() unfi = self.unfiltered()
self.changelog.update_caches(transaction=tr) self.changelog.update_caches(transaction=tr)
self.manifestlog.update_caches(transaction=tr) self.manifestlog.update_caches(transaction=tr)
rbc = unfi.revbranchcache() rbc = unfi.revbranchcache()
tbc = unfi.topicbranchcache()
for r in unfi.changelog: for r in unfi.changelog:
rbc.branchinfo(r) rbc.branchinfo(r)
tbc.branchinfo(r)
rbc.write() rbc.write()
tbc.write()
# ensure the working copy parents are in the manifestfulltextcache # ensure the working copy parents are in the manifestfulltextcache
for ctx in self[b'.'].parents(): for ctx in self[b'.'].parents():
ctx.manifest() # accessing the manifest is enough ctx.manifest() # accessing the manifest is enough
# accessing fnode cache warms the cache # accessing fnode cache warms the cache
tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs()) tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
# accessing tags warm the cache # accessing tags warm the cache

tests/test-acl.t

adding quux/file.py revisions adding quux/file.py revisions
calling hook pretxnchangegroup.acl: hgext.acl.hook calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: changes have source "push" - skipping acl: changes have source "push" - skipping
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
bundle2-input-part: total payload size 37 bundle2-input-part: total payload size 37
calling hook prepushkey.acl: hgext.acl.hook calling hook prepushkey.acl: hgext.acl.hook
acl: checking access for user "fred" acl: checking access for user "fred"
acl: acl.allow.bookmarks not enabled acl: acl.allow.bookmarks not enabled
acl: acl.deny.bookmarks not enabled acl: acl.deny.bookmarks not enabled
acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark" acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark"
bundle2-input-bundle: 7 parts total bundle2-input-bundle: 7 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating bookmark moving-bookmark updating bookmark moving-bookmark
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: path access granted: "f9cafe1212c8" acl: path access granted: "f9cafe1212c8"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
bundle2-input-part: total payload size 1553 bundle2-input-part: total payload size 1553
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/rbc-revs-v1 to 8 truncating cache/rbc-revs-v1 to 8
truncating cache/topic-revs-v1 to 8
updating the branch cache updating the branch cache
added 3 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 3 files
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/topic-revs-v1 to 24
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/topic-revs-v1 to 24
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"
acl: branch access granted: "911600dab2ae" on branch "default" acl: branch access granted: "911600dab2ae" on branch "default"
acl: path access granted: "911600dab2ae" acl: path access granted: "911600dab2ae"
acl: branch access granted: "e8fc755d4d82" on branch "foobar" acl: branch access granted: "e8fc755d4d82" on branch "foobar"
acl: path access granted: "e8fc755d4d82" acl: path access granted: "e8fc755d4d82"
bundle2-input-part: total payload size 2068 bundle2-input-part: total payload size 2068
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 48 bundle2-input-part: total payload size 48
bundle2-input-bundle: 5 parts total bundle2-input-bundle: 5 parts total
truncating cache/topic-revs-v1 to 24
updating the branch cache updating the branch cache
added 4 changesets with 4 changes to 4 files (+1 heads) added 4 changesets with 4 changes to 4 files (+1 heads)
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
bundle2-input-bundle: no-transaction bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
listing keys for "phases" listing keys for "phases"

tests/test-clone-uncompressed.t

1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT clone1 $ hg clone --stream -U http://localhost:$HGPORT clone1
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1032 files to transfer, 96.5 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.5 KB in * seconds (* */sec) (glob)
$ ls -1 clone1/.hg/cache $ ls -1 clone1/.hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
topic-names-v1
topic-revs-v1
#endif #endif
getbundle requests with stream=1 are uncompressed getbundle requests with stream=1 are uncompressed
$ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1" $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=getbundle' content-type --bodyfile body --hgproto '0.1 0.2 comp=zlib,none' --requestheader "x-hgarg-1=bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=0000000000000000000000000000000000000000&heads=c17445101a72edac06facd130d14808dfbd5c7c2&stream=1"
200 Script output follows 200 Script output follows
content-type: application/mercurial-0.2 content-type: application/mercurial-0.2
$ f --size --hex --bytes 256 body $ f --size --hex --bytes 256 body
body: size=112262 body: size=112318
0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......| 0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98| 0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98|
0030: 37 37 35 66 69 6c 65 63 6f 75 6e 74 31 30 33 30 |775filecount1030| 0030: 37 39 38 66 69 6c 65 63 6f 75 6e 74 31 30 33 32 |798filecount1032|
0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote| 0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote|
0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%| 0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%|
0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2| 0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2|
0070: 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 72 |Crevlogv1%2Cspar| 0070: 43 72 65 76 6c 6f 67 76 31 25 32 43 73 70 61 72 |Crevlogv1%2Cspar|
0080: 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 65 |serevlog%2Cstore| 0080: 73 65 72 65 76 6c 6f 67 25 32 43 73 74 6f 72 65 |serevlog%2Cstore|
0090: 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 00 |....s.Bdata/0.i.| 0090: 00 00 80 00 73 08 42 64 61 74 61 2f 30 2e 69 00 |....s.Bdata/0.i.|
00a0: 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 00 |................| 00a0: 03 00 01 00 00 00 00 00 00 00 02 00 00 00 01 00 |................|
00b0: 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff 80 |................| 00b0: 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff 80 |................|
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1032 files to transfer, 96.5 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.5 KB in * seconds (* */sec) (glob)
#endif #endif
Clone with background file closing enabled Clone with background file closing enabled
#if stream-legacy #if stream-legacy
$ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
query 1; heads query 1; heads
sending batch command sending batch command
streaming all changes streaming all changes
sending getbundle command sending getbundle command
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
1030 files to transfer, 96.5 KB of data 1032 files to transfer, 96.5 KB of data
starting 4 threads for background file closing starting 4 threads for background file closing
starting 4 threads for background file closing starting 4 threads for background file closing
updating the branch cache updating the branch cache
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.5 KB in * seconds (* */sec) (glob)
bundle2-input-part: total payload size 112094 bundle2-input-part: total payload size 112150
bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: "listkeys" (params: 1 mandatory) supported
bundle2-input-bundle: 2 parts total bundle2-input-bundle: 2 parts total
checking for updated bookmarks checking for updated bookmarks
(sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
#endif #endif
Cannot stream clone when there are secret changesets Cannot stream clone when there are secret changesets
1027 files to transfer, 96.3 KB of data 1027 files to transfer, 96.3 KB of data
transferred 96.3 KB in * seconds (*/sec) (glob) transferred 96.3 KB in * seconds (*/sec) (glob)
searching for changes searching for changes
no changes found no changes found
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream -U http://localhost:$HGPORT secret-allowed $ hg clone --stream -U http://localhost:$HGPORT secret-allowed
streaming all changes streaming all changes
1030 files to transfer, 96.5 KB of data 1032 files to transfer, 96.5 KB of data
transferred 96.5 KB in * seconds (* */sec) (glob) transferred 96.5 KB in * seconds (* */sec) (glob)
#endif #endif
$ killdaemons.py $ killdaemons.py
Verify interaction between preferuncompressed and secret presence Verify interaction between preferuncompressed and secret presence
$ cd server $ cd server
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT with-bookmarks $ hg clone --stream http://localhost:$HGPORT with-bookmarks
streaming all changes streaming all changes
1033 files to transfer, 96.6 KB of data 1035 files to transfer, 96.7 KB of data
transferred 96.6 KB in * seconds (* */sec) (glob) transferred 96.7 KB in * seconds (* */sec) (glob)
updating to branch default updating to branch default
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
$ hg -R with-bookmarks bookmarks $ hg -R with-bookmarks bookmarks
some-bookmark 1:c17445101a72 some-bookmark 1:c17445101a72
Stream repository with phases Stream repository with phases
----------------------------- -----------------------------
searching for changes searching for changes
no changes found no changes found
updating to branch default updating to branch default
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT phase-publish $ hg clone --stream http://localhost:$HGPORT phase-publish
streaming all changes streaming all changes
1033 files to transfer, 96.6 KB of data 1035 files to transfer, 96.7 KB of data
transferred 96.6 KB in * seconds (* */sec) (glob) transferred 96.7 KB in * seconds (* */sec) (glob)
updating to branch default updating to branch default
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
$ hg -R phase-publish phase -r 'all()' $ hg -R phase-publish phase -r 'all()'
0: public 0: public
1: public 1: public
Clone as non publishing Clone as non publishing
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R phase-no-publish phase -r 'all()' $ hg -R phase-no-publish phase -r 'all()'
0: public 0: public
1: public 1: public
#endif #endif
#if stream-bundle2 #if stream-bundle2
$ hg clone --stream http://localhost:$HGPORT phase-no-publish $ hg clone --stream http://localhost:$HGPORT phase-no-publish
streaming all changes streaming all changes
1034 files to transfer, 96.7 KB of data 1036 files to transfer, 96.7 KB of data
transferred 96.7 KB in * seconds (* */sec) (glob) transferred 96.7 KB in * seconds (* */sec) (glob)
updating to branch default updating to branch default
1025 files updated, 0 files merged, 0 files removed, 0 files unresolved 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R phase-no-publish phase -r 'all()' $ hg -R phase-no-publish phase -r 'all()'
0: draft 0: draft
1: draft 1: draft
#endif #endif
1: draft 1: draft
0: draft 0: draft
$ hg serve -p $HGPORT -d --pid-file=hg.pid $ hg serve -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone -U --stream http://localhost:$HGPORT with-obsolescence $ hg clone -U --stream http://localhost:$HGPORT with-obsolescence
streaming all changes streaming all changes
1035 files to transfer, 97.1 KB of data 1037 files to transfer, 97.1 KB of data
transferred 97.1 KB in * seconds (* */sec) (glob) transferred 97.1 KB in * seconds (* */sec) (glob)
$ hg -R with-obsolescence log -T '{rev}: {phase}\n' $ hg -R with-obsolescence log -T '{rev}: {phase}\n'
1: draft 1: draft
0: draft 0: draft
$ hg debugobsolete -R with-obsolescence $ hg debugobsolete -R with-obsolescence
50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 50382b884f66690b7045cac93a540cba4d4c906f 0 {c17445101a72edac06facd130d14808dfbd5c7c2} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution $ hg clone -U --stream --config experimental.evolution=0 http://localhost:$HGPORT with-obsolescence-no-evolution
streaming all changes streaming all changes
remote: abort: server has obsolescence markers, but client cannot receive them via stream clone remote: abort: server has obsolescence markers, but client cannot receive them via stream clone
abort: pull failed on remote abort: pull failed on remote
[255] [255]
$ killdaemons.py $ killdaemons.py
#endif #endif

tests/test-clone.t

Trigger branchcache creation: Trigger branchcache creation:
$ hg branches $ hg branches
default 10:a7949464abda default 10:a7949464abda
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
topic-names-v1
topic-revs-v1
Default operation: Default operation:
$ hg clone . ../b $ hg clone . ../b
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../b $ cd ../b
Ensure branchcache got copied over: Ensure branchcache got copied over:
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
topic-names-v1
topic-revs-v1
$ cat a $ cat a
a a
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
$ cd ../c $ cd ../c
Ensure branchcache got copied over: Ensure branchcache got copied over:
$ ls .hg/cache $ ls .hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
topic-names-v1
topic-revs-v1
$ cat a 2>/dev/null || echo "a not present" $ cat a 2>/dev/null || echo "a not present"
a not present a not present
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files

tests/test-clonebundles.t

$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 11 files to transfer, 839 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 839 bytes in * seconds (* */sec) (glob)
A manifest with a stream clone but no BUNDLESPEC A manifest with a stream clone but no BUNDLESPEC
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/packed.hg > http://localhost:$HGPORT1/packed.hg
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-no-bundlespec $ hg clone -U --stream http://localhost:$HGPORT uncompressed-no-bundlespec
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 11 files to transfer, 839 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 839 bytes in * seconds (* */sec) (glob)
A manifest with a gzip bundle and a stream clone A manifest with a gzip bundle and a stream clone
$ cat > server/.hg/clonebundles.manifest << EOF $ cat > server/.hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1
> EOF > EOF
> http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2 > http://localhost:$HGPORT1/gz-a.hg BUNDLESPEC=gzip-v2
> http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42 > http://localhost:$HGPORT1/packed.hg BUNDLESPEC=none-packed1;requirements%3Drevlogv42
> EOF > EOF
$ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements $ hg clone -U --stream http://localhost:$HGPORT uncompressed-gzip-packed-unsupported-requirements
no compatible clone bundles available on server; falling back to regular clone no compatible clone bundles available on server; falling back to regular clone
(you may want to report this to the server operator) (you may want to report this to the server operator)
streaming all changes streaming all changes
9 files to transfer, 816 bytes of data 11 files to transfer, 839 bytes of data
transferred 816 bytes in * seconds (*) (glob) transferred 839 bytes in * seconds (* */sec) (glob)
Test clone bundle retrieved through bundle2 Test clone bundle retrieved through bundle2
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> largefiles= > largefiles=
> EOF > EOF
$ killdaemons.py $ killdaemons.py

tests/test-debugcommands.t

[255] [255]
Test cache warming command Test cache warming command
$ rm -rf .hg/cache/ $ rm -rf .hg/cache/
$ hg debugupdatecaches --debug $ hg debugupdatecaches --debug
updating the branch cache updating the branch cache
$ ls -r .hg/cache/* $ ls -r .hg/cache/*
.hg/cache/topic-revs-v1
.hg/cache/topic-names-v1
.hg/cache/tags2-served .hg/cache/tags2-served
.hg/cache/tags2 .hg/cache/tags2
.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/hgtagsfnodes1 .hg/cache/hgtagsfnodes1
.hg/cache/branch2-visible-hidden .hg/cache/branch2-visible-hidden
.hg/cache/branch2-visible .hg/cache/branch2-visible
.hg/cache/branch2-served.hidden .hg/cache/branch2-served.hidden

tests/test-fncache.t

$ find .hg | sort $ find .hg | sort
.hg .hg
.hg/00changelog.i .hg/00changelog.i
.hg/00manifest.i .hg/00manifest.i
.hg/cache .hg/cache
.hg/cache/branch2-served .hg/cache/branch2-served
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/cache/topic-names-v1
.hg/cache/topic-revs-v1
.hg/data .hg/data
.hg/data/tst.d.hg .hg/data/tst.d.hg
.hg/data/tst.d.hg/foo.i .hg/data/tst.d.hg/foo.i
.hg/dirstate .hg/dirstate
.hg/fsmonitor.state (fsmonitor !) .hg/fsmonitor.state (fsmonitor !)
.hg/last-message.txt .hg/last-message.txt
.hg/phaseroots .hg/phaseroots
.hg/requires .hg/requires
adding tst.d/Foo adding tst.d/Foo
$ find .hg | sort $ find .hg | sort
.hg .hg
.hg/00changelog.i .hg/00changelog.i
.hg/cache .hg/cache
.hg/cache/branch2-served .hg/cache/branch2-served
.hg/cache/rbc-names-v1 .hg/cache/rbc-names-v1
.hg/cache/rbc-revs-v1 .hg/cache/rbc-revs-v1
.hg/cache/topic-names-v1
.hg/cache/topic-revs-v1
.hg/dirstate .hg/dirstate
.hg/fsmonitor.state (fsmonitor !) .hg/fsmonitor.state (fsmonitor !)
.hg/last-message.txt .hg/last-message.txt
.hg/requires .hg/requires
.hg/store .hg/store
.hg/store/00changelog.i .hg/store/00changelog.i
.hg/store/00manifest.i .hg/store/00manifest.i
.hg/store/data .hg/store/data

tests/test-hardlinks.t

$ nlinksdir r4 $ nlinksdir r4
2 r4/.hg/00changelog.i 2 r4/.hg/00changelog.i
2 r4/.hg/branch 2 r4/.hg/branch
2 r4/.hg/cache/branch2-base 2 r4/.hg/cache/branch2-base
2 r4/.hg/cache/branch2-served 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/rbc-names-v1 2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1 2 r4/.hg/cache/rbc-revs-v1
2 r4/.hg/cache/topic-names-v1
2 r4/.hg/cache/topic-revs-v1
2 r4/.hg/dirstate 2 r4/.hg/dirstate
2 r4/.hg/fsmonitor.state (fsmonitor !) 2 r4/.hg/fsmonitor.state (fsmonitor !)
2 r4/.hg/hgrc 2 r4/.hg/hgrc
2 r4/.hg/last-message.txt 2 r4/.hg/last-message.txt
2 r4/.hg/requires 2 r4/.hg/requires
2 r4/.hg/store/00changelog.i 2 r4/.hg/store/00changelog.i
2 r4/.hg/store/00manifest.i 2 r4/.hg/store/00manifest.i
2 r4/.hg/store/data/d1/f2.d 2 r4/.hg/store/data/d1/f2.d
$ nlinksdir r4 $ nlinksdir r4
2 r4/.hg/00changelog.i 2 r4/.hg/00changelog.i
1 r4/.hg/branch 1 r4/.hg/branch
2 r4/.hg/cache/branch2-base 2 r4/.hg/cache/branch2-base
2 r4/.hg/cache/branch2-served 2 r4/.hg/cache/branch2-served
2 r4/.hg/cache/rbc-names-v1 2 r4/.hg/cache/rbc-names-v1
2 r4/.hg/cache/rbc-revs-v1 2 r4/.hg/cache/rbc-revs-v1
2 r4/.hg/cache/topic-names-v1
2 r4/.hg/cache/topic-revs-v1
1 r4/.hg/dirstate 1 r4/.hg/dirstate
1 r4/.hg/fsmonitor.state (fsmonitor !) 1 r4/.hg/fsmonitor.state (fsmonitor !)
2 r4/.hg/hgrc 2 r4/.hg/hgrc
2 r4/.hg/last-message.txt 2 r4/.hg/last-message.txt
2 r4/.hg/requires 2 r4/.hg/requires
2 r4/.hg/store/00changelog.i 2 r4/.hg/store/00changelog.i
2 r4/.hg/store/00manifest.i 2 r4/.hg/store/00manifest.i
2 r4/.hg/store/data/d1/f2.d 2 r4/.hg/store/data/d1/f2.d

tests/test-http-proxy.t

$ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null & $ tinyproxy.py $HGPORT1 localhost 2>proxy.log >/dev/null </dev/null &
$ while [ ! -f proxy.pid ]; do sleep 0; done $ while [ ! -f proxy.pid ]; do sleep 0; done
$ cat proxy.pid >> $DAEMON_PIDS $ cat proxy.pid >> $DAEMON_PIDS
url for proxy, stream url for proxy, stream
$ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b $ http_proxy=http://localhost:$HGPORT1/ hg --config http_proxy.always=True clone --stream http://localhost:$HGPORT/ b
streaming all changes streaming all changes
6 files to transfer, 412 bytes of data (reporevlogstore !) 8 files to transfer, 427 bytes of data (reporevlogstore !)
4 files to transfer, 330 bytes of data (reposimplestore !) 4 files to transfer, 330 bytes of data (reposimplestore !)
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b $ cd b
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests

tests/test-http.t

$ cd .. $ cd ..
$ cat hg1.pid hg2.pid >> $DAEMON_PIDS $ cat hg1.pid hg2.pid >> $DAEMON_PIDS
clone via stream clone via stream
#if no-reposimplestore #if no-reposimplestore
$ hg clone --stream http://localhost:$HGPORT/ copy 2>&1 $ hg clone --stream http://localhost:$HGPORT/ copy 2>&1
streaming all changes streaming all changes
9 files to transfer, 715 bytes of data 11 files to transfer, 730 bytes of data
transferred * bytes in * seconds (*/sec) (glob) transferred * bytes in * seconds (*/sec) (glob)
updating to branch default updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy $ hg verify -R copy
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
> EOF > EOF
$ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py $ hg id http://localhost:$HGPORT2/ --config extensions.x=use_digests.py
5fed3813f7f5 5fed3813f7f5
#if no-reposimplestore #if no-reposimplestore
$ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1 $ hg clone http://user:pass@localhost:$HGPORT2/ dest 2>&1
streaming all changes streaming all changes
10 files to transfer, 1.01 KB of data 12 files to transfer, 1.03 KB of data
transferred * KB in * seconds (*/sec) (glob) transferred * KB in * seconds (*/sec) (glob)
updating to branch default updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif #endif
--pull should override server's preferuncompressed --pull should override server's preferuncompressed
$ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1 $ hg clone --pull http://user:pass@localhost:$HGPORT2/ dest-pull 2>&1
requesting all changes requesting all changes

tests/test-inherit-mode.t

$ "$PYTHON" ../printmodes.py . $ "$PYTHON" ../printmodes.py .
00700 ./.hg/ 00700 ./.hg/
00600 ./.hg/00changelog.i 00600 ./.hg/00changelog.i
00770 ./.hg/cache/ 00770 ./.hg/cache/
00660 ./.hg/cache/branch2-served 00660 ./.hg/cache/branch2-served
00660 ./.hg/cache/rbc-names-v1 00660 ./.hg/cache/rbc-names-v1
00660 ./.hg/cache/rbc-revs-v1 00660 ./.hg/cache/rbc-revs-v1
00660 ./.hg/cache/topic-names-v1
00660 ./.hg/cache/topic-revs-v1
00660 ./.hg/dirstate 00660 ./.hg/dirstate
00660 ./.hg/fsmonitor.state (fsmonitor !) 00660 ./.hg/fsmonitor.state (fsmonitor !)
00660 ./.hg/last-message.txt 00660 ./.hg/last-message.txt
00600 ./.hg/requires 00600 ./.hg/requires
00770 ./.hg/store/ 00770 ./.hg/store/
00660 ./.hg/store/00changelog.i 00660 ./.hg/store/00changelog.i
00660 ./.hg/store/00manifest.i 00660 ./.hg/store/00manifest.i
00770 ./.hg/store/data/ 00770 ./.hg/store/data/
$ "$PYTHON" ../printmodes.py ../push $ "$PYTHON" ../printmodes.py ../push
00770 ../push/.hg/ 00770 ../push/.hg/
00660 ../push/.hg/00changelog.i 00660 ../push/.hg/00changelog.i
00770 ../push/.hg/cache/ 00770 ../push/.hg/cache/
00660 ../push/.hg/cache/branch2-base 00660 ../push/.hg/cache/branch2-base
00660 ../push/.hg/cache/rbc-names-v1 00660 ../push/.hg/cache/rbc-names-v1
00660 ../push/.hg/cache/rbc-revs-v1 00660 ../push/.hg/cache/rbc-revs-v1
00660 ../push/.hg/cache/topic-names-v1
00660 ../push/.hg/cache/topic-revs-v1
00660 ../push/.hg/dirstate 00660 ../push/.hg/dirstate
00660 ../push/.hg/requires 00660 ../push/.hg/requires
00770 ../push/.hg/store/ 00770 ../push/.hg/store/
00660 ../push/.hg/store/00changelog.i 00660 ../push/.hg/store/00changelog.i
00660 ../push/.hg/store/00manifest.i 00660 ../push/.hg/store/00manifest.i
00770 ../push/.hg/store/data/ 00770 ../push/.hg/store/data/
00770 ../push/.hg/store/data/dir/ 00770 ../push/.hg/store/data/dir/
00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !) 00660 ../push/.hg/store/data/dir/bar.i (reporevlogstore !)

tests/test-keyword.t

$ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
committing files: committing files:
c c
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
committing manifest committing manifest
committing changelog committing changelog
overwriting c expanding keywords overwriting c expanding keywords
truncating cache/topic-revs-v1 to 16
updating the branch cache updating the branch cache
committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
$ cat a c $ cat a c
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
do not process $Id: do not process $Id:
xxx $ xxx $
expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $
do not process $Id: do not process $Id:
Commit with multi-line message and custom expansion Commit with multi-line message and custom expansion
$ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
committing files: committing files:
a a
committing manifest committing manifest
committing changelog committing changelog
overwriting a expanding keywords overwriting a expanding keywords
truncating cache/topic-revs-v1 to 16
updating the branch cache updating the branch cache
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
$ rm log $ rm log
Stat, verify and show custom expansion (firstline) Stat, verify and show custom expansion (firstline)
$ hg status $ hg status
? c ? c
$ cd x $ cd x
$ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
committing files: committing files:
x/a x/a
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
committing manifest committing manifest
committing changelog committing changelog
overwriting x/a expanding keywords overwriting x/a expanding keywords
truncating cache/topic-revs-v1 to 24
updating the branch cache updating the branch cache
committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
$ cat a $ cat a
expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
do not process $Id: do not process $Id:
xxx $ xxx $
$Xinfo: User Name <user@example.com>: xa $ $Xinfo: User Name <user@example.com>: xa $

tests/test-mq-symlinks.t

now at: symlink.patch now at: symlink.patch
$ hg qpush --debug $ hg qpush --debug
applying updatelink applying updatelink
patching file a patching file a
committing files: committing files:
a a
committing manifest committing manifest
committing changelog committing changelog
truncating cache/topic-revs-v1 to 16
updating the branch cache updating the branch cache
now at: updatelink now at: updatelink
$ readlink.py a $ readlink.py a
a -> c a -> c
$ hg st $ hg st
test replacing a symlink with a file test replacing a symlink with a file

tests/test-push-http.t

listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?) listening at http://*:$HGPORT/ (bound to $LOCALIP:$HGPORT) (glob) (?)
pushing to http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: add changeset ba677d0156c1 remote: add changeset ba677d0156c1
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: adding a revisions remote: adding a revisions
remote: truncating cache/topic-revs-v1 to 8
remote: updating the branch cache remote: updating the branch cache
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh
remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public remote: phase-move: cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b: draft -> public
remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh remote: running hook txnclose-phase.test: sh $TESTTMP/hook.sh
remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public remote: phase-move: ba677d0156c1196c1a699fa53f390dcfc3ce3872: -> public
remote: running hook changegroup: sh -c "printenv.py --line changegroup 0" remote: running hook changegroup: sh -c "printenv.py --line changegroup 0"
remote: changegroup hook: HG_HOOKNAME=changegroup remote: changegroup hook: HG_HOOKNAME=changegroup

tests/test-rebase-conflicts.t

adding f1.txt revisions adding f1.txt revisions
bundle2-input-part: total payload size 1686 bundle2-input-part: total payload size 1686
bundle2-input-part: "cache:rev-branch-cache" (advisory) supported bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
bundle2-input-part: total payload size 74 bundle2-input-part: total payload size 74
bundle2-input-part: "phase-heads" supported bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24 bundle2-input-part: total payload size 24
bundle2-input-bundle: 3 parts total bundle2-input-bundle: 3 parts total
truncating cache/rbc-revs-v1 to 72 truncating cache/rbc-revs-v1 to 72
truncating cache/topic-revs-v1 to 72
added 2 changesets with 2 changes to 1 files added 2 changesets with 2 changes to 1 files
updating the branch cache updating the branch cache
invalid branch cache (served): tip differs invalid branch cache (served): tip differs
invalid branch cache (served.hidden): tip differs invalid branch cache (served.hidden): tip differs
rebase completed rebase completed
Test minimization of merge conflicts Test minimization of merge conflicts
$ hg up -q null $ hg up -q null

tests/test-remote-hidden.t

branch2-base branch2-base
branch2-served branch2-served
branch2-served.hidden branch2-served.hidden
branch2-visible branch2-visible
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2 tags2
tags2-visible tags2-visible
topic-names-v1
topic-revs-v1
Check that the `served.hidden` repoview Check that the `served.hidden` repoview
--------------------------------------- ---------------------------------------
$ hg -R repo-with-hidden serve -p $HGPORT -d --pid-file hg.pid --config web.view=served.hidden $ hg -R repo-with-hidden serve -p $HGPORT -d --pid-file hg.pid --config web.view=served.hidden
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
changesets in secret and higher phases are not visible through hgweb changesets in secret and higher phases are not visible through hgweb

tests/test-server-view.t

branch2-served.hidden%89c45d2fa07e branch2-served.hidden%89c45d2fa07e
branch2-visible%89c45d2fa07e branch2-visible%89c45d2fa07e
branch2-visible-hidden%89c45d2fa07e branch2-visible-hidden%89c45d2fa07e
hgtagsfnodes1 hgtagsfnodes1
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2 tags2
tags2-served%89c45d2fa07e tags2-served%89c45d2fa07e
topic-names-v1
topic-revs-v1
cleanup cleanup
$ cat errors.log $ cat errors.log
$ killdaemons.py $ killdaemons.py

tests/test-share.t

checklink (symlink !) checklink (symlink !)
checklink-target (symlink !) checklink-target (symlink !)
manifestfulltextcache (reporevlogstore !) manifestfulltextcache (reporevlogstore !)
$ ls -1 ../repo1/.hg/cache $ ls -1 ../repo1/.hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2-visible tags2-visible
topic-names-v1
topic-revs-v1
Cloning a shared repo should pick up the full cache dir on the other hand. Cloning a shared repo should pick up the full cache dir on the other hand.
$ hg clone . ../repo2-clone $ hg clone . ../repo2-clone
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ls -1 ../repo2-clone/.hg/cache $ ls -1 ../repo2-clone/.hg/cache
branch2-served branch2-served
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2-visible tags2-visible
topic-names-v1
topic-revs-v1
Some sed versions appends newline, some don't, and some just fails Some sed versions appends newline, some don't, and some just fails
$ cat .hg/sharedpath; echo $ cat .hg/sharedpath; echo
$TESTTMP/repo1/.hg $TESTTMP/repo1/.hg
trailing newline on .hg/sharedpath is ok trailing newline on .hg/sharedpath is ok
$ hg tip -q $ hg tip -q

tests/test-ssh.t

[255] [255]
clone remote via stream clone remote via stream
#if no-reposimplestore #if no-reposimplestore
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/remote local-stream
streaming all changes streaming all changes
8 files to transfer, 827 bytes of data 10 files to transfer, 865 bytes of data
transferred 827 bytes in * seconds (*) (glob) transferred 865 bytes in * seconds (*) (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local-stream $ cd local-stream
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 2 changes to 2 files checked 3 changesets with 2 changes to 2 files
$ hg branches $ hg branches
default 0:1160648e36ce default 0:1160648e36ce
$ cd $TESTTMP $ cd $TESTTMP
clone bookmarks via stream clone bookmarks via stream
$ hg -R local-stream book mybook $ hg -R local-stream book mybook
$ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2 $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --stream ssh://user@dummy/local-stream stream2
streaming all changes streaming all changes
9 files to transfer, 870 bytes of data 11 files to transfer, 908 bytes of data
transferred 870 bytes in * seconds (*) (glob) transferred 908 bytes in * seconds (*) (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd stream2 $ cd stream2
$ hg book $ hg book
mybook 0:1160648e36ce mybook 0:1160648e36ce
$ cd $TESTTMP $ cd $TESTTMP
$ rm -rf local-stream stream2 $ rm -rf local-stream stream2

tests/test-stream-bundle-v2.t

> B > B
> | > |
> A > A
> EOF > EOF
$ hg bundle -a --type="none-v2;stream=v2" bundle.hg $ hg bundle -a --type="none-v2;stream=v2" bundle.hg
$ hg debugbundle bundle.hg $ hg debugbundle bundle.hg
Stream params: {} Stream params: {}
stream2 -- {bytecount: 1693, filecount: 11, requirements: dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore} (mandatory: True) stream2 -- {bytecount: 1740, filecount: 13, requirements: dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore} (mandatory: True)
$ hg debugbundle --spec bundle.hg $ hg debugbundle --spec bundle.hg
none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Csparserevlog%2Cstore
Test that we can apply the bundle as a stream clone bundle Test that we can apply the bundle as a stream clone bundle
$ cat > .hg/clonebundles.manifest << EOF $ cat > .hg/clonebundles.manifest << EOF
> http://localhost:$HGPORT1/bundle.hg BUNDLESPEC=`hg debugbundle --spec bundle.hg` > http://localhost:$HGPORT1/bundle.hg BUNDLESPEC=`hg debugbundle --spec bundle.hg`
> EOF > EOF
$ hg serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log $ hg serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ "$PYTHON" $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid $ "$PYTHON" $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid
$ cat http.pid >> $DAEMON_PIDS $ cat http.pid >> $DAEMON_PIDS
$ cd .. $ cd ..
$ hg clone http://localhost:$HGPORT streamv2-clone-implicit --debug $ hg clone http://localhost:$HGPORT streamv2-clone-implicit --debug
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
sending clonebundles command sending clonebundles command
applying clone bundle from http://localhost:$HGPORT1/bundle.hg applying clone bundle from http://localhost:$HGPORT1/bundle.hg
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
11 files to transfer, 1.65 KB of data 13 files to transfer, 1.70 KB of data
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
adding [s] data/B.i (66 bytes) adding [s] data/B.i (66 bytes)
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (584 bytes)
adding [s] 00changelog.i (595 bytes) adding [s] 00changelog.i (595 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes) adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes) adding [c] rbc-revs-v1 (40 bytes)
transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re) adding [c] topic-names-v1 (7 bytes)
bundle2-input-part: total payload size 1840 adding [c] topic-revs-v1 (40 bytes)
transferred 1.70 KB in \d\.\d seconds \(.*/sec\) (re)
bundle2-input-part: total payload size 1920
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
$ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug
using http://localhost:$HGPORT/ using http://localhost:$HGPORT/
sending capabilities command sending capabilities command
sending clonebundles command sending clonebundles command
applying clone bundle from http://localhost:$HGPORT1/bundle.hg applying clone bundle from http://localhost:$HGPORT1/bundle.hg
bundle2-input-bundle: with-transaction bundle2-input-bundle: with-transaction
bundle2-input-part: "stream2" (params: 3 mandatory) supported bundle2-input-part: "stream2" (params: 3 mandatory) supported
applying stream bundle applying stream bundle
11 files to transfer, 1.65 KB of data 13 files to transfer, 1.70 KB of data
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
adding [s] data/A.i (66 bytes) adding [s] data/A.i (66 bytes)
adding [s] data/B.i (66 bytes) adding [s] data/B.i (66 bytes)
adding [s] data/C.i (66 bytes) adding [s] data/C.i (66 bytes)
adding [s] data/D.i (66 bytes) adding [s] data/D.i (66 bytes)
adding [s] data/E.i (66 bytes) adding [s] data/E.i (66 bytes)
adding [s] 00manifest.i (584 bytes) adding [s] 00manifest.i (584 bytes)
adding [s] 00changelog.i (595 bytes) adding [s] 00changelog.i (595 bytes)
adding [s] phaseroots (43 bytes) adding [s] phaseroots (43 bytes)
adding [c] branch2-served (94 bytes) adding [c] branch2-served (94 bytes)
adding [c] rbc-names-v1 (7 bytes) adding [c] rbc-names-v1 (7 bytes)
adding [c] rbc-revs-v1 (40 bytes) adding [c] rbc-revs-v1 (40 bytes)
transferred 1.65 KB in *.* seconds (*/sec) (glob) adding [c] topic-names-v1 (7 bytes)
bundle2-input-part: total payload size 1840 adding [c] topic-revs-v1 (40 bytes)
transferred 1.70 KB in *.* seconds (*/sec) (glob)
bundle2-input-part: total payload size 1920
bundle2-input-bundle: 1 parts total bundle2-input-bundle: 1 parts total
updating the branch cache updating the branch cache
finished applying clone bundle finished applying clone bundle
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found

tests/test-tags.t

Missing tags2* files means the cache wasn't written through the normal mechanism. Missing tags2* files means the cache wasn't written through the normal mechanism.
$ ls tagsclient/.hg/cache $ ls tagsclient/.hg/cache
branch2-base branch2-base
hgtagsfnodes1 hgtagsfnodes1
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
topic-names-v1
topic-revs-v1
Cache should contain the head only, even though other nodes have tags data Cache should contain the head only, even though other nodes have tags data
$ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
tagsclient/.hg/cache/hgtagsfnodes1: size=96 tagsclient/.hg/cache/hgtagsfnodes1: size=96
0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0.1 0:96ee1d7354c4 0.1 0:96ee1d7354c4
$ ls tagsclient/.hg/cache $ ls tagsclient/.hg/cache
branch2-base branch2-base
hgtagsfnodes1 hgtagsfnodes1
rbc-names-v1 rbc-names-v1
rbc-revs-v1 rbc-revs-v1
tags2-visible tags2-visible
topic-names-v1
topic-revs-v1
$ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1 $ f --size --hexdump tagsclient/.hg/cache/hgtagsfnodes1
tagsclient/.hg/cache/hgtagsfnodes1: size=96 tagsclient/.hg/cache/hgtagsfnodes1: size=96
0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| 0030: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....| 0040: ff ff ff ff ff ff ff ff 40 f0 35 8c 19 e0 a7 d3 |........@.5.....|

tests/test-treemanifest.t

crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files
Stream clone with basicstore Stream clone with basicstore
$ hg clone --config experimental.changegroup3=True --stream -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT1 stream-clone-basicstore > http://localhost:$HGPORT1 stream-clone-basicstore
streaming all changes streaming all changes
21 files to transfer, * of data (glob) 23 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
$ hg -R stream-clone-basicstore verify $ hg -R stream-clone-basicstore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files
Stream clone with encodedstore Stream clone with encodedstore
$ hg clone --config experimental.changegroup3=True --stream -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT2 stream-clone-encodedstore > http://localhost:$HGPORT2 stream-clone-encodedstore
streaming all changes streaming all changes
21 files to transfer, * of data (glob) 23 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
$ hg -R stream-clone-encodedstore verify $ hg -R stream-clone-encodedstore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files
Stream clone with fncachestore Stream clone with fncachestore
$ hg clone --config experimental.changegroup3=True --stream -U \ $ hg clone --config experimental.changegroup3=True --stream -U \
> http://localhost:$HGPORT stream-clone-fncachestore > http://localhost:$HGPORT stream-clone-fncachestore
streaming all changes streaming all changes
22 files to transfer, * of data (glob) 24 files to transfer, * of data (glob)
transferred * in * seconds (*) (glob) transferred * in * seconds (*) (glob)
$ hg -R stream-clone-fncachestore verify $ hg -R stream-clone-fncachestore verify
checking changesets checking changesets
checking manifests checking manifests
checking directory manifests checking directory manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 4 changesets with 18 changes to 8 files checked 4 changesets with 18 changes to 8 files