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
b6f11be83a
sapling/eden/scm/tests/test-hggit-merge.t

87 lines
2.1 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-merge
2012-09-10 08:27:33 +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-merge
2012-09-10 08:27:33 +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-merge
2012-09-10 08:27:33 +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-merge
2012-09-10 08:27:33 +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 master
Switched to branch 'master'
tests: unify test-merge
2012-09-10 08:27:33 +04:00
$ echo gamma > gamma
$ git add gamma
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 gamma'
tests: unify test-merge
2012-09-10 08:27:33 +04:00
clean merge
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 merge beta
Merge made by the 'recursive' strategy.
tests: unify test-merge
2012-09-10 08:27:33 +04:00
beta | 1 +
1 file changed, 1 insertion(+)
create mode 100644 beta
$ cd ..
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 --bare gitrepo2
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/gitrepo2/
tests: unify test-merge
2012-09-10 08:27:33 +04:00
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 gitrepo hgrepo | grep -v '^updating'
tests: unify test-merge
2012-09-10 08:27:33 +04:00
importing git objects into hg
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
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
clear the cache to be sure it is regenerated correctly
tests: unify test-merge
2012-09-10 08:27:33 +04:00
$ hg gclear
clearing out the git cache data
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 push ../gitrepo2
pushing to ../gitrepo2
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
push: add more output about what was added (issue #64) l33t pointed out that currently, Hg-Git doesn't provide any confirmation that a push was successful other than the exit code. Normal Mercurial provides a couple other messages followed by "added X changesets with Y changes to Z files". After this change, Hg-Git will provide much more similar output. It's not identical, as the underlying model is substantially different, but the concept is the same. The main message is "added X commits with Y trees and Z blobs". This change doesn't affect the output of what references/branches were touched. That will be addressed in a subsequent commit. Dulwich doesn't provide an easy hook to get the information needed for this output. Instead of passing generate_pack_contents as the pack generator function to send_pack, I pass a custom function that determines the "missing" objects, stores the counts, and then calls generate_pack_contents (which then will determine the "missing" objects again. The new expected output: searching for changes # unless quiet true <N> commits found # if verbose true list of commits: # if debugflag true and at least one commit found <each hash> # if debugflag true and at least one commit found adding objects # if at least one commit found unless quiet true added <N> commits with <N> trees and <N> blobs # if at least one object unless # quiet true https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
2013-01-06 10:46:57 +04:00
adding objects
added 4 commits with 4 trees and 3 blobs
tests: unify test-merge
2012-09-10 08:27:33 +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
git log in repo pushed from hg
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 --git-dir=gitrepo2 log --pretty=medium master
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
commit fdbdf0eb28dbc846a66f8bf458c5aa8ebfc87412
Merge: 3ab4bf1 dbed4f6
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:12 2007 +0000
Merge branch 'beta'
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
commit 3ab4bf1785d6dbdb82467bf09e6aa1450312968d
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:12 2007 +0000
add gamma
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
commit dbed4f6a8ff04d4d1f0a5ce79f9a07cf0f461d7f
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
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
commit 205598a42833e532ad20d80414b8e3b85a65936e
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add 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 --git-dir=gitrepo2 log --pretty=medium beta
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
commit dbed4f6a8ff04d4d1f0a5ce79f9a07cf0f461d7f
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
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
commit 205598a42833e532ad20d80414b8e3b85a65936e
tests: unify test-merge
2012-09-10 08:27:33 +04:00
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add alpha
Reference in New Issue Copy Permalink