facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
50ed524e78
sapling/eden/scm/tests/test-fb-convert-repo.py

523 lines
18 KiB
Python
Raw Normal View History

Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
import os
import unittest
Repo converter: New class "repomanifest" Summary: Right now, all of our manifest parsing and evaluation is in the repo() class, but this is a design mistake. Over a repo's convert lifetime, a single repo will have many different manifests, based on branch, and location in the commit history. What's worse is that the current design makes it hard to build unit tests and new features like include evaluation. This commit creates a whole new class called repomanifest, that represents a specific manifest (and its included files). It also has unit tests to test the various operations that the manifest performs, such as path and revision mapping. This commit does not modify the existing converter code outside of the class to use this new implementation. Reviewed By: tchebb Differential Revision: D19402995 fbshipit-source-id: b97dadcc595c6332f4495460618317194873a780
2020-02-27 04:22:56 +03:00
from edenscm.hgext.convert.repo import conversionrevision, gitutil, repo, repomanifest
py3: make .py tests continue to run on python 2 Summary: Use sed to convert testutil.ddot requires to hghave. ignore-conflict-markers for test-simplemerge.py Reviewed By: simpkins Differential Revision: D19658355 fbshipit-source-id: afae73eb1e43ead79514dfaf9f911f51ac25972e
2020-01-31 11:16:29 +03:00
from hghave import require
mark all tests requiring Python 2 Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
2020-01-31 05:40:49 +03:00
Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
def draft(test_func):
if os.environ["USER"] not in ("mdevine", "tch"):
def skip_func(self):
return unittest.skip("Skipping draft test %s" % test_func.__name__)
return skip_func
return test_func
class gitutiltest(unittest.TestCase):
"""Unit tests for the gitutil helper class of the repo converter"""
Implement file mode logic for repo converter Summary: Up until now, we haven't been setting file modes for the files we're putting into hg. This seems like it might be related to some of the problems we're seeing in changes relating to symlinks. This commit adds mode tracking to try to fix that. It also adds unit tests to test the underlying mode conversion functions in gitutil to check our logic. Reviewed By: tchebb Differential Revision: D18409701 fbshipit-source-id: c5c3a90e12bd7115e24024a912f175484efe8a90
2019-11-14 00:17:43 +03:00
def test_getfilemodestr(self):
mode = gitutil.getfilemodestr(int("000644", 8))
self.assertEqual("", mode)
mode = gitutil.getfilemodestr(int("100755", 8))
self.assertEqual("x", mode)
mode = gitutil.getfilemodestr(int("120000", 8))
self.assertEqual("l", mode)
Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
def test_parsedifftree_readable(self):
difftree_string = """1fd915b9c1fcf3803383432ede29fc4d686fdb44
:100644 100644 b02a70992e734985768e839281932c315fafb21d a268f9d1a620a9f438d014376f72bcf413eea6d8 M\tlibc/arch-arm/bionic/__bionic_clone.S
:100644 100644 56ac0f69d450d218174226e1d61863a1ce5d4f27 27e44e7f7598ee1d2ca13df305f269d8ce303bfb M\tlibc/arch-arm64/bionic/__bionic_clone.S
1fd915b9c1fcf3803383432ede29fc4d686fdb44
:100644 100644 6439e31ce8bd4e4f1e290c3d8607cb7694a52b31 a8da3ac753c77d4a26f95bffcca546cc8cfb4f77 M\tlibc/dns/resolv/res_send.c
"""
out = gitutil.parsedifftree(difftree_string)
expected = [
[
{
"source": {
"mode": 0o100644,
"hash": "b02a70992e734985768e839281932c315fafb21d",
"path": "libc/arch-arm/bionic/__bionic_clone.S",
},
"dest": {
"mode": 0o100644,
"hash": "a268f9d1a620a9f438d014376f72bcf413eea6d8",
"path": "libc/arch-arm/bionic/__bionic_clone.S",
},
"status": "M",
"score": None,
},
{
"source": {
"mode": 0o100644,
"hash": "56ac0f69d450d218174226e1d61863a1ce5d4f27",
"path": "libc/arch-arm64/bionic/__bionic_clone.S",
},
"dest": {
"mode": 0o100644,
"hash": "27e44e7f7598ee1d2ca13df305f269d8ce303bfb",
"path": "libc/arch-arm64/bionic/__bionic_clone.S",
},
"status": "M",
"score": None,
},
],
[
{
"source": {
"mode": 0o100644,
"hash": "6439e31ce8bd4e4f1e290c3d8607cb7694a52b31",
"path": "libc/dns/resolv/res_send.c",
},
"dest": {
"mode": 0o100644,
"hash": "a8da3ac753c77d4a26f95bffcca546cc8cfb4f77",
"path": "libc/dns/resolv/res_send.c",
},
"status": "M",
"score": None,
}
],
]
self.assertEqual(out, expected)
def test_parsedifftree_compact(self):
difftree_string = """1fd915b9c1fcf3803383432ede29fc4d686fdb44\x00:100644 100644 b02a70992e734985768e839281932c315fafb21d a268f9d1a620a9f438d014376f72bcf413eea6d8 M\x00libc/arch-arm/bionic/__bionic_clone.S\x00:100644 100644 56ac0f69d450d218174226e1d61863a1ce5d4f27 27e44e7f7598ee1d2ca13df305f269d8ce303bfb M\x00libc/arch-arm64/bionic/__bionic_clone.S\x001fd915b9c1fcf3803383432ede29fc4d686fdb44\x00:100644 100644 6439e31ce8bd4e4f1e290c3d8607cb7694a52b31 a8da3ac753c77d4a26f95bffcca546cc8cfb4f77 M\x00libc/dns/resolv/res_send.c\x00"""
out = gitutil.parsedifftree(difftree_string)
expected = [
[ # Parent 1
{ # File 1
"source": {
"mode": 0o100644,
"hash": "b02a70992e734985768e839281932c315fafb21d",
"path": "libc/arch-arm/bionic/__bionic_clone.S",
},
"dest": {
"mode": 0o100644,
"hash": "a268f9d1a620a9f438d014376f72bcf413eea6d8",
"path": "libc/arch-arm/bionic/__bionic_clone.S",
},
"status": "M",
"score": None,
},
{ # File 2
"source": {
"mode": 0o100644,
"hash": "56ac0f69d450d218174226e1d61863a1ce5d4f27",
"path": "libc/arch-arm64/bionic/__bionic_clone.S",
},
"dest": {
"mode": 0o100644,
"hash": "27e44e7f7598ee1d2ca13df305f269d8ce303bfb",
"path": "libc/arch-arm64/bionic/__bionic_clone.S",
},
"status": "M",
"score": None,
},
],
[ # Parent 2
{ # File 1
"source": {
"mode": 0o100644,
"hash": "6439e31ce8bd4e4f1e290c3d8607cb7694a52b31",
"path": "libc/dns/resolv/res_send.c",
},
"dest": {
"mode": 0o100644,
"hash": "a8da3ac753c77d4a26f95bffcca546cc8cfb4f77",
"path": "libc/dns/resolv/res_send.c",
},
"status": "M",
"score": None,
}
],
]
self.assertEqual(out, expected)
def test_parsegitcommitraw(self):
commit_hash = "6c6677a7b5cf683a1883bc5e4ad47cad0a496904"
convert: fix test which uses gitutil.parsegitcommitraw Summary: D18140370 changed the signature of `gitutil.parsegitcommitraw`, which breaks `test-fb-convert-repo.py` as it was using it. The signature change meant the function now expects a source repo as an argument. This is a problem for the test, as it doesn't have one to hand. It's also arguably overkill, as it adds a new dependency for this function, where really it just wants a function to perform recoding with. Change the function to expect a `recode` function (for which we can use `source.recode`), so we can still allow the test to directly test the function. Reviewed By: quark-zju Differential Revision: D18247041 fbshipit-source-id: 4537d631af28862d183a604325732cc50af0829b
2019-10-31 20:40:02 +03:00
commit_string = u"""tree e2acedaa094c4b5f0606e2a5ff58c3648555cfd4
Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
parent c6c89b3401f3f6690e2307de7e2d079894c8147a
parent 2051d0428d045796ded3764c4188249669d1fcf3
author Linux Build Service Account <lnxbuild@localhost> 1521780995 -0700
committer Linux Build Service Account <lnxbuild@localhost> 1521780995 -0700
Merge AU_LINUX_ANDROID_LA.BR.1.3.7_RB1.08.01.00.336.038 on remote branch
Change-Id: Ie8ded3a8316b465c89a256c1a9146345614ed68f"""
out = gitutil.parsegitcommitraw(commit_hash, commit_string)
self.assertEqual(out.rev, "6c6677a7b5cf683a1883bc5e4ad47cad0a496904")
Add test for commit parent extraction Summary: Make sure our `git cat-file` output parsing gets the list of parents correctly. Also get rid of an empty expected output file for our test, since empty output is implied if no file exists. Reviewed By: mwdevine Differential Revision: D18002081 fbshipit-source-id: da4f7a5eecc876bc180c64c06d4eb98b1178f8ee
2019-10-21 22:48:30 +03:00
self.assertSequenceEqual(
out.parents,
[
"c6c89b3401f3f6690e2307de7e2d079894c8147a",
"2051d0428d045796ded3764c4188249669d1fcf3",
],
)
Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
self.assertEqual(
out.desc,
"""Merge AU_LINUX_ANDROID_LA.BR.1.3.7_RB1.08.01.00.336.038 on remote branch
Change-Id: Ie8ded3a8316b465c89a256c1a9146345614ed68f""",
)
Optimize memory usage of rev-list parser Summary: The existing logic for parsing rev-list data relies very heavily on split, which creates many intermediate strings that take up a lot of memory. This commit updates the logic to use indices into the original output to extract individual strings. It also includes a new unit test for the list parsing. Big thanks to Tom Hebb for identifying the excessive memory usage. Reviewed By: tchebb Differential Revision: D18513949 fbshipit-source-id: c3b4e420ae2635904b42b84f2973e83c81c21dd7
2019-11-15 21:36:00 +03:00
class repotest(unittest.TestCase):
"""Tests implementation of the repo command"""
def test_forallbyproject(self):
foralloutput = """project A/
123
456
789
0
project B/
Humpty Dumpty
sat on the wall
Humpty Dumpty
had a great fall
"""
out = repo._splitlinesbyproject(foralloutput)
self.assertSequenceEqual(out["A/"], ["123", "456", "789", "0"])
self.assertSequenceEqual(
out["B/"],
["Humpty Dumpty", "sat on the wall", "Humpty Dumpty", "had a great fall"],
)
New custom immutable revision object to track commit conversions: conversionrevision Summary: The Mercurial convert extension passes around parameters to indicate a commit that needs to be converted from source to sink. For existing converters like Git, this is a simple 1:1 conversion: a commit in the source gets mapped to a commit in the sink, and so they use the source commit hash (sometimes called rev or version in the API) to represent the commit to be converted. Our converter is much more complicated. Source commits get converted multiple times to account for different ways of mounting it into the destination file system and commit history. The commits are also coming from multiple source Git projects. This means that we need multiple pieces of data to represent a single commit conversion action. Thus far, we've been trying to meet part of this need by using concatenated strings of (variant, commithash). This logic is breaking down as we add more fields. This commit adds a new immutable object called "conversionrevision" that represents the (variant, source commit hash, source project name, destination path) that is the unique identifier for the individual commit conversions we need to perform. This commit also includes logic for serializing and deserializing these objects as strings (useful because the converter seems to require commit IDs to be strings) and unit tests for all of the new logic. Reviewed By: tchebb Differential Revision: D19606867 fbshipit-source-id: 77815ca858f841d452874e95dfa3b351bafde306
2020-02-05 21:18:40 +03:00
class conversionrevisiontest(unittest.TestCase):
"""Tests implementation of the conversionrevision class"""
def test_init(self):
# type: () -> None
_ = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertTrue(True)
def test_variant(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_ROOTED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertEqual(rev.variant, conversionrevision.VARIANT_ROOTED)
def test_sourcehash(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertEqual(rev.sourcehash, "1234567890123456789012345678901234567890")
def test_sourceproject(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertEqual(rev.sourceproject, "aosp/bzip2")
def test_destpath(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertEqual(rev.destpath, "external/bzip2")
def test_parse(self):
# type: () -> None
revstring = "R1234567890123456789012345678901234567890foo/bar/baz:external/baz"
rev = conversionrevision.parse(revstring)
self.assertEqual(rev.variant, conversionrevision.VARIANT_ROOTED)
self.assertEqual(rev.sourcehash, "1234567890123456789012345678901234567890")
self.assertEqual(rev.sourceproject, "foo/bar/baz")
self.assertEqual(rev.destpath, "external/baz")
def test_str(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
revstring = "U1234567890123456789012345678901234567890aosp/bzip2:external/bzip2"
self.assertEqual(str(rev), revstring)
def test_equals(self):
# type: () -> None
rev1 = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
rev2 = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
rev3 = conversionrevision(
conversionrevision.VARIANT_ROOTED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
self.assertTrue(rev1 == rev2)
self.assertFalse(rev1 == rev3)
self.assertFalse(rev1 == conversionrevision.NONE)
def test_hash(self):
# type: () -> None
rev = conversionrevision(
conversionrevision.VARIANT_UNIFIED,
"1234567890123456789012345678901234567890",
"aosp/bzip2",
"external/bzip2",
)
out = hash(rev)
self.assertIsNotNone(out)
self.assertIsInstance(hash(rev), int)
Repo converter: New class "repomanifest" Summary: Right now, all of our manifest parsing and evaluation is in the repo() class, but this is a design mistake. Over a repo's convert lifetime, a single repo will have many different manifests, based on branch, and location in the commit history. What's worse is that the current design makes it hard to build unit tests and new features like include evaluation. This commit creates a whole new class called repomanifest, that represents a specific manifest (and its included files). It also has unit tests to test the various operations that the manifest performs, such as path and revision mapping. This commit does not modify the existing converter code outside of the class to use this new implementation. Reviewed By: tchebb Differential Revision: D19402995 fbshipit-source-id: b97dadcc595c6332f4495460618317194873a780
2020-02-27 04:22:56 +03:00
class repomanifesttest(unittest.TestCase):
"""Tests implementation of the repomanifest class"""
def test_fromtext(self):
manifestblobs = {
"default.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b">
<linkfile dest=".watchmanconfig" src="watchmanconfig"/>
<annotation name="not_old" value="37"/>
</project>
</manifest>
"""
}
manifest = repomanifest.fromtext("default.xml", manifestblobs)
self.assertIsNotNone(manifest)
def test_getprojectrevision(self):
manifestblobs = {
"manifest.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b" revision="aosp-tb12">
<linkfile dest=".watchmanconfig" src="watchmanconfig"/>
<annotation name="not_old" value="37"/>
</project>
</manifest>
"""
}
manifest = repomanifest.fromtext("manifest.xml", manifestblobs)
self.assertEqual(
manifest.getprojectrevision("foo/alpha"), "origin/mydefaultbranch"
)
self.assertEqual(
manifest.getprojectrevision("oculus/foo/bravo"), "origin/aosp-tb12"
)
def test_getprojectpaths(self):
manifestblobs = {
"blob1": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b/monterey" revision="monterey" />
<project name="oculus/foo/bravo" path="vendor/b/pacific" revision="pacific" />
</manifest>
"""
}
manifest = repomanifest.fromtext("blob1", manifestblobs)
self.assertEqual(manifest.getprojectpaths("foo/alpha"), ["A"])
self.assertEqual(
manifest.getprojectpaths("oculus/foo/bravo"),
["vendor/b/monterey", "vendor/b/pacific"],
)
def test_getprojectpathrevisions(self):
manifestblobs = {
"default.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<remote name="myremote"/>
<default
remote="myremote"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A" remote="origin"/>
<project name="oculus/foo/bravo" path="vendor/b/monterey" revision="monterey" />
<project name="oculus/foo/bravo" path="vendor/b/pacific" revision="pacific" />
</manifest>
"""
}
manifest = repomanifest.fromtext("default.xml", manifestblobs)
self.assertEqual(
manifest.getprojectpathrevisions("foo/alpha"),
{"A": "origin/mydefaultbranch"},
)
self.assertEqual(
manifest.getprojectpathrevisions("oculus/foo/bravo"),
{
"vendor/b/monterey": "myremote/monterey",
"vendor/b/pacific": "myremote/pacific",
},
)
def test_getprojects(self):
manifestblobs = {
"default.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b/monterey" revision="monterey" />
<project name="oculus/foo/bravo" path="vendor/b/pacific" revision="pacific" />
</manifest>
"""
}
manifest = repomanifest.fromtext("default.xml", manifestblobs)
expected = [
("foo/alpha", "A", "origin/mydefaultbranch"),
("oculus/foo/bravo", "vendor/b/monterey", "origin/monterey"),
("oculus/foo/bravo", "vendor/b/pacific", "origin/pacific"),
]
self.assertEqual(manifest.getprojects(), expected)
def test_getprojects_hashes(self):
manifestblobs = {
"default.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b/monterey" revision="monterey" />
<project name="oculus/foo/bravo" path="vendor/b/pacific" revision="5fa2a4dbfb5616ffd2d32702f6f97be331e665a6" />
</manifest>
"""
}
manifest = repomanifest.fromtext("default.xml", manifestblobs)
expected = [
("foo/alpha", "A", "origin/mydefaultbranch"),
("oculus/foo/bravo", "vendor/b/monterey", "origin/monterey"),
(
"oculus/foo/bravo",
"vendor/b/pacific",
"5fa2a4dbfb5616ffd2d32702f6f97be331e665a6",
),
]
self.assertEqual(manifest.getprojects(), expected)
def test_include(self):
manifestblobs = {
"default.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
name="origin"
fetch="ssh://git-ro.vip.facebook.com/data/gitrepos"
push="ssh://git.vip.facebook.com/data/gitrepos"
pushurl="ssh://git.vip.facebook.com/data/gitrepos"/>
<default
remote="origin"
revision="mydefaultbranch"/>
<include name="include-example.xml"/>
<project name="foo/alpha" path="A"/>
<project name="oculus/foo/bravo" path="vendor/b/monterey" revision="monterey" />
<project name="oculus/foo/bravo" path="vendor/b/pacific" revision="pacific" />
</manifest>
""",
"include-example.xml": """<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<project name="include-c" path="include/c" />
</manifest>
""",
}
manifest = repomanifest.fromtext("default.xml", manifestblobs)
self.assertTrue(manifest.hasproject("include-c"))
self.assertEqual(manifest.getprojectpaths("include-c"), ["include/c"])
self.assertEqual(
manifest.getprojectrevision("include-c"), "origin/mydefaultbranch"
)
Prototype: repo-hg converter plugin Summary: AR/VR Engineering does AOSP development using Git and Google Repo. This is rough at times because FB Dev Infra doesn't support these tools in a lot of critical use cases. This commit contains a very rough prototype of a hg convert extension to support Google Repo as a source. What this commit does: 1. Finds all of the heads in all of the git projects in the Grepo and imports their commit histories into mercurial. 2. Merges those commits into a single commit history that represents the default manifest in the current branch. What this commit doesn't do: 1. Explore the space of all manifests that have ever existed in the manifest project and update directory branches based on those. Reviewed By: tchebb Differential Revision: D14944252 fbshipit-source-id: b292025ccac06d02b347e35839215eedfd151a5d
2019-09-25 00:36:40 +03:00
if __name__ == "__main__":
import silenttestrunner
silenttestrunner.main(__name__)
Reference in New Issue Copy Permalink