facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
0be8e8ce29
sapling/eden/scm/tests/test-hggit-clone.t

89 lines
2.4 KiB
Perl
Raw Normal View History

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-pull
2012-09-10 08:27:43 +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-pull
2012-09-10 08:27:43 +04:00
hggit: fix check-code issues Summary: Some issues are difficult to fix right now so I'm just checking a few errors in. Test Plan: run-tests.py Reviewers: mitrandir, #mercurial Reviewed By: mitrandir Subscribers: mitrandir, terrelln Differential Revision: https://phabricator.intern.facebook.com/D6675890 Tasks: T24908724 Signature: 6675890:1515493853:bfdd6c504be2bd0208c2e272183354c688019ac9
2018-01-09 16:53:20 +03:00
$ git checkout -b beta
Switched to a new branch 'beta'
tests: unify test-pull
2012-09-10 08:27:43 +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-pull
2012-09-10 08:27:43 +04:00
$ cd ..
fetch: mark remote HEAD as public phase To help improve the speed Mercurial operations, we shouldn't leave the whole repository in the draft phase. The only hueristic git has for 'public' is remote HEAD. Therefore, if remote HEAD exists then we use it to mark the corresponding local commit as public. For now, we'll put this behind a config flag for easier rollback.
2015-05-16 01:02:24 +03:00
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
clone a branch
ui: make ui.debug write to stderr Summary: Debug output belongs to stderr. This makes it possible to turn on debug output without breaking programs parsing stdout. Reviewed By: singhsrb Differential Revision: D25315954 fbshipit-source-id: c7813a824fbf6640cb5b80b5ed2d947e7059d53e
2020-12-15 23:06:32 +03:00
$ hg clone -r beta gitrepo hgrepo-b 2>&1 | grep -v '^updating'
tests: unify test-pull
2012-09-10 08:27:43 +04:00
importing git objects into hg
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
tests: stop filtering out bookmark output The bookmark output has been stable since well before the oldest Mercurial we support, 2.8.
2015-03-12 20:29:58 +03:00
$ hg -R hgrepo-b log --graph
tests: enable template-new-builtin Summary: This makes tests depend less on revision numbers. Reviewed By: DurhamG Differential Revision: D22468669 fbshipit-source-id: 74a06930faa3e6ee9d246ecc718c2a3740f57a54
2020-07-21 03:23:52 +03:00
@ commit: 3bb02b6794dd
config: use Rust graph render as default Summary: Change the legacy Python graph render to Rust renderer. Reviewed By: DurhamG Differential Revision: D24317802 fbshipit-source-id: 4c3dc3a6dd02b7ebe79596a8e77f4b6b139d2e20
2020-10-20 03:05:23 +03:00
│ bookmark: beta
│ user: test <test@example.org>
│ date: Mon Jan 01 00:00:11 2007 +0000
│ summary: add beta
│
tests: enable template-new-builtin Summary: This makes tests depend less on revision numbers. Reviewed By: DurhamG Differential Revision: D22468669 fbshipit-source-id: 74a06930faa3e6ee9d246ecc718c2a3740f57a54
2020-07-21 03:23:52 +03:00
o commit: 69982ec78c6d
tests: stop filtering out bookmark output The bookmark output has been stable since well before the oldest Mercurial we support, 2.8.
2015-03-12 20:29:58 +03:00
bookmark: master
tests: unify test-pull
2012-09-10 08:27:43 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
tags: remove tags feature Summary: We no longer user tags in any of our repositories, so let's delete all the code and remove some tech debt. Previously drawdag was our last remaining use of tags, but in a previous diff I switched that to use bookmarks. Reviewed By: quark-zju Differential Revision: D19042226 fbshipit-source-id: d7871c71c1026599aa70fdd806418347ea214a8a
2020-01-07 23:29:27 +03:00
Make sure this is still draft since we didn't pull remote's HEAD
$ hg -R hgrepo-b phase -r beta
3bb02b6794ddc0b498cdc15f59f2e6724cabfa2f: draft
git-handler: turn refs from None to {} so that empty git repos can convert
2013-12-04 01:55:17 +04:00
gitimport: add save frequency config If the importer encountered an error half way through a large import, all the commits are saved, but the mapfile is not written, so the process starts over from the beginning when run again. This adds the option for a config value that will save the map file every X commits. I thought about just hard coding this to 100 or something, but doing it this way seems a little less invasive.
2015-06-11 23:56:16 +03:00
clone with mapsavefreq set
$ rm -rf hgrepo-b
ui: make ui.debug write to stderr Summary: Debug output belongs to stderr. This makes it possible to turn on debug output without breaking programs parsing stdout. Reviewed By: singhsrb Differential Revision: D25315954 fbshipit-source-id: c7813a824fbf6640cb5b80b5ed2d947e7059d53e
2020-12-15 23:06:32 +03:00
$ hg clone -r beta gitrepo hgrepo-b --config hggit.mapsavefrequency=1 --debug 2>&1 | egrep "(saving|committing)"
hggit: use transactions during git import Summary: Previously hggit used a single transaction for each commit it imported. This added a lot of over head, such as writing the fncache every time and committing to sql every time. Instead, let's use a transaction that lasts a while. We'll tie it to the existing gitmap save logic, so that we commit commits to disk before writing the map file (so the map file never references commits that don't exist). Reviewed By: quark-zju Differential Revision: D9210162 fbshipit-source-id: 9b1302dfc824055742c4194dfaea7e172e5db6b4
2018-08-08 03:55:51 +03:00
committing files:
committing manifest
committing changelog
committing transaction
gitimport: add save frequency config If the importer encountered an error half way through a large import, all the commits are saved, but the mapfile is not written, so the process starts over from the beginning when run again. This adds the option for a config value that will save the map file every X commits. I thought about just hard coding this to 100 or something, but doing it this way seems a little less invasive.
2015-06-11 23:56:16 +03:00
saving mapfile
hggit: use transactions during git import Summary: Previously hggit used a single transaction for each commit it imported. This added a lot of over head, such as writing the fncache every time and committing to sql every time. Instead, let's use a transaction that lasts a while. We'll tie it to the existing gitmap save logic, so that we commit commits to disk before writing the map file (so the map file never references commits that don't exist). Reviewed By: quark-zju Differential Revision: D9210162 fbshipit-source-id: 9b1302dfc824055742c4194dfaea7e172e5db6b4
2018-08-08 03:55:51 +03:00
committing files:
committing manifest
committing changelog
committing transaction
gitimport: add save frequency config If the importer encountered an error half way through a large import, all the commits are saved, but the mapfile is not written, so the process starts over from the beginning when run again. This adds the option for a config value that will save the map file every X commits. I thought about just hard coding this to 100 or something, but doing it this way seems a little less invasive.
2015-06-11 23:56:16 +03:00
saving mapfile
import_git_commit: skip hgsubstate logic if file was deleted Previously, there was an edge case for Git repositories that started as Mercurial repositories and had used subrepos where a deleted .hgsubstate would be ignored and therefore reintroduced. This patch fixes that behavior by checking for the deleted .hgsubstate file first. A test has been added to verify behavior.
2015-06-14 04:03:34 +03:00
Make sure that a deleted .hgsubstate does not confuse hg-git
$ cd gitrepo
$ echo 'HASH random' > .hgsubstate
$ git add .hgsubstate
$ fn_git_commit -m 'add bogus .hgsubstate'
$ git rm -q .hgsubstate
$ fn_git_commit -m 'remove bogus .hgsubstate'
$ cd ..
$ hg clone -r beta gitrepo hgrepo-c
importing git objects into hg
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd hgrepo-c status
git-handler: turn refs from None to {} so that empty git repos can convert
2013-12-04 01:55:17 +04:00
clone empty repo
$ git init empty
Initialized empty Git repository in $TESTTMP/empty/.git/
$ hg clone empty emptyhg
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg: add hggit.disallowinitbare config option Summary: The hg servers were having trouble bootstrapping the .hg/git directory because hggit was creating a bare repo and then later git fetches were super slow. Those .hg/git directories should be managed by infra outside of hg, so let's add a config knob to prevent hggit from creating a .hg/git repo. Reviewed By: quark-zju Differential Revision: D7586441 fbshipit-source-id: 7c2578123428aadaa6a94484e45dda6bd6b5a42d
2018-04-13 20:43:19 +03:00
Ensure hggit.disallowinitbare blocks initting .hg/git
$ hg init nogitbare
$ cd nogitbare
$ cat >> .hg/hgrc <<EOF
> [hggit]
> disallowinitbare=True
> EOF
$ hg pull ../empty
pulling from ../empty
abort: missing .hg/git repo
[255]
Reference in New Issue Copy Permalink