facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity
32da3b0259
sapling/tests/test-hggit-incoming.t

138 lines
3.7 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-incoming
2012-09-10 08:27:32 +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-incoming
2012-09-10 08:27:32 +04:00
$ cd ..
overlayrevlog: handle root commits correctly Previously, we'd try to access commit.parents[0] and fail. Now, check for commit.parents being empty and return what Mercurial thinks is a repository root in that case.
2014-02-25 12:23:12 +04:00
$ hg init hgrepo-empty
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-empty incoming gitrepo | grep -v 'no changes found'
overlayrevlog: handle root commits correctly Previously, we'd try to access commit.parents[0] and fail. Now, check for commit.parents being empty and return what Mercurial thinks is a repository root in that case.
2014-02-25 12:23:12 +04:00
comparing with gitrepo
changeset: 0:7eeab2ea75ec
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
overlayrevlog: handle root commits correctly Previously, we'd try to access commit.parents[0] and fail. Now, check for commit.parents being empty and return what Mercurial thinks is a repository root in that case.
2014-02-25 12:23:12 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
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-incoming
2012-09-10 08:27:32 +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 incoming | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
tests: avoid changing the current directory Mercurial allows specifying which repository to use via the -R/--repository option. Git allows a similar function using the --git-dir option. By using these options, in many cases we can avoid checking the current directory. This makes tests easier to understand, as you don't need to remember which directory you're in to understand what's going on. It also makes tests easier to write, as you don't need to remember to cd out of a directory when you're done doing things there. Thanks to Felipe Contreras for the patch which this was based on.
2012-11-04 03:12:08 +04:00
$ cd gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +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: avoid changing the current directory Mercurial allows specifying which repository to use via the -R/--repository option. Git allows a similar function using the --git-dir option. By using these options, in many cases we can avoid checking the current directory. This makes tests easier to understand, as you don't need to remember which directory you're in to understand what's going on. It also makes tests easier to write, as you don't need to remember to cd out of a directory when you're done doing things there. Thanks to Felipe Contreras for the patch which this was based on.
2012-11-04 03:12:08 +04:00
$ cd ..
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
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 incoming | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
changeset: 1:9497a4ee62e1
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-incoming
2012-09-10 08:27:32 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
tests: avoid changing the current directory Mercurial allows specifying which repository to use via the -R/--repository option. Git allows a similar function using the --git-dir option. By using these options, in many cases we can avoid checking the current directory. This makes tests easier to understand, as you don't need to remember which directory you're in to understand what's going on. It also makes tests easier to write, as you don't need to remember to cd out of a directory when you're done doing things there. Thanks to Felipe Contreras for the patch which this was based on.
2012-11-04 03:12:08 +04:00
$ cd gitrepo
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 b1 'HEAD^'
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
Switched to a new branch 'b1'
$ mkdir d
$ echo gamma > d/gamma
$ git add d/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 d/gamma'
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
$ git tag t1
$ echo gamma 2 >> d/gamma
$ git add d/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 d/gamma line 2'
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
$ cd ../hgrepo
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 incoming -p | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
changeset: 1:9497a4ee62e1
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-incoming
2012-09-10 08:27:32 +04:00
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
diff -r ff7a2f2d8d70 -r 9497a4ee62e1 beta
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/beta Mon Jan 01 00:00:11 2007 +0000
@@ -0,0 +1,1 @@
+beta
changeset: 2:9865e289be73
tag: t1
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
parent: 0:ff7a2f2d8d70
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:12 2007 +0000
summary: add d/gamma
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
diff -r ff7a2f2d8d70 -r 9865e289be73 d/gamma
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/d/gamma Mon Jan 01 00:00:12 2007 +0000
@@ -0,0 +1,1 @@
+gamma
changeset: 3:5202f48c20c9
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: b1
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:13 2007 +0000
summary: add d/gamma line 2
diff -r 9865e289be73 -r 5202f48c20c9 d/gamma
--- a/d/gamma Mon Jan 01 00:00:12 2007 +0000
+++ b/d/gamma Mon Jan 01 00:00:13 2007 +0000
@@ -1,1 +1,2 @@
gamma
+gamma 2
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
incoming -r
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 incoming -r master | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
changeset: 1:9497a4ee62e1
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-incoming
2012-09-10 08:27:32 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
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 incoming -r b1 | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
changeset: 1:9865e289be73
tag: t1
user: test <test@example.org>
date: Mon Jan 01 00:00:12 2007 +0000
summary: add d/gamma
changeset: 2:5202f48c20c9
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: b1
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:13 2007 +0000
summary: add d/gamma line 2
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 incoming -r t1 | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
changeset: 1:9865e289be73
tag: t1
user: test <test@example.org>
date: Mon Jan 01 00:00:12 2007 +0000
summary: add d/gamma
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
nothing incoming after pull
gitrepo: initial support for listkeys This changeset adds test coverage for comparing "hg outgoing -B" in normal Mercurial usage with Hg-Git usage. This didn't match, since previously, gitrepo didn't provide a meaningful listkeys implementation. Now, it does. gitrepo now has access to a GitHandler when a localrepo is available. This handler is used to access the information needed to implement listkeys for namespaces (currently, only bookmarks) and bookmarks. A couple of other tests were testing "divergent bookmark" scenarios. These tests have been updated to filter out the divergent bookmark output, as it isn't consistent across the supported Mercurial versions.
2012-10-26 04:49:08 +04:00
"adding remote bookmark" message was added in Mercurial 2.3
$ hg pull | grep -v "adding remote bookmark"
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
pulling from $TESTTMP/gitrepo
tests: unify test-incoming
2012-09-10 08:27:32 +04:00
importing git objects into hg
(run 'hg heads' to see heads, 'hg merge' to merge)
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 incoming | grep -v 'no changes found'
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
comparing with $TESTTMP/gitrepo
Reference in New Issue Copy Permalink