This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4581

remotefilelog: update for core changegroup packing changes
ClosedPublic

Authored by durin42 on Sep 13 2018, 3:02 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXb3d9703be944: remotefilelog: update for core changegroup packing changes
Summary

This allows

cd tests && python $CREW/tests/run-tests.py -j7 --extra-config-opt devel.all-warnings=no --blacklist=<(ls test*lfs*.t test*fastanno*.t test*treeman*.t) test*remotefilelog*.t

to pass against core revision 623081f2abc2, which is fairly recent. I
think that's the entire subset of remotefilelog functionality that we
need to worry about for Google, but the disabling of the
test*treemanifest*.t tests worries me a little, so I might be back
soon with more fixes.

There's some probably-wrong hacks in here, but it seems to work.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 13 2018, 3:02 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 13 2018, 3:02 PM
quark requested changes to this revision.Sep 13 2018, 3:30 PM
quark added a subscriber: quark.
quark added inline comments.
remotefilelog/remotefilelog.py
228–229

Remotefilelog does not have rev all over the place. See:

def rev(self, node):
    # This is a hack to make TortoiseHG work.
    return node

Maybe raising NotImplementedError is safer, if it's not used.

238

It does not have a return. Does it actually get used somewhere? Maybe raising NotImplementedError is safer to capture surprises?

remotefilelog/shallowbundle.py
48–50

Maybe just make it return True for most cases:

return not repo.ui.configbool('treemanifest', 'treeonly')
140–141

Need removal.

146

I think most of the remaining code is not prepared for an empty linknode (including storage). Maybe special case it so it can be stored as nullid and change remotefilectx.py to ignore nullid linknodes.

This revision now requires changes to proceed.Sep 13 2018, 3:30 PM
durin42 marked an inline comment as done.Sep 13 2018, 4:15 PM
durin42 added inline comments.
remotefilelog/remotefilelog.py
228–229

It's needed, fortunately by setting _generaldelta=True we end up on a codepath where it's only used as a UUID and not as a sortable.

238

Someone was at least referencing and calling it. I'm a little surprised the missing return (meaning it returned None) didn't break anything, but I've corrected that issue.

remotefilelog/shallowbundle.py
140–141

My debugging secrets revealed!

146

I'm not following - this seems to work and pass tests. I'm not sure how I could fill in the linknodes for a given file log, because remotefilelog has no way of iterating file revisions. Does that impasse make sense?

(Happy to discuss on IRC if you like.)

durin42 marked an inline comment as done.Sep 13 2018, 4:15 PM
durin42 edited the summary of this revision. (Show Details)
durin42 updated this revision to Diff 11020.
quark accepted this revision.Sep 13 2018, 6:12 PM
This revision is now accepted and ready to land.Sep 13 2018, 6:12 PM
Closed by commit rFBHGXb3d9703be944: remotefilelog: update for core changegroup packing changes (authored by durin42). · Explain WhySep 13 2018, 6:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11033

remotefilelog/__init__.py

changegroup.cg1packer = shallowbundle.shallowcg1packer changegroup.cg1packer = shallowbundle.shallowcg1packer
packermap = None packermap = None
if util.safehasattr(changegroup, 'packermap'): if util.safehasattr(changegroup, 'packermap'):
packermap = changegroup.packermap packermap = changegroup.packermap
elif util.safehasattr(changegroup, '_packermap'): elif util.safehasattr(changegroup, '_packermap'):
packermap = changegroup._packermap packermap = changegroup._packermap
if packermap: # Partway through the hg 4.8 cycle all packers were consolidated
# down to just cgpacker and they were constructed using factory
# functions, so we don't need to override the packermap anymore.
if util.safehasattr(changegroup, 'cgpacker'):
changegroup.cgpacker = shallowbundle.shallowcg1packer
elif packermap:
# Mercurial >= 3.3 # Mercurial >= 3.3
packermap01 = packermap['01'] packermap01 = packermap['01']
packermap02 = packermap['02'] packermap02 = packermap['02']
packermap03 = packermap['03'] packermap03 = packermap['03']
packermap['01'] = (shallowbundle.shallowcg1packer, packermap['01'] = (shallowbundle.shallowcg1packer,
packermap01[1]) packermap01[1])
packermap['02'] = (shallowbundle.shallowcg2packer, packermap['02'] = (shallowbundle.shallowcg2packer,
packermap02[1]) packermap02[1])

