facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity
a47038bb11
sapling/eden/scm/tests/test-hggit-convergedmerge.t

79 lines
1.9 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: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
$ hg init hgrepo1
$ cd hgrepo1
$ echo A > afile
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
$ hg add afile
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
$ hg ci -m "origin"
$ echo B > afile
$ hg ci -m "A->B"
$ echo C > afile
$ hg ci -m "B->C"
$ hg up -r0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo C > afile
$ hg ci -m "A->C"
$ hg merge -r2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "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
$ hg log --graph --style compact
tags: remove tip tag Summary: In a future diff we'll be removing tags. The most prevalent tag is 'tip', which shows up in a ton of test output. Let's drop that tag first, so we can safely update the tests before we drop tags entirely. Reviewed By: xavierd Differential Revision: D18995058 fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
2019-12-18 00:45:17 +03:00
@ 4:3,2 eaa21d002113 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
|\ merge
| |
| o 3:0 ea82b67264a1 1970-01-01 00:00 +0000 test
| | A->C
| |
o | 2 0dbe4ac1a758 1970-01-01 00:00 +0000 test
| | B->C
| |
o | 1 7205e83b5a3f 1970-01-01 00:00 +0000 test
|/ A->B
|
o 0 5d1a6b64f9d0 1970-01-01 00:00 +0000 test
origin
$ 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 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/
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
$ cd hgrepo1
$ hg bookmark -r4 master
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 -r master ../gitrepo
pushing to ../gitrepo
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 5 commits with 3 trees and 3 blobs
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
$ cd ..
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 hgrepo2 | grep -v '^updating'
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
importing git objects into hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
expect the same revision ids as above
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
$ hg -R hgrepo2 log --graph --style compact
tags: remove tip tag Summary: In a future diff we'll be removing tags. The most prevalent tag is 'tip', which shows up in a ton of test output. Let's drop that tag first, so we can safely update the tests before we drop tags entirely. Reviewed By: xavierd Differential Revision: D18995058 fbshipit-source-id: 8c63710cd4ed567ea24e32724b8660f9006a61f1
2019-12-18 00:45:17 +03:00
@ 4[default/master][master]:1,3 b08a922386d5 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
|\ merge
| |
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
| o 3 8bfd72bff163 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
| | B->C
| |
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
| o 2:0 47fc555571b8 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
| | A->B
| |
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
o | 1 8ec5b459b86e 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
|/ A->C
|
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
o 0 fd5eb788c3a1 1970-01-01 00:00 +0000 test
tests: unify test-convergedmerge
2012-09-10 08:26:41 +04:00
origin
verify: add new command to verify the contents of a Mercurial rev Since the Git to Mercurial conversion process is incremental, it's at risk of missing files, or recording files the wrong way, or recording the wrong commit metadata. Add a command called 'gverify' that can verify the contents of a particular Mercurial rev against the corresponding Git commit. Currently, this is limited to checking file names, flags and contents, but this can be made as robust as desired. Further additions will probably require refactoring git_handler.py a bit though. This function is pretty fast: on a Linux machine with a warm cache, verifying a repository with around 50,000 files takes just 20 seconds. There is scope for further improvement through parallelization, but conducting tree walks in parallel is non-trivial with the current worker infrastructure in Mercurial.
2014-02-27 02:19:24 +04:00
$ hg -R hgrepo2 gverify
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
verifying rev b08a922386d5 against git commit fb8c9e2afe5418cfff337eeed79fad5dd58826f0
Reference in New Issue Copy Permalink