facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity
213feff513
sapling/tests/test-hggit-encoding.t

128 lines
4.4 KiB
Perl
Raw Normal View History

tests: unify test-encoding
2012-09-12 02:51:19 +04:00
# -*- coding: utf-8 -*-
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-encoding
2012-09-12 02:51:19 +04:00
utf-8 encoded commit message
$ echo alpha > alpha
$ git add alpha
tests: use fn_git_commit in test-encoding.t In f32e473ff520, the "commit" function was extracted into a testutil for re-use. However, test-encoding.t was skipped over in that changeset, as I was seeing unexplained test failures. Since those test failures have now been explained (and fixed), this changeset performs the same extraction on test-encoding.t as was done on all the other tests. The version of fn_git_commit that was used in testutil redirected all output (including errors) to /dev/null, which didn't match the expectations of this test. The test utility functions for commit/tag now no longer throw away error output, instead leaving it to individual tests to decide if error output should be ignored.
2012-11-04 06:36:13 +04:00
$ fn_git_commit -m 'add älphà'
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
Create some commits using latin1 encoding
The warning message changed in Git 1.8.0
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/latin-1-encoding
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
Warning: commit message (did|does) not conform to UTF-8. (re)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
Warning: commit message (did|does) not conform to UTF-8. (re)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
You may want to amend it after fixing the message, or set the config
variable i18n.commitencoding to the encoding your project uses.
$ 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-encoding
2012-09-12 02:51:19 +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-encoding
2012-09-12 02:51:19 +04:00
importing git objects into hg
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ 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
$ HGENCODING=utf-8 hg log --graph --debug | grep -v 'phase:' | grep -v ': *author=' | grep -v ': *message='
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: 3:b8a0ac52f339ccd6d5729508bac4aee6e8b489d8
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-encoding
2012-09-12 02:51:19 +04:00
| tag: default/master
| tag: tip
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: 2:8bc4d64940260d4a1e70b54c099d3a76c83ff41e
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| parent: -1:0000000000000000000000000000000000000000
| manifest: 3:ea49f93388380ead5601c8fcbfa187516e7c2ed8
| user: tést èncödîng <test@example.org>
| date: Mon Jan 01 00:00:13 2007 +0000
| files+: delta
| extra: branch=default
| extra: committer=test <test@example.org> 1167609613 0
| extra: encoding=latin-1
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
| extra: hg-git-rename-source=git
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| description:
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
| add d\xc3\xa9lt\xc3\xa0 (esc)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
|
|
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: 2:8bc4d64940260d4a1e70b54c099d3a76c83ff41e
| parent: 1:f35a3100b78e57a0f5e4589a438f952a14b26ade
test-encoding: fix tests with upstream change Upstream D1546 changed the behavior of "| ... (re)" matching that affects this test.
2017-12-05 00:37:24 +03:00
| parent: -1:0000000000000000000000000000000000000000
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| manifest: 2:f580e7da3673c137370da2b931a1dee83590d7b4
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
| user: t\xc3\xa9st \xc3\xa8nc\xc3\xb6d\xc3\xaeng <test@example.org> (esc)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| date: Mon Jan 01 00:00:12 2007 +0000
| files+: gamma
| extra: branch=default
| extra: committer=test <test@example.org> 1167609612 0
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
| extra: hg-git-rename-source=git
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| description:
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
| add g\xc3\xa4mm\xc3\xa2 (esc)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
|
|
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: 1:f35a3100b78e57a0f5e4589a438f952a14b26ade
| parent: 0:87cd29b67a9159eec3b5495b0496ef717b2769f5
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| parent: -1:0000000000000000000000000000000000000000
| manifest: 1:f0bd6fbafbaebe4bb59c35108428f6fce152431d
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
| user: t\xc3\xa9st \xc3\xa8nc\xc3\xb6d\xc3\xaeng <test@example.org> (esc)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| date: Mon Jan 01 00:00:11 2007 +0000
| files+: beta
| extra: branch=default
| extra: committer=test <test@example.org> 1167609611 0
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
| extra: hg-git-rename-source=git
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
| description:
| 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:87cd29b67a9159eec3b5495b0496ef717b2769f5
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
parent: -1:0000000000000000000000000000000000000000
parent: -1:0000000000000000000000000000000000000000
manifest: 0:8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
files+: alpha
extra: branch=default
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
extra: hg-git-rename-source=git
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
description:
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
add \xc3\xa4lph\xc3\xa0 (esc)
test-encoding: fix tests with upstream change Upstream D1546 changed the behavior of "| ... (re)" matching that affects this test.
2017-12-05 00:37:24 +03:00
| parent: 1:(9f6268bfc9eb3956c5ab8752d7b983b0ffe57115|955b24cf6f8f293741d3f39110c6fe554c292533) (re)
tests: unify test-encoding
2012-09-12 02:51:19 +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 4 blobs
tests: unify test-encoding
2012-09-12 02:51:19 +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 ..
$ git --git-dir=gitrepo2 log --pretty=medium
test-encoding: remove support for Git 1.7.x Git 1.8.0 was released in late 2012. Given that we only support versions of Mercurial released in 2014, it doesn't make sense to support versions of Git this old.
2014-12-05 05:31:42 +03:00
commit e85fef6b515d555e45124a5dc39a019cf8db9ff0
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
Author: t\xe9st \xe8nc\xf6d\xeeng <test@example.org> (esc)
Date: Mon Jan 1 00:00:13 2007 +0000
add d\xe9lt\xe0 (esc)
test-encoding: remove support for Git 1.7.x Git 1.8.0 was released in late 2012. Given that we only support versions of Mercurial released in 2014, it doesn't make sense to support versions of Git this old.
2014-12-05 05:31:42 +03:00
commit bd576458238cbda49ffcfbafef5242e103f1bc24
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
Author: * <test@example.org> (glob)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
Date: Mon Jan 1 00:00:12 2007 +0000
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
add g*mm* (glob)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
test-encoding: remove support for Git 1.7.x Git 1.8.0 was released in late 2012. Given that we only support versions of Mercurial released in 2014, it doesn't make sense to support versions of Git this old.
2014-12-05 05:31:42 +03:00
commit 7a7e86fc1b24db03109c9fe5da28b352de59ce90
tests: make test-encoding.t compatible with git 1.8.0 It looks like Git 1.8.0 started silently converting latin1 commit messages to utf-8. That changed the result of this test. This changeset alters the test to make it accept both the pre-1.8.0 and post-1.8.0 behaviors. https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt
2012-11-04 06:22:43 +04:00
Author: * <test@example.org> (glob)
tests: unify test-encoding
2012-09-12 02:51:19 +04:00
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
commit 0530b75d8c203e10dc934292a6a4032c6e958a83
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add älphà
Reference in New Issue Copy Permalink