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

debugbundle: show commits in b2x:rebase parts

Browse Source 
Summary:
The `b2x:rebase` part is just like a changegroup, but it has a different name, and that results in `debugbundle` not telling us what the contents are.

This updates `debugbundle` to the contents of `b2x:rebase` parts.

Reviewed By: farnz

Differential Revision: D15822108

fbshipit-source-id: 60c28e4d965dabb7a889a14c179c1b69d0c5196e
This commit is contained in:
Thomas Orozco 2019-06-17 01:22:54 -07:00 committed by Facebook Github Bot
parent 458cf27e86
commit 520d6f2944
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edenscm/mercurial/commands/debug.py
View File

@ -364,7 +364,7 @@ def _debugbundle2(ui, gen, all=None, **opts):
if parttypes and part.type not in parttypes:
continue
ui.write("%s -- %s\n" % (part.type, _quasirepr(part.params)))
if part.type == "changegroup":
if part.type == "changegroup" or part.type == "b2x:rebase":
version = part.params.get("version", "01")
cg = changegroup.getunbundler(version, part, "UN")
_debugchangegroup(ui, cg, all=all, indent=4, **opts)

BIN
tests/bundles/bx2rebase.hg Normal file
View File

Binary file not shown.

40
tests/test-debugbundle-rebase.t Normal file
View File

@ -0,0 +1,40 @@
Terse output:
$ hg debugbundle "$TESTDIR/bundles/bx2rebase.hg"
Stream params: {preloadmanifests: 58035ddbe291fb4575460ad41f75f34494c48649}
replycaps -- {}
b2x:commonheads -- {}
b2x:rebasepackpart -- {cache: False, category: manifests, version: 1}
b2x:rebase -- {cgversion: 02, obsmarkerversions: 0\x001, onto: master} (esc)
e6fd2b5fc895fb648cad93b3507c3260a775a762
fb664400597ce0918c57f5e755eab6d4f2afa725
pushkey -- {key: fb664400597ce0918c57f5e755eab6d4f2afa725, namespace: phases, new: 0, old: 1}
pushkey -- {key: master, namespace: bookmarks, new: fb664400597ce0918c57f5e755eab6d4f2afa725, old: 4861b3248c40901dc09c91aae80750c2b802aa7e}
Verbose output:
$ hg debugbundle --all "$TESTDIR/bundles/bx2rebase.hg"
Stream params: {preloadmanifests: 58035ddbe291fb4575460ad41f75f34494c48649}
replycaps -- {}
b2x:commonheads -- {}
b2x:rebasepackpart -- {cache: False, category: manifests, version: 1}
b2x:rebase -- {cgversion: 02, obsmarkerversions: 0\x001, onto: master} (esc)
format: id, p1, p2, cset, delta base, len(delta)
changelog
e6fd2b5fc895fb648cad93b3507c3260a775a762 69ad5a6495bf24f9afd13a7a3ca19074f5d222ca 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 69ad5a6495bf24f9afd13a7a3ca19074f5d222ca 139
fb664400597ce0918c57f5e755eab6d4f2afa725 e6fd2b5fc895fb648cad93b3507c3260a775a762 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 e6fd2b5fc895fb648cad93b3507c3260a775a762 149
manifest
thomas-test/5.rst
b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 20
thomas-test/6.rst
b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 20
pushkey -- {key: fb664400597ce0918c57f5e755eab6d4f2afa725, namespace: phases, new: 0, old: 1}
pushkey -- {key: master, namespace: bookmarks, new: fb664400597ce0918c57f5e755eab6d4f2afa725, old: 4861b3248c40901dc09c91aae80750c2b802aa7e}