facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-27 15:13:37 +03:00
Code Issues Projects Releases Wiki Activity
c7d12b648f
sapling/eden/scm/tests/test-hggit-keywords.t

61 lines
2.2 KiB
Perl
Raw Normal View History

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
#require py2
tests: extract extension configuration into a testutil library Thanks to Felipe Contreras for the patch which this was based on. Even though the MQ extension was only used in a single test (test-pull-after-strip.t), I included it in the testutil. It shouldn't hurt anything to have it enabled and not used, and saves us from having to deal with enabling extensions in individual tests at all. Similarly, this changeset results in the graphlog extension being enabled for all tests, even though there were some that didn't use it before. This is even less significant in Mercurial 2.3+, since in those versions, graphlog is part of core, and is available even when the extension is disabled.
2012-10-31 04:03:26 +04:00
Load commonly used test logic
hggit: internalize extension Test Plan: run-tests-.py Reviewers: mitrandir, #mercurial Reviewed By: mitrandir Subscribers: ps, terrelln Differential Revision: https://phabricator.intern.facebook.com/D6675896 Tasks: T24908724 Signature: 6675896:1515448382:df8d80cd7356ae8f5fb04586dc4a0a651bc498fd
2018-01-09 17:08:01 +03:00
$ . "$TESTDIR/hggit/testutil"
tests: extract extension configuration into a testutil library Thanks to Felipe Contreras for the patch which this was based on. Even though the MQ extension was only used in a single test (test-pull-after-strip.t), I included it in the testutil. It shouldn't hurt anything to have it enabled and not used, and saves us from having to deal with enabling extensions in individual tests at all. Similarly, this changeset results in the graphlog extension being enabled for all tests, even though there were some that didn't use it before. This is even less significant in Mercurial 2.3+, since in those versions, graphlog is part of core, and is available even when the extension is disabled.
2012-10-31 04:03:26 +04:00
tests: let git init create directories when applicable It's functionally equivalent to create a directory, cd into it, git init, and cd out of the directory, or simply git init with the directory specified. In several cases, we were doing the former without performing any other operations in the git repo, which just made the test unneccesarily complex. Even in the case where we still want to cd into the directory, calling git init with the directory name eliminates the need for a separate mkdir command. This changeset converts the former approach to the latter with the goal of increasing the readability of the tests. Thanks to Felipe Contreras for the patch which this was based on.
2012-10-31 08:01:03 +04:00
$ git init gitrepo
tests: remove piping of command git init to remove leading path In many cases we were piping to a python script to strip out the varying leading path to the test repos. This is no longer needed, as the modern run-test.py automatically substitutes the leading path as $TESTTMP. Eliminating the piping makes the tests easier to read and write, as well as allowing the exit codes to be verified by the test.
2012-09-14 04:49:42 +04:00
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
tests: let git init create directories when applicable It's functionally equivalent to create a directory, cd into it, git init, and cd out of the directory, or simply git init with the directory specified. In several cases, we were doing the former without performing any other operations in the git repo, which just made the test unneccesarily complex. Even in the case where we still want to cd into the directory, calling git init with the directory name eliminates the need for a separate mkdir command. This changeset converts the former approach to the latter with the goal of increasing the readability of the tests. Thanks to Felipe Contreras for the patch which this was based on.
2012-10-31 08:01:03 +04:00
$ cd gitrepo
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ echo alpha > alpha
$ git add alpha
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m 'add alpha'
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ echo beta > beta
$ git add beta
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m 'add beta'
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
revset_gitnode: allow abbreviated hashes The previous implementation only allowed passing 40-hexdigit hashes or 12-hexdigit abbreviations to `gitnode(hash)`. Shorter or longer hashes were accepted, but failed silently. With this fix, any unambiguous abbreviation is accepted. `gitnode(a5b)` selects the revision whose Git hash starts with `a5b`, if there is one, and aborts if there are several.
2016-10-06 11:11:14 +03:00
This commit is called gamma10 so that its hash will have the same initial digit
as commit alpha. This lets us test ambiguous abbreviated identifiers.
$ echo gamma10 > gamma10
$ git add gamma10
$ fn_git_commit -m 'add gamma10'
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ cd ..
$ hg clone gitrepo hgrepo | grep -v '^updating'
importing git objects into hg
revset_gitnode: allow abbreviated hashes The previous implementation only allowed passing 40-hexdigit hashes or 12-hexdigit abbreviations to `gitnode(hash)`. Shorter or longer hashes were accepted, but failed silently. With this fix, any unambiguous abbreviation is accepted. `gitnode(a5b)` selects the revision whose Git hash starts with `a5b`, if there is one, and aborts if there are several.
2016-10-06 11:11:14 +03:00
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ cd hgrepo
$ echo gamma > gamma
$ hg add gamma
$ hg commit -m 'add gamma'
translate from hg to git hash should use the extras Summary: Now that we are writing the git hash inside the commit itself, if we are translating from hg to git hash, we should just use that rather than loading the entire map and build a dict and look it up. The performance of this translation will also improve quite a lot. Some small sample benchmarking: ``` suiting@devvm5006:configerator (659199b|remote/master)$ time ~/fbcode/scm/hg/hg log -r master -T '{node} || {gitnode}\n' --config exte nsions.fbconduit=! --config extensions.hggit= 659199bf7c7850ea9ffa9e0ad50eb84597977dea || 69f05aeec13f09c44dd00d2a85fe9d461ba6841e real 0m0.563s user 0m0.004s sys 0m0.007s suiting@devvm5006:configerator (659199b|remote/master)$ time ~/fbcode/scm/hg/hg log -r master -T '{node} || {gitnode}\n' 659199bf7c7850ea9ffa9e0ad50eb84597977dea || 69f05aeec13f09c44dd00d2a85fe9d461ba6841e real 0m14.706s user 0m0.006s sys 0m0.006s ``` Reviewed By: quark-zju Differential Revision: D16833526 fbshipit-source-id: 7d3096649cf24967d13596e70463bc125081ba4f
2019-08-16 17:08:03 +03:00
Remove the mapfile so we can ensure the gitnode is from the extras not the mapfile.
$ mv .hg/git-mapfile .hg/git-mapfile-bak
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ hg log --template "{rev} {node} {node|short} {gitnode} {gitnode|short}\n"
hggit: store git hash in hg extras Summary: In order to move our hg-git mirroring off of the main hg servers, we need to make it possible for the hg servers to compute the hg-git mapping without having the entire git repository available. To do so, let's store the git hash as an extra in the hg commit. This breaks bidirectionality, but we've long since not needed that. Reviewed By: phillco Differential Revision: D13362980 fbshipit-source-id: 51df709bc5e77d78bb963abf90d0c35bb743d966
2018-12-06 23:00:57 +03:00
3 f5172ebb976873f9e41d2958e3b665a985128b00 f5172ebb9768
2 fedf4edd982fb98273f2255d6b97c892ec208427 fedf4edd982f 7e2a5465ff4e3b992c429bb87a392620a0ac97b7 7e2a5465ff4e
1 3bb02b6794ddc0b498cdc15f59f2e6724cabfa2f 3bb02b6794dd 9497a4ee62e16ee641860d7677cdb2589ea15554 9497a4ee62e1
0 69982ec78c6dd2f24b3b62f3e2baaa79ab48ed93 69982ec78c6d 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 7eeab2ea75ec
translate from hg to git hash should use the extras Summary: Now that we are writing the git hash inside the commit itself, if we are translating from hg to git hash, we should just use that rather than loading the entire map and build a dict and look it up. The performance of this translation will also improve quite a lot. Some small sample benchmarking: ``` suiting@devvm5006:configerator (659199b|remote/master)$ time ~/fbcode/scm/hg/hg log -r master -T '{node} || {gitnode}\n' --config exte nsions.fbconduit=! --config extensions.hggit= 659199bf7c7850ea9ffa9e0ad50eb84597977dea || 69f05aeec13f09c44dd00d2a85fe9d461ba6841e real 0m0.563s user 0m0.004s sys 0m0.007s suiting@devvm5006:configerator (659199b|remote/master)$ time ~/fbcode/scm/hg/hg log -r master -T '{node} || {gitnode}\n' 659199bf7c7850ea9ffa9e0ad50eb84597977dea || 69f05aeec13f09c44dd00d2a85fe9d461ba6841e real 0m14.706s user 0m0.006s sys 0m0.006s ``` Reviewed By: quark-zju Differential Revision: D16833526 fbshipit-source-id: 7d3096649cf24967d13596e70463bc125081ba4f
2019-08-16 17:08:03 +03:00
$ mv .hg/git-mapfile-bak .hg/git-mapfile
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ hg log --template "fromgit {rev}\n" --rev "fromgit()"
fromgit 0
fromgit 1
revset_gitnode: allow abbreviated hashes The previous implementation only allowed passing 40-hexdigit hashes or 12-hexdigit abbreviations to `gitnode(hash)`. Shorter or longer hashes were accepted, but failed silently. With this fix, any unambiguous abbreviation is accepted. `gitnode(a5b)` selects the revision whose Git hash starts with `a5b`, if there is one, and aborts if there are several.
2016-10-06 11:11:14 +03:00
fromgit 2
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ hg log --template "gitnode_existsA {rev}\n" --rev "gitnode(9497a4ee62e16ee641860d7677cdb2589ea15554)"
gitnode_existsA 1
revset_gitnode: allow abbreviated hashes The previous implementation only allowed passing 40-hexdigit hashes or 12-hexdigit abbreviations to `gitnode(hash)`. Shorter or longer hashes were accepted, but failed silently. With this fix, any unambiguous abbreviation is accepted. `gitnode(a5b)` selects the revision whose Git hash starts with `a5b`, if there is one, and aborts if there are several.
2016-10-06 11:11:14 +03:00
$ hg log --template "gitnode_existsB {rev}\n" --rev "gitnode(7eeab)"
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
gitnode_existsB 0
revset_gitnode: allow abbreviated hashes The previous implementation only allowed passing 40-hexdigit hashes or 12-hexdigit abbreviations to `gitnode(hash)`. Shorter or longer hashes were accepted, but failed silently. With this fix, any unambiguous abbreviation is accepted. `gitnode(a5b)` selects the revision whose Git hash starts with `a5b`, if there is one, and aborts if there are several.
2016-10-06 11:11:14 +03:00
$ hg log --rev "gitnode(7e)"
abort: git-mapfile@7e: ambiguous identifier!
[255]
tests: unify test-keywords
2012-09-10 08:25:59 +04:00
$ hg log --template "gitnode_notexists {rev}\n" --rev "gitnode(1234567890ab)"
gitnode: try using commit extra first Summary: There are 3 extensions that can provide the `{gitnode}` template: "gitrevset", "fbscmquery", "hggit". The last can read from commit extras. Fix the first two to also read commit extras. At some point we need to unify the implementations. Reviewed By: farnz Differential Revision: D19198979 fbshipit-source-id: 24a0df0df4ceb7a9af9236a7f70babfd54e9802b
2019-12-21 01:13:41 +03:00
Try other extensioins that provide "{gitnode}":
$ hg log -r 'tip^' --template "{gitnode}\n"
7e2a5465ff4e3b992c429bb87a392620a0ac97b7
$ hg log -r 'tip^' --template "{gitnode}\n" --config extensions.fbscmquery=
7e2a5465ff4e3b992c429bb87a392620a0ac97b7
$ hg log -r 'tip^' --template "{gitnode}\n" --config extensions.gitrevset=
7e2a5465ff4e3b992c429bb87a392620a0ac97b7
Reference in New Issue Copy Permalink