remotefilelog/remotefilelog.py

return not bool(missing) return not bool(missing)
def __get__(self, node): def __get__(self, node):
if node not in self: if node not in self:
raise KeyError(node) raise KeyError(node)
return node return node
class remotefilelog(object): class remotefilelog(object):
_generaldelta = True
def __init__(self, opener, path, repo): def __init__(self, opener, path, repo):
self.opener = opener self.opener = opener
self.filename = path self.filename = path
self.repo = repo self.repo = repo
self.nodemap = remotefilelognodemap(self.filename, repo.contentstore) self.nodemap = remotefilelognodemap(self.filename, repo.contentstore)
self.version = 1 self.version = 1
ancestormap = self.repo.metadatastore.getancestors(self.filename, node) ancestormap = self.repo.metadatastore.getancestors(self.filename, node)
p1, p2, linknode, copyfrom = ancestormap[node] p1, p2, linknode, copyfrom = ancestormap[node]
if copyfrom: if copyfrom:
p1 = nullid p1 = nullid
return p1, p2 return p1, p2
def parentrevs(self, rev):
# TODO(augie): this is a node and should be a rev, but for now
# nothing in core seems to actually break.
quarkUnsubmitted
Not Done

Remotefilelog does not have rev all over the place. See:

def rev(self, node):
    # This is a hack to make TortoiseHG work.
    return node

Maybe raising NotImplementedError is safer, if it's not used.

quark: Remotefilelog does not have `rev` all over the place. See: def rev(self, node): #…
durin42AuthorUnsubmitted
Not Done

It's needed, fortunately by setting _generaldelta=True we end up on a codepath where it's only used as a UUID and not as a sortable.

durin42: It's needed, fortunately by setting _generaldelta=True we end up on a codepath where it's only…
return self.parents(rev)
def linknode(self, node): def linknode(self, node):
ancestormap = self.repo.metadatastore.getancestors(self.filename, node) ancestormap = self.repo.metadatastore.getancestors(self.filename, node)
p1, p2, linknode, copyfrom = ancestormap[node] p1, p2, linknode, copyfrom = ancestormap[node]
return linknode return linknode
def linkrev(self, node):
return self.repo.changelog.rev(self.linknode(node))
quarkUnsubmitted
Not Done

It does not have a return. Does it actually get used somewhere? Maybe raising NotImplementedError is safer to capture surprises?

quark: It does not have a `return`. Does it actually get used somewhere? Maybe raising…
durin42AuthorUnsubmitted
Not Done

Someone was at least referencing and calling it. I'm a little surprised the missing return (meaning it returned None) didn't break anything, but I've corrected that issue.

durin42: Someone was at least referencing and calling it. I'm a little surprised the missing return…
def emitrevisiondeltas(self, requests):
prevnode = None
for request in requests:
node = request.node
p1, p2 = self.parents(node)
if prevnode is None:
prevnode = p1
if request.basenode is not None:
basenode = request.basenode
else:
basenode = p1
if basenode == nullid:
revision = self.revision(node, raw=True)
delta = None
else:
revision = None
delta = self.revdiff(basenode, node)
yield revlog.revlogrevisiondelta(
node=node,
p1node=p1,
p2node=p2,
linknode=self.linknode(node),
basenode=basenode,
flags=self.flags(node),
baserevisionsize=None,
revision=revision,
delta=delta,
)
def revdiff(self, node1, node2): def revdiff(self, node1, node2):
return mdiff.textdiff(self.revision(node1, raw=True), return mdiff.textdiff(self.revision(node1, raw=True),
self.revision(node2, raw=True)) self.revision(node2, raw=True))
def lookup(self, node): def lookup(self, node):
if len(node) == 40: if len(node) == 40:
node = bin(node) node = bin(node)
if len(node) != 20: if len(node) != 20:

