mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'fc/remote-helper-fixes'
* fc/remote-helper-fixes: remote-bzr: trivial test fix remote-bzr: include authors field in pushed commits remote-bzr: add support for older versions remote-hg: always normalize paths remote-helpers: allow all tests running from any dir
This commit is contained in:
commit
8f87d548b6
|
@ -618,10 +618,12 @@ def parse_commit(parser):
|
|||
files[path] = f
|
||||
|
||||
committer, date, tz = committer
|
||||
author, _, _ = author
|
||||
parents = [mark_to_rev(p) for p in parents]
|
||||
revid = bzrlib.generate_ids.gen_revision_id(committer, date)
|
||||
props = {}
|
||||
props['branch-nick'] = branch.nick
|
||||
props['authors'] = author
|
||||
|
||||
mtree = CustomTree(branch, revid, parents, files)
|
||||
changes = mtree.iter_changes()
|
||||
|
@ -784,7 +786,7 @@ def clone(path, remote_branch):
|
|||
def get_remote_branch(name):
|
||||
remote_branch = bzrlib.branch.Branch.open(branches[name],
|
||||
possible_transports=transports)
|
||||
if isinstance(remote_branch.user_transport, bzrlib.transport.local.LocalTransport):
|
||||
if isinstance(remote_branch.bzrdir.root_transport, bzrlib.transport.local.LocalTransport):
|
||||
return remote_branch
|
||||
|
||||
branch_path = os.path.join(dirname, 'clone', name)
|
||||
|
@ -867,7 +869,7 @@ def get_repo(url, alias):
|
|||
if not wanted:
|
||||
try:
|
||||
repo = origin.open_repository()
|
||||
if not repo.user_transport.listable():
|
||||
if not repo.bzrdir.root_transport.listable():
|
||||
# this repository is not usable for us
|
||||
raise bzrlib.errors.NoRepositoryPresent(repo.bzrdir)
|
||||
except bzrlib.errors.NoRepositoryPresent:
|
||||
|
|
|
@ -260,6 +260,7 @@ class Parser:
|
|||
return (user, int(date), -tz)
|
||||
|
||||
def fix_file_path(path):
|
||||
path = os.path.normpath(path)
|
||||
if not os.path.isabs(path):
|
||||
return path
|
||||
return os.path.relpath(path, '/')
|
||||
|
|
|
@ -382,7 +382,7 @@ test_expect_success 'strip' '
|
|||
'
|
||||
|
||||
test_expect_success 'export utf-8 authors' '
|
||||
test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && unset GIT_COMMITTER_NAME" &&
|
||||
test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && GIT_COMMITTER_NAME=\"C O Mitter\""
|
||||
|
||||
LC_ALL=en_US.UTF-8
|
||||
export LC_ALL
|
||||
|
@ -411,4 +411,28 @@ test_expect_success 'export utf-8 authors' '
|
|||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'push different author' '
|
||||
test_when_finished "rm -rf bzrrepo gitrepo" &&
|
||||
|
||||
bzr init bzrrepo &&
|
||||
|
||||
(
|
||||
git init gitrepo &&
|
||||
cd gitrepo &&
|
||||
echo john >> content &&
|
||||
git add content &&
|
||||
git commit -m john --author "John Doe <jdoe@example.com>" &&
|
||||
git remote add bzr "bzr::../bzrrepo" &&
|
||||
git push bzr master
|
||||
) &&
|
||||
|
||||
(
|
||||
cd bzrrepo &&
|
||||
bzr log | grep "^author: " > ../actual
|
||||
) &&
|
||||
|
||||
echo "author: John Doe <jdoe@example.com>" > expected &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
|
||||
test_description='Test bidirectionality of remote-hg'
|
||||
|
||||
. ./test-lib.sh
|
||||
test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
|
||||
. "$TEST_DIRECTORY"/test-lib.sh
|
||||
|
||||
if ! test_have_prereq PYTHON
|
||||
then
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
|
||||
test_description='Test remote-hg output compared to hg-git'
|
||||
|
||||
. ./test-lib.sh
|
||||
test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
|
||||
. "$TEST_DIRECTORY"/test-lib.sh
|
||||
|
||||
if ! test_have_prereq PYTHON
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue