This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1268

treemanifest: test for pulling normal scratch branch into treeonly repo
ClosedPublic

Authored by durham on Oct 30 2017, 11:29 AM.
Tags
None
Subscribers
None

Details

Reviewers
phillco
Group Reviewers
Restricted Project
Commits
rFBHGXaf05cfaaf944: treemanifest: test for pulling normal scratch branch into treeonly repo
Summary

Adds a test and improves output for pulling a normal scratch branch into
a treeonly repo (so the manifest doesn't exist).

In the future we could fix this by having the server generate the trees on the
fly for infinitepush branches that don't already have them.

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

durham created this revision.Oct 30 2017, 11:29 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 30 2017, 11:29 AM
durham edited the summary of this revision. (Show Details)Oct 30 2017, 11:38 AM
durham added inline comments.
treemanifest/__init__.py
684

This was straight up broken before, and apparently untested. It's tested now.

phillco accepted this revision.Nov 1 2017, 7:08 PM
This revision is now accepted and ready to land.Nov 1 2017, 7:08 PM
Closed by commit rFBHGXaf05cfaaf944: treemanifest: test for pulling normal scratch branch into treeonly repo (authored by durham). · Explain WhyNov 2 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3223

tests/test-treemanifest-infinitepush.t

drwxr-xr-x data drwxr-xr-x data
drwxrwxr-x packs drwxrwxr-x packs
-rw-r--r-- 43 phaseroots -rw-r--r-- 43 phaseroots
-rw-r--r-- 18 undo -rw-r--r-- 18 undo
-rw-r--r-- 17 undo.backupfiles -rw-r--r-- 17 undo.backupfiles
-rw-r--r-- 0 undo.phaseroots -rw-r--r-- 0 undo.phaseroots
Pull a normal scratch branch into a treeonly client Pull a normal scratch branch into a treeonly client
$ hg pull -r scratch/nontree
pulling from ssh://user@dummy/master
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 42ec76eb772a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -r 42ec76eb772a -T ' ' --stat
abort: unable to download the following trees from the server:
bf0601d5cb94247e00d0bdd1d8327f0dd36f54e9
[255]
$ cd .. $ cd ..
Verify its not on the server Verify its not on the server
$ cd master $ cd master
$ hg log -G $ hg log -G
@ changeset: 0:085784c01c08 @ changeset: 0:085784c01c08
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: add x summary: add x

treemanifest/__init__.py

return orig(self, repo, *args, **kwargs) return orig(self, repo, *args, **kwargs)
def _unpackmanifestscg1(orig, self, repo, *args, **kwargs): def _unpackmanifestscg1(orig, self, repo, *args, **kwargs):
if not treeenabled(repo.ui): if not treeenabled(repo.ui):
return orig(self, repo, *args, **kwargs) return orig(self, repo, *args, **kwargs)
if repo.ui.configbool('treemanifest', 'treeonly'): if repo.ui.configbool('treemanifest', 'treeonly'):
self.manifestheader() self.manifestheader()
chain = None for chunkdata in self.deltaiter():
for chunkdata in iter(lambda: self.deltachunk(chain), {}): pass
chain = chunkdata['node']
durhamAuthorUnsubmitted
Not Done

This was straight up broken before, and apparently untested. It's tested now.

durham: This was straight up broken before, and apparently untested. It's tested now.
return return
mfrevlog = repo.manifestlog._revlog mfrevlog = repo.manifestlog._revlog
oldtip = len(mfrevlog) oldtip = len(mfrevlog)
orig(self, repo, *args, **kwargs) orig(self, repo, *args, **kwargs)
if (util.safehasattr(repo.manifestlog, "datastore") and if (util.safehasattr(repo.manifestlog, "datastore") and
if op.repo.ui.configbool("remotefilelog", "debug"): if op.repo.ui.configbool("remotefilelog", "debug"):
op.repo.ui.warn(_("%s trees fetched over %0.2fs\n") % op.repo.ui.warn(_("%s trees fetched over %0.2fs\n") %
(count, time.time() - start)) (count, time.time() - start))
if missingnodes: if missingnodes:
raise error.Abort(_("unable to download %d trees (%s,...)") % raise error.Abort(_("unable to download %d trees (%s,...)") %
(len(missingnodes), list(missingnodes)[0])) (len(missingnodes), list(missingnodes)[0]))
except bundle2.AbortFromPart as exc: except bundle2.AbortFromPart as exc:
repo.ui.status(_('remote: abort: %s\n') % exc) repo.ui.debug('remote: abort: %s\n' % exc)
raise error.Abort(_('pull failed on remote'), hint=exc.hint) hexnodes = list(hex(mfnode) for mfnode in mfnodes)
nodestr = '\n'.join(hexnodes[:10])
if len(hexnodes) > 10:
nodestr += '\n...'
raise error.Abort(_('unable to download the following trees from the '
'server:\n%s') % nodestr, hint=exc.hint)
except error.BundleValueError as exc: except error.BundleValueError as exc:
raise error.Abort(_('missing support for %s') % exc) raise error.Abort(_('missing support for %s') % exc)
finally: finally:
# Manually destruct the peer, so we can collect any error output # Manually destruct the peer, so we can collect any error output
remote.ui.pushbuffer() remote.ui.pushbuffer()
remote._cleanup() remote._cleanup()
# Redirect cleanup output to the repo.ui so callers can buffer it if # Redirect cleanup output to the repo.ui so callers can buffer it if