remotefilelog/shallowbundle.py

prev, curr = nodelist[i], nodelist[i + 1] prev, curr = nodelist[i], nodelist[i + 1]
linknode = lookup(curr) linknode = lookup(curr)
for c in self.nodechunk(rlog, curr, prev, linknode): for c in self.nodechunk(rlog, curr, prev, linknode):
yield c yield c
yield self.close() yield self.close()
def _cansendflat(repo, mfnodes): def _cansendflat(repo, mfnodes):
if not util.safehasattr(repo.manifestlog, '_revlog'): if not util.safehasattr(repo.manifestlog, '_revlog'):
if getattr(repo.manifestlog, '_treeondisk', False):
return False return False
quarkUnsubmitted
Done

Maybe just make it return True for most cases:

return not repo.ui.configbool('treemanifest', 'treeonly')
quark: Maybe just make it return `True` for most cases: return not repo.ui.configbool…
if repo.ui.configbool('treemanifest', 'treeonly'): return not repo.ui.configbool('treemanifest', 'treeonly')
return False
revlog = repo.manifestlog._revlog
for mfnode in mfnodes:
if mfnode not in revlog.nodemap:
return False
return True
if util.safehasattr(changegroup, 'cg1packer'): if util.safehasattr(changegroup, 'cg1packer'):
# Up until 4c99c6d1ef95 # Up until 4c99c6d1ef95
cgpacker = changegroup.cg1packer cgpacker = changegroup.cg1packer
else: else:
# Since 4c99c6d1ef95 # Since 4c99c6d1ef95
cgpacker = changegroup.cgpacker cgpacker = changegroup.cgpacker
@shallowutil.interposeclass(changegroup, cgpacker.__name__)
class shallowcg1packer(cgpacker): class shallowcg1packer(cgpacker):
def generate(self, commonrevs, clnodes, fastpathlinkrev, source): def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
if "remotefilelog" in self._repo.requirements: if "remotefilelog" in self._repo.requirements:
fastpathlinkrev = False fastpathlinkrev = False
return super(shallowcg1packer, self).generate(commonrevs, clnodes, return super(shallowcg1packer, self).generate(commonrevs, clnodes,
fastpathlinkrev, source) fastpathlinkrev, source)
p1ctx = mflog[p1node] p1ctx = mflog[p1node]
diff = p1ctx.read().diff(mfctx.read()).iteritems() diff = p1ctx.read().diff(mfctx.read()).iteritems()
for filename, ((anode, aflag), (bnode, bflag)) in diff: for filename, ((anode, aflag), (bnode, bflag)) in diff:
if bnode is not None: if bnode is not None:
fclnodes = fnodes.setdefault(filename, {}) fclnodes = fnodes.setdefault(filename, {})
fclnode = fclnodes.setdefault(bnode, clnode) fclnode = fclnodes.setdefault(bnode, clnode)
if clrevorder[clnode] < clrevorder[fclnode]: if clrevorder[clnode] < clrevorder[fclnode]:
fclnodes[bnode] = clnode fclnodes[bnode] = clnode
if util.safehasattr(self, 'close'):
yield self.close() yield self.close()
def generatefiles(self, changedfiles, linknodes, commonrevs, source): def generatefiles(self, changedfiles, *args):
try:
linknodes, commonrevs, source = args
except ValueError:
commonrevs, source, mfdicts, fastpathlinkrev, fnodes, clrevs = args
if requirement in self._repo.requirements: if requirement in self._repo.requirements:
repo = self._repo repo = self._repo
if isinstance(repo, bundlerepo.bundlerepository): if isinstance(repo, bundlerepo.bundlerepository):
# If the bundle contains filelogs, we can't pull from it, since # If the bundle contains filelogs, we can't pull from it, since
# bundlerepo is heavily tied to revlogs. Instead require that # bundlerepo is heavily tied to revlogs. Instead require that
# the user use unbundle instead. # the user use unbundle instead.
# Force load the filelog data. # Force load the filelog data.
bundlerepo.bundlerepository.file(repo, 'foo') bundlerepo.bundlerepository.file(repo, 'foo')
if repo._cgfilespos: if repo._cgfilespos:
raise error.Abort("cannot pull from full bundles", raise error.Abort("cannot pull from full bundles",
hint="use `hg unbundle` instead") hint="use `hg unbundle` instead")
return [] return []
filestosend = self.shouldaddfilegroups(source) filestosend = self.shouldaddfilegroups(source)
if filestosend == NoFiles: if filestosend == NoFiles:
changedfiles = list([f for f in changedfiles changedfiles = list([f for f in changedfiles
if not repo.shallowmatch(f)]) if not repo.shallowmatch(f)])
else: else:
def linknodes(store, fname):
quarkUnsubmitted
Not Done

Need removal.

quark: Need removal.
durin42AuthorUnsubmitted
Not Done

My debugging secrets revealed!

durin42: My debugging secrets revealed!
# TODO(augie): this logic is almost certainly
# incorrect in some subtle way. See the
# similarly-named closure in
# mercurial.changegroup.cgpacker.generatefiles.
return {}
quarkUnsubmitted
Not Done

I think most of the remaining code is not prepared for an empty linknode (including storage). Maybe special case it so it can be stored as nullid and change remotefilectx.py to ignore nullid linknodes.

quark: I think most of the remaining code is not prepared for an empty linknode (including storage).
durin42AuthorUnsubmitted
Not Done

I'm not following - this seems to work and pass tests. I'm not sure how I could fill in the linknodes for a given file log, because remotefilelog has no way of iterating file revisions. Does that impasse make sense?

(Happy to discuss on IRC if you like.)

durin42: I'm not following - this seems to work and pass tests. I'm not sure how I could fill in the…
files = [] files = []
# Prefetch the revisions being bundled # Prefetch the revisions being bundled
for i, fname in enumerate(sorted(changedfiles)): for i, fname in enumerate(sorted(changedfiles)):
filerevlog = repo.file(fname) filerevlog = repo.file(fname)
linkrevnodes = linknodes(filerevlog, fname) linkrevnodes = linknodes(filerevlog, fname)
# Normally we'd prune the linkrevnodes first, # Normally we'd prune the linkrevnodes first,
# but that would perform the server fetches one by one. # but that would perform the server fetches one by one.
for fnode, cnode in list(linkrevnodes.iteritems()): for fnode, cnode in list(linkrevnodes.iteritems()):
filerevlog = repo.file(fname) filerevlog = repo.file(fname)
ancestormap = filerevlog.ancestormap(fnode) ancestormap = filerevlog.ancestormap(fnode)
p1, p2, linknode, copyfrom = ancestormap[fnode] p1, p2, linknode, copyfrom = ancestormap[fnode]
if p1 != nullid: if p1 != nullid:
prevfiles.append((copyfrom or fname, hex(p1))) prevfiles.append((copyfrom or fname, hex(p1)))
repo.fileservice.prefetch(prevfiles) repo.fileservice.prefetch(prevfiles)
return super(shallowcg1packer, self).generatefiles(changedfiles, return super(shallowcg1packer, self).generatefiles(
linknodes, commonrevs, source) changedfiles, *args)
def shouldaddfilegroups(self, source): def shouldaddfilegroups(self, source):
repo = self._repo repo = self._repo
if not requirement in repo.requirements: if not requirement in repo.requirements:
return AllFiles return AllFiles
if source == "push" or source == "bundle": if source == "push" or source == "bundle":
return AllFiles return AllFiles
flags = revlog.flags(node) flags = revlog.flags(node)
meta = self.builddeltaheader(node, p1, p2, prevnode, linknode, flags) meta = self.builddeltaheader(node, p1, p2, prevnode, linknode, flags)
meta += prefix meta += prefix
l = len(meta) + len(delta) l = len(meta) + len(delta)
yield changegroup.chunkheader(l) yield changegroup.chunkheader(l)
yield meta yield meta
yield delta yield delta
if util.safehasattr(changegroup, 'cg1packer'):
shallowutil.interposeclass(changegroup, cgpacker.__name__)(shallowcg1packer)
if util.safehasattr(changegroup, 'cg2packer'): if util.safehasattr(changegroup, 'cg2packer'):
# Mercurial >= 3.3 # Mercurial >= 3.3
cg2packer = changegroup.cg2packer cg2packer = changegroup.cg2packer
elif util.safehasattr(changegroup, 'cgpacker'): elif util.safehasattr(changegroup, 'cgpacker'):
# Since Mercurial 4c99c6d1ef95 # Since Mercurial 4c99c6d1ef95
cg2packer = changegroup.cgpacker cg2packer = changegroup.cgpacker
if cg2packer: if cg2packer:

