facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity
9e6c6e4e3f
sapling/tests/test-hggit-clone.t

89 lines
2.5 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
$ git tag alpha
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 ..
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 tag
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
$ hg clone -r alpha gitrepo hgrepo-a | grep -v '^updating'
tests: unify test-pull
2012-09-10 08:27:43 +04:00
importing git objects into hg
1 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-a log --graph
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
@ changeset: 0:ff7a2f2d8d70
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
tag: alpha
tag: default/master
tag: tip
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
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
Make sure this is still draft since we didn't pull remote's HEAD
$ hg -R hgrepo-a phase -r alpha
0: draft
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
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
$ hg clone -r beta gitrepo hgrepo-b | 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
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
@ changeset: 1:7fe02317c63d
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: beta
tests: unify test-pull
2012-09-10 08:27:43 +04:00
| tag: default/beta
| tag: tip
| user: test <test@example.org>
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: add beta
|
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
o changeset: 0:ff7a2f2d8d70
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
tag: alpha
tag: default/master
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
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
$ hg clone -r beta gitrepo hgrepo-b --config hggit.mapsavefrequency=1 --debug | grep saving
saving mapfile
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
Reference in New Issue Copy Permalink