tests/test-remotefilelog-bundles.t

2 changesets found 2 changesets found
$ hg strip -r 66ee28d0328c $ hg strip -r 66ee28d0328c
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)
$ hg unbundle ../fullbundle.hg $ hg unbundle ../fullbundle.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 1 files added 2 changesets with 2 changes to 1 files
new changesets 66ee28d0328c:16db62c5946f new changesets 66ee28d0328c:16db62c5946f (2 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
Pulling from a shallow bundle Pulling from a shallow bundle
$ hg strip -r 66ee28d0328c $ hg strip -r 66ee28d0328c
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg (glob)
$ hg pull -r 66ee28d0328c .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg $ hg pull -r 66ee28d0328c .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg
pulling from .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg pulling from .hg/strip-backup/66ee28d0328c-3d7aafd1-backup.hg
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets 66ee28d0328c new changesets 66ee28d0328c (1 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
Pulling from a full bundle Pulling from a full bundle
$ hg strip -r 66ee28d0328c $ hg strip -r 66ee28d0328c
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-b6ee89e7-backup.hg (glob) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/66ee28d0328c-b6ee89e7-backup.hg (glob)
$ hg pull -r 66ee28d0328c ../fullbundle.hg $ hg pull -r 66ee28d0328c ../fullbundle.hg
pulling from ../fullbundle.hg pulling from ../fullbundle.hg
searching for changes searching for changes
abort: cannot pull from full bundles abort: cannot pull from full bundles
(use `hg unbundle` instead) (use `hg unbundle` instead)
[255] [255]

tests/test-remotefilelog-local.t

z z
$ hg debugrebuilddirstate # fixes dirstate non-determinism $ hg debugrebuilddirstate # fixes dirstate non-determinism
$ hg unbundle .hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg $ hg unbundle .hg/strip-backup/19edf50f4de7-df3d0f74-backup.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets 19edf50f4de7 new changesets 19edf50f4de7 (1 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg up $ hg up
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over *s (glob) 4 files fetched over 1 fetches - (4 misses, 0.00% hit ratio) over *s (glob)
$ cat a $ cat a
a a
$ hgcloneshallow ssh://user@dummy/master shallow2 -q $ hgcloneshallow ssh://user@dummy/master shallow2 -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ cd shallow2 $ cd shallow2
$ hg unbundle ../local.bundle $ hg unbundle ../local.bundle
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 3 changes to 3 files added 1 changesets with 3 changes to 3 files
new changesets 19edf50f4de7 new changesets 19edf50f4de7 (1 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg log -r 2 --stat $ hg log -r 2 --stat
changeset: 2:19edf50f4de7 changeset: 2:19edf50f4de7
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a

tests/test-remotefilelog-prefetch.t

# Revert across double renames. Note: the scary "abort", error is because # Revert across double renames. Note: the scary "abort", error is because
# https://bz.mercurial-scm.org/5419 . # https://bz.mercurial-scm.org/5419 .
$ clearcache $ clearcache
$ hg mv y y2 $ hg mv y y2
$ hg mv x x2 $ hg mv x x2
$ hg mv z2 z3 $ hg mv z2 z3
$ hg revert -a -r 1 || true $ hg revert -a -r 1 || true
undeleting x
forgetting x2 forgetting x2
undeleting y
forgetting y2 forgetting y2
adding z
forgetting z3 forgetting z3
adding z
undeleting x
undeleting y
3 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob) 3 files fetched over 1 fetches - (0 misses, 100.00% hit ratio) over * (glob)
abort: z2@109c3a557a73: not found in manifest! (?) abort: z2@109c3a557a73: not found in manifest! (?)

tests/test-remotefilelog-push-pull.t

$ cd ../shallow2 $ cd ../shallow2
$ clearcache $ clearcache
$ hg pull ../shallow $ hg pull ../shallow
pulling from ../shallow pulling from ../shallow
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 3 changes to 3 files added 3 changesets with 4 changes to 3 files
new changesets d34c38483be9:d7373980d475 new changesets d34c38483be9:d7373980d475 (2 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 2 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
# pull from shallow to shallow (ssh) # pull from shallow to shallow (ssh)
$ hg strip -r 1 $ hg strip -r 1
saved backup bundle to $TESTTMP/shallow2/.hg/strip-backup/d34c38483be9-89d325c9-backup.hg (glob) saved backup bundle to $TESTTMP/shallow2/.hg/strip-backup/d34c38483be9-89d325c9-backup.hg (glob)
$ hg pull ssh://user@dummy/$TESTTMP/shallow --config remotefilelog.cachepath=${CACHEDIR}2 $ hg pull ssh://user@dummy/$TESTTMP/shallow --config remotefilelog.cachepath=${CACHEDIR}2
pulling from ssh://user@dummy/$TESTTMP/shallow pulling from ssh://user@dummy/$TESTTMP/shallow
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 3 changes to 3 files added 3 changesets with 4 changes to 3 files
new changesets d34c38483be9:d7373980d475 new changesets d34c38483be9:d7373980d475 (2 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ hg up $ hg up
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat z $ cat z
z z
$ hg -R ../shallow strip -qr 3 $ hg -R ../shallow strip -qr 3
$ cd ../shallow2 $ cd ../shallow2
$ hg pull ../shallow $ hg pull ../shallow
pulling from ../shallow pulling from ../shallow
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
new changesets 3a2e32c04641:cedeb4167c1f new changesets 3a2e32c04641:cedeb4167c1f (1 drafts)
2 local changesets published (?) 2 local changesets published (?)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ cd .. $ cd ..
# Test pushing from shallow to shallow with multiple manifests introducing the # Test pushing from shallow to shallow with multiple manifests introducing the
# same filenode. Test this by constructing two separate histories of file 'c' # same filenode. Test this by constructing two separate histories of file 'c'
# that share a file node and verifying that the history works after pushing. # that share a file node and verifying that the history works after pushing.
pulling from ssh://user@dummy/$TESTTMP/multimf-shallow pulling from ssh://user@dummy/$TESTTMP/multimf-shallow
searching for changes searching for changes
warning: repository is unrelated warning: repository is unrelated
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 5 changesets with 4 changes to 3 files (+2 heads) added 5 changesets with 4 changes to 3 files (+2 heads)
new changesets cb9a9f314b8b:d8f06a4c6d38 new changesets cb9a9f314b8b:d8f06a4c6d38 (5 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 5 $ hg up -q 5
$ hg log -f -T '{rev}\n' c $ hg log -f -T '{rev}\n' c
5 5
4 4