undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fc/contrib-bzr-hg-fixes'

Browse Source 
* fc/contrib-bzr-hg-fixes:
  contrib/remote-helpers: quote variable references in redirection targets
  contrib/remote-helpers: style updates for test scripts
  remote-hg: use notes to keep track of Hg revisions
  remote-helpers: cleanup more global variables
  remote-helpers: trivial style fixes
  remote-hg: improve basic test
  remote-hg: add missing &&s in the test
  remote-hg: fix test
  remote-bzr: make bzr branches configurable per-repo
  remote-bzr: fix export of utf-8 authors
This commit is contained in:
Junio C Hamano 2013-09-18 11:45:49 -07:00
commit 751e2b3718
6 changed files with 327 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
contrib/remote-helpers/git-remote-bzr
View File

@ -13,8 +13,11 @@
# or
# % git clone bzr::lp:myrepo
#
# If you want to specify which branches you want track (per repo):
# git config remote-bzr.branches 'trunk, devel, test'
# If you want to specify which branches you want to track (per repo):
# % git config remote.origin.bzr-branches 'trunk, devel, test'
#
# Where 'origin' is the name of the repository you want to specify the
# branches.
#
import sys
@ -168,17 +171,16 @@ class Parser:
if not m:
return None
_, name, email, date, tz = m.groups()
name = name.decode('utf-8')
committer = '%s <%s>' % (name, email)
tz = int(tz)
tz = ((tz / 100) * 3600) + ((tz % 100) * 60)
return (committer, int(date), tz)
def rev_to_mark(rev):
global marks
return marks.from_rev(rev)
def mark_to_rev(mark):
global marks
return marks.to_rev(mark)
def fixup_user(user):
@ -233,8 +235,6 @@ def get_filechanges(cur, prev):
return modified, removed
def export_files(tree, files):
global marks, filenodes
final = []
for path, fid in files.iteritems():
kind = tree.kind(fid)
@ -276,8 +276,6 @@ def export_files(tree, files):
return final
def export_branch(repo, name):
global prefix
ref = '%s/heads/%s' % (prefix, name)
tip = marks.get_tip(name)
@ -378,16 +376,12 @@ def export_branch(repo, name):
marks.set_tip(name, revid)
def export_tag(repo, name):
global tags, prefix
ref = '%s/tags/%s' % (prefix, name)
print "reset %s" % ref
print "from :%u" % rev_to_mark(tags[name])
print
def do_import(parser):
global dirname
repo = parser.repo
path = os.path.join(dirname, 'marks-git')
@ -413,8 +407,6 @@ def do_import(parser):
sys.stdout.flush()
def parse_blob(parser):
global blob_marks
parser.next()
mark = parser.get_mark()
parser.next()
@ -425,8 +417,6 @@ def parse_blob(parser):
class CustomTree():
def __init__(self, branch, revid, parents, files):
global files_cache
self.updates = {}
self.branch = branch
@ -484,7 +474,7 @@ class CustomTree():
add_entry(fid, dirname, 'directory')
return fid
def add_entry(fid, path, kind, mode = None):
def add_entry(fid, path, kind, mode=None):
dirname, basename = os.path.split(path)
parent_fid = get_parent(dirname, basename)
@ -505,7 +495,7 @@ class CustomTree():
self.files[path] = [change[0], None]
changes.append(change)
def update_entry(fid, path, kind, mode = None):
def update_entry(fid, path, kind, mode=None):
dirname, basename = os.path.split(path)
parent_fid = get_parent(dirname, basename)
@ -583,9 +573,6 @@ def c_style_unescape(string):
return string
def parse_commit(parser):
global marks, blob_marks, parsed_refs
global mode
parents = []
ref = parser[1]
@ -657,8 +644,6 @@ def parse_commit(parser):
marks.new_mark(revid, commit_mark)
def parse_reset(parser):
global parsed_refs
ref = parser[1]
parser.next()
@ -674,8 +659,6 @@ def parse_reset(parser):
parsed_refs[ref] = mark_to_rev(from_mark)
def do_export(parser):
global parsed_refs, dirname, transports
parser.next()
for line in parser.each_block('done'):
@ -725,8 +708,6 @@ def do_export(parser):
print
def do_capabilities(parser):
global dirname
print "import"
print "export"
print "refspec refs/heads/*:%s/heads/*" % prefix
@ -744,8 +725,6 @@ def ref_is_valid(name):
return not True in [c in name for c in '~^: \\']
def do_list(parser):
global tags
master_branch = None
for name in branches:
@ -770,7 +749,6 @@ def do_list(parser):
print
def clone(path, remote_branch):
global transports
try:
bdir = bzrlib.bzrdir.BzrDir.create(path, possible_transports=transports)
except bzrlib.errors.AlreadyControlDirError:
@ -780,8 +758,6 @@ def clone(path, remote_branch):
return remote_branch.sprout(bdir, repository=repo)
def get_remote_branch(name):
global dirname, branches, transports
remote_branch = bzrlib.branch.Branch.open(branches[name],
possible_transports=transports)
if isinstance(remote_branch.user_transport, bzrlib.transport.local.LocalTransport):
@ -825,8 +801,6 @@ def find_branches(repo):
yield name, branch.base
def get_repo(url, alias):
global dirname, peer, branches, transports
normal_url = bzrlib.urlutils.normalize_url(url)
origin = bzrlib.bzrdir.BzrDir.open(url, possible_transports=transports)
is_local = isinstance(origin.transport, bzrlib.transport.local.LocalTransport)
@ -858,9 +832,13 @@ def get_repo(url, alias):
except bzrlib.errors.NoRepositoryPresent:
pass
wanted = get_config('remote-bzr.branches').rstrip().split(', ')
wanted = get_config('remote.%s.bzr-branches' % alias).rstrip().split(', ')
# stupid python
wanted = [e for e in wanted if e]
if not wanted:
wanted = get_config('remote-bzr.branches').rstrip().split(', ')
# stupid python
wanted = [e for e in wanted if e]
if not wanted:
try:

67
contrib/remote-helpers/git-remote-hg
View File

@ -23,7 +23,11 @@ import subprocess
import urllib
import atexit
import urlparse, hashlib
import time as ptime
#
# If you want to see Mercurial revisions as Git commit notes:
# git config core.notesRef refs/notes/hg
#
# If you are not in hg-git-compat mode and want to disable the tracking of
# named branches:
@ -126,6 +130,7 @@ class Marks:
self.rev_marks = {}
self.last_mark = 0
self.version = 0
self.last_note = 0
def load(self):
if not os.path.exists(self.path):
@ -137,6 +142,7 @@ class Marks:
self.marks = tmp['marks']
self.last_mark = tmp['last-mark']
self.version = tmp.get('version', 1)
self.last_note = tmp.get('last-note', 0)
for rev, mark in self.marks.iteritems():
self.rev_marks[mark] = rev
@ -150,7 +156,7 @@ class Marks:
self.version = 2
def dict(self):
return { 'tips': self.tips, 'marks': self.marks, 'last-mark' : self.last_mark, 'version' : self.version }
return { 'tips': self.tips, 'marks': self.marks, 'last-mark' : self.last_mark, 'version' : self.version, 'last-note' : self.last_note }
def store(self):
json.dump(self.dict(), open(self.path, 'w'))
@ -227,8 +233,6 @@ class Parser:
return sys.stdin.read(size)
def get_author(self):
global bad_mail
ex = None
m = RAW_AUTHOR_RE.match(self.line)
if not m:
@ -261,8 +265,6 @@ def fix_file_path(path):
return os.path.relpath(path, '/')
def export_files(files):
global marks, filenodes
final = []
for f in files:
fid = node.hex(f.filenode())
@ -344,8 +346,6 @@ def fixup_user_hg(user):
return (name, mail)
def fixup_user(user):
global mode, bad_mail
if mode == 'git':
name, mail = fixup_user_git(user)
else:
@ -374,7 +374,7 @@ def updatebookmarks(repo, peer):
bookmarks.write(repo)
def get_repo(url, alias):
global dirname, peer
global peer
myui = ui.ui()
myui.setconfig('ui', 'interactive', 'off')
@ -429,16 +429,12 @@ def get_repo(url, alias):
return repo
def rev_to_mark(rev):
global marks
return marks.from_rev(rev.hex())
def mark_to_rev(mark):
global marks
return marks.to_rev(mark)
def export_ref(repo, name, kind, head):
global prefix, marks, mode
ename = '%s/%s' % (kind, name)
try:
tip = marks.get_tip(ename)
@ -535,6 +531,31 @@ def export_ref(repo, name, kind, head):
print "from :%u" % rev_to_mark(head)
print
pending_revs = set(revs) - notes
if pending_revs:
note_mark = marks.next_mark()
ref = "refs/notes/hg"
print "commit %s" % ref
print "mark :%d" % (note_mark)
print "committer remote-hg <> %s" % (ptime.strftime('%s %z'))
desc = "Notes for %s\n" % (name)
print "data %d" % (len(desc))
print desc
if marks.last_note:
print "from :%u" % marks.last_note
for rev in pending_revs:
notes.add(rev)
c = repo[rev]
print "N inline :%u" % rev_to_mark(c)
msg = c.hex()
print "data %d" % (len(msg))
print msg
print
marks.last_note = note_mark
marks.set_tip(ename, head.hex())
def export_tag(repo, tag):
@ -550,12 +571,9 @@ def export_branch(repo, branch):
export_ref(repo, branch, 'branches', head)
def export_head(repo):
global g_head
export_ref(repo, g_head[0], 'bookmarks', g_head[1])
def do_capabilities(parser):
global prefix, dirname
print "import"
print "export"
print "refspec refs/heads/branches/*:%s/branches/*" % prefix
@ -575,8 +593,6 @@ def branch_tip(branch):
return branches[branch][-1]
def get_branch_tip(repo, branch):
global branches
heads = branches.get(hgref(branch), None)
if not heads:
return None
@ -589,7 +605,7 @@ def get_branch_tip(repo, branch):
return heads[0]
def list_head(repo, cur):
global g_head, bmarks, fake_bmark
global g_head, fake_bmark
if 'default' not in branches:
# empty repo
@ -605,8 +621,6 @@ def list_head(repo, cur):
g_head = (head, node)
def do_list(parser):
global branches, bmarks, track_branches
repo = parser.repo
for bmark, node in bookmarks.listbookmarks(repo).iteritems():
bmarks[bmark] = repo[node]
@ -674,8 +688,6 @@ def do_import(parser):
print 'done'
def parse_blob(parser):
global blob_marks
parser.next()
mark = parser.get_mark()
parser.next()
@ -692,9 +704,6 @@ def get_merge_files(repo, p1, p2, files):
files[e] = f
def parse_commit(parser):
global marks, blob_marks, parsed_refs
global mode
from_mark = merge_mark = None
ref = parser[1]
@ -812,8 +821,6 @@ def parse_commit(parser):
marks.new_mark(node, commit_mark)
def parse_reset(parser):
global parsed_refs
ref = parser[1]
parser.next()
# ugh
@ -1006,8 +1013,6 @@ def check_tip(ref, kind, name, heads):
return tip in heads
def do_export(parser):
global parsed_refs, bmarks, peer
p_bmarks = []
p_revs = {}
@ -1079,7 +1084,7 @@ def do_export(parser):
author, msg = parsed_tags.get(tag, (None, None))
if mode == 'git':
if not msg:
msg = 'Added tag %s for changeset %s' % (tag, node[:12]);
msg = 'Added tag %s for changeset %s' % (tag, node[:12])
tagnode, branch = write_tag(parser.repo, tag, node, msg, author)
p_revs[tagnode] = 'refs/heads/branches/' + gitref(branch)
else:
@ -1152,6 +1157,7 @@ def main(args):
global filenodes
global fake_bmark, hg_version
global dry_run
global notes, alias
alias = args[1]
url = args[2]
@ -1191,6 +1197,7 @@ def main(args):
except:
hg_version = None
dry_run = False
notes = set()
repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias

136
contrib/remote-helpers/test-bzr.sh
View File

@ -7,19 +7,21 @@ test_description='Test remote-bzr'
. ./test-lib.sh
if ! test_have_prereq PYTHON; then
if ! test_have_prereq PYTHON
then
skip_all='skipping remote-bzr tests; python not available'
test_done
fi
if ! python -c 'import bzrlib'; then
if ! python -c 'import bzrlib'
then
skip_all='skipping remote-bzr tests; bzr not available'
test_done
fi
check () {
echo $3 > expected &&
git --git-dir=$1/.git log --format='%s' -1 $2 > actual
echo $3 >expected &&
git --git-dir=$1/.git log --format='%s' -1 $2 >actual
test_cmp expected actual
}
@ -29,7 +31,7 @@ test_expect_success 'cloning' '
(
bzr init bzrrepo &&
cd bzrrepo &&
echo one > content &&
echo one >content &&
bzr add content &&
bzr commit -m one
) &&
@ -41,7 +43,7 @@ test_expect_success 'cloning' '
test_expect_success 'pulling' '
(
cd bzrrepo &&
echo two > content &&
echo two >content &&
bzr commit -m two
) &&
@ -53,13 +55,13 @@ test_expect_success 'pulling' '
test_expect_success 'pushing' '
(
cd gitrepo &&
echo three > content &&
echo three >content &&
git commit -a -m three &&
git push
) &&
echo three > expected &&
cat bzrrepo/content > actual &&
echo three >expected &&
cat bzrrepo/content >actual &&
test_cmp expected actual
'
@ -67,16 +69,16 @@ test_expect_success 'roundtrip' '
(
cd gitrepo &&
git pull &&
git log --format="%s" -1 origin/master > actual
git log --format="%s" -1 origin/master >actual
) &&
echo three > expected &&
echo three >expected &&
test_cmp expected actual &&
(cd gitrepo && git push && git pull) &&
(
cd bzrrepo &&
echo four > content &&
echo four >content &&
bzr commit -m four
) &&
@ -86,19 +88,19 @@ test_expect_success 'roundtrip' '
(
cd gitrepo &&
echo five > content &&
echo five >content &&
git commit -a -m five &&
git push && git pull
) &&
(cd bzrrepo && bzr revert) &&
echo five > expected &&
cat bzrrepo/content > actual &&
echo five >expected &&
cat bzrrepo/content >actual &&
test_cmp expected actual
'
cat > expected <<EOF
cat >expected <<\EOF
100644 blob 54f9d6da5c91d556e6b54340b1327573073030af content
100755 blob 68769579c3eaadbe555379b9c3538e6628bae1eb executable
120000 blob 6b584e8ece562ebffc15d38808cd6b98fc3d97ea link
@ -107,7 +109,7 @@ EOF
test_expect_success 'special modes' '
(
cd bzrrepo &&
echo exec > executable
echo exec >executable
chmod +x executable &&
bzr add executable
bzr commit -m exec &&
@ -122,21 +124,21 @@ test_expect_success 'special modes' '
(
cd gitrepo &&
git pull
git ls-tree HEAD > ../actual
git ls-tree HEAD >../actual
) &&
test_cmp expected actual &&
(
cd gitrepo &&
git cat-file -p HEAD:link > ../actual
git cat-file -p HEAD:link >../actual
) &&
printf content > expected &&
printf content >expected &&
test_cmp expected actual
'
cat > expected <<EOF
cat >expected <<\EOF
100644 blob 54f9d6da5c91d556e6b54340b1327573073030af content
100755 blob 68769579c3eaadbe555379b9c3538e6628bae1eb executable
120000 blob 6b584e8ece562ebffc15d38808cd6b98fc3d97ea link
@ -147,8 +149,8 @@ test_expect_success 'moving directory' '
(
cd bzrrepo &&
mkdir movedir &&
echo one > movedir/one &&
echo two > movedir/two &&
echo one >movedir/one &&
echo two >movedir/two &&
bzr add movedir &&
bzr commit -m movedir &&
bzr mv movedir movedir-new &&
@ -158,7 +160,7 @@ test_expect_success 'moving directory' '
(
cd gitrepo &&
git pull &&
git ls-tree HEAD > ../actual
git ls-tree HEAD >../actual
) &&
test_cmp expected actual
@ -167,7 +169,7 @@ test_expect_success 'moving directory' '
test_expect_success 'different authors' '
(
cd bzrrepo &&
echo john >> content &&
echo john >>content &&
bzr commit -m john \
--author "Jane Rey <jrey@example.com>" \
--author "John Doe <jdoe@example.com>"
@ -176,10 +178,10 @@ test_expect_success 'different authors' '
(
cd gitrepo &&
git pull &&
git show --format="%an <%ae>, %cn <%ce>" --quiet > ../actual
git show --format="%an <%ae>, %cn <%ce>" --quiet >../actual
) &&
echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" > expected &&
echo "Jane Rey <jrey@example.com>, A U Thor <author@example.com>" >expected &&
test_cmp expected actual
'
@ -196,12 +198,12 @@ test_expect_success 'fetch utf-8 filenames' '
bzr init bzrrepo &&
cd bzrrepo &&
echo test >> "ærø" &&
echo test >>"ærø" &&
bzr add "ærø" &&
echo test >> "ø~?" &&
echo test >>"ø~?" &&
bzr add "ø~?" &&
bzr commit -m add-utf-8 &&
echo test >> "ærø" &&
echo test >>"ærø" &&
bzr commit -m test-utf-8 &&
bzr rm "ø~?" &&
bzr mv "ærø" "ø~?" &&
@ -211,9 +213,9 @@ test_expect_success 'fetch utf-8 filenames' '
(
git clone "bzr::bzrrepo" gitrepo &&
cd gitrepo &&
git -c core.quotepath=false ls-files > ../actual
git -c core.quotepath=false ls-files >../actual
) &&
echo "ø~?" > expected &&
echo "ø~?" >expected &&
test_cmp expected actual
'
@ -229,7 +231,7 @@ test_expect_success 'push utf-8 filenames' '
bzr init bzrrepo &&
cd bzrrepo &&
echo one >> content &&
echo one >>content &&
bzr add content &&
bzr commit -m one
) &&
@ -238,15 +240,15 @@ test_expect_success 'push utf-8 filenames' '
git clone "bzr::bzrrepo" gitrepo &&
cd gitrepo &&
echo test >> "ærø" &&
echo test >>"ærø" &&
git add "ærø" &&
git commit -m utf-8 &&
git push
) &&
(cd bzrrepo && bzr ls > ../actual) &&
printf "content\nærø\n" > expected &&
(cd bzrrepo && bzr ls >../actual) &&
printf "content\nærø\n" >expected &&
test_cmp expected actual
'
@ -256,7 +258,7 @@ test_expect_success 'pushing a merge' '
(
bzr init bzrrepo &&
cd bzrrepo &&
echo one > content &&
echo one >content &&
bzr add content &&
bzr commit -m one
) &&
@ -265,27 +267,27 @@ test_expect_success 'pushing a merge' '
(
cd bzrrepo &&
echo two > content &&
echo two >content &&
bzr commit -m two
) &&
(
cd gitrepo &&
echo three > content &&
echo three >content &&
git commit -a -m three &&
git fetch &&
git merge origin/master || true &&
echo three > content &&
echo three >content &&
git commit -a --no-edit &&
git push
) &&
echo three > expected &&
cat bzrrepo/content > actual &&
echo three >expected &&
cat bzrrepo/content >actual &&
test_cmp expected actual
'
cat > expected <<EOF
cat >expected <<\EOF
origin/HEAD
origin/branch
origin/trunk
@ -299,7 +301,7 @@ test_expect_success 'proper bzr repo' '
(
bzr init bzrrepo/trunk &&
cd bzrrepo/trunk &&
echo one >> content &&
echo one >>content &&
bzr add content &&
bzr commit -m one
) &&
@ -307,14 +309,14 @@ test_expect_success 'proper bzr repo' '
(
bzr branch bzrrepo/trunk bzrrepo/branch &&
cd bzrrepo/branch &&
echo two >> content &&
echo two >>content &&
bzr commit -m one
) &&
(
git clone "bzr::bzrrepo" gitrepo &&
cd gitrepo &&
git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
git for-each-ref --format "%(refname:short)" refs/remotes/origin >../actual
) &&
test_cmp expected actual
@ -327,11 +329,11 @@ test_expect_success 'strip' '
bzr init bzrrepo &&
cd bzrrepo &&
echo one >> content &&
echo one >>content &&
bzr add content &&
bzr commit -m one &&
echo two >> content &&
echo two >>content &&
bzr commit -m two
) &&
@ -341,21 +343,51 @@ test_expect_success 'strip' '
cd bzrrepo &&
bzr uncommit --force &&
echo three >> content &&
echo three >>content &&
bzr commit -m three &&
echo four >> content &&
echo four >>content &&
bzr commit -m four &&
bzr log --line | sed -e "s/^[0-9][0-9]*: //" > ../expected
bzr log --line | sed -e "s/^[0-9][0-9]*: //" >../expected
) &&
(
cd gitrepo &&
git fetch &&
git log --format="%an %ad %s" --date=short origin/master > ../actual
git log --format="%an %ad %s" --date=short origin/master >../actual
) &&
test_cmp expected actual
'
test_expect_success 'export utf-8 authors' '
test_when_finished "rm -rf bzrrepo gitrepo && LC_ALL=C && unset GIT_COMMITTER_NAME" &&
LC_ALL=en_US.UTF-8
export LC_ALL
GIT_COMMITTER_NAME="Grégoire"
export GIT_COMMITTER_NAME
bzr init bzrrepo &&
(
git init gitrepo &&
cd gitrepo &&
echo greg >>content &&
git add content &&
git commit -m one &&
git remote add bzr "bzr::../bzrrepo" &&
git push bzr
) &&
(
cd bzrrepo &&
bzr log | grep "^committer: " >../actual
) &&
echo "committer: Grégoire <committer@example.com>" >expected &&
test_cmp expected actual
'
test_done

52
contrib/remote-helpers/test-hg-bidi.sh
View File

@ -10,12 +10,14 @@ test_description='Test bidirectionality of remote-hg'
. ./test-lib.sh
if ! test_have_prereq PYTHON; then
if ! test_have_prereq PYTHON
then
skip_all='skipping remote-hg tests; python not available'
test_done
fi
if ! python -c 'import mercurial'; then
if ! python -c 'import mercurial'
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
fi
@ -43,7 +45,7 @@ hg_push () {
git checkout -q -b tmp &&
git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
git checkout -q @{-1} &&
git branch -q -D tmp 2> /dev/null || true
git branch -q -D tmp 2>/dev/null || true
)
}
@ -62,7 +64,7 @@ setup () {
echo "tag = -d \"0 0\""
echo "[extensions]"
echo "graphlog ="
) >> "$HOME"/.hgrc &&
) >>"$HOME"/.hgrc &&
git config --global remote-hg.hg-git-compat true
git config --global remote-hg.track-branches true
@ -81,22 +83,22 @@ test_expect_success 'encoding' '
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add älphà" &&
GIT_AUTHOR_NAME="tést èncödîng" &&
export GIT_AUTHOR_NAME &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta" &&
echo gamma > gamma &&
echo gamma >gamma &&
git add gamma &&
git commit -m "add gämmâ" &&
: TODO git config i18n.commitencoding latin-1 &&
echo delta > delta &&
echo delta >delta &&
git add delta &&
git commit -m "add déltà"
) &&
@ -105,8 +107,8 @@ test_expect_success 'encoding' '
git_clone hgrepo gitrepo2 &&
hg_clone gitrepo2 hgrepo2 &&
HGENCODING=utf-8 hg_log hgrepo > expected &&
HGENCODING=utf-8 hg_log hgrepo2 > actual &&
HGENCODING=utf-8 hg_log hgrepo >expected &&
HGENCODING=utf-8 hg_log hgrepo2 >actual &&
test_cmp expected actual
'
@ -117,14 +119,14 @@ test_expect_success 'file removal' '
(
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta"
mkdir foo &&
echo blah > foo/bar &&
echo blah >foo/bar &&
git add foo &&
git commit -m "add foo" &&
git rm alpha &&
@ -137,8 +139,8 @@ test_expect_success 'file removal' '
git_clone hgrepo gitrepo2 &&
hg_clone gitrepo2 hgrepo2 &&
hg_log hgrepo > expected &&
hg_log hgrepo2 > actual &&
hg_log hgrepo >expected &&
hg_log hgrepo2 >actual &&
test_cmp expected actual
'
@ -150,12 +152,12 @@ test_expect_success 'git tags' '
git init -q gitrepo &&
cd gitrepo &&
git config receive.denyCurrentBranch ignore &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
git tag alpha &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta" &&
git tag -a -m "added tag beta" beta
@ -165,8 +167,8 @@ test_expect_success 'git tags' '
git_clone hgrepo gitrepo2 &&
hg_clone gitrepo2 hgrepo2 &&
hg_log hgrepo > expected &&
hg_log hgrepo2 > actual &&
hg_log hgrepo >expected &&
hg_log hgrepo2 >actual &&
test_cmp expected actual
'
@ -178,7 +180,7 @@ test_expect_success 'hg branch' '
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -q -m "add alpha" &&
git checkout -q -b not-master
@ -201,8 +203,8 @@ test_expect_success 'hg branch' '
: Back to the common revision &&
(cd hgrepo && hg checkout default) &&
hg_log hgrepo > expected &&
hg_log hgrepo2 > actual &&
hg_log hgrepo >expected &&
hg_log hgrepo2 >actual &&
test_cmp expected actual
'
@ -214,7 +216,7 @@ test_expect_success 'hg tags' '
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
git checkout -q -b not-master
@ -231,8 +233,8 @@ test_expect_success 'hg tags' '
hg_push hgrepo gitrepo &&
hg_clone gitrepo hgrepo2 &&
hg_log hgrepo > expected &&
hg_log hgrepo2 > actual &&
hg_log hgrepo >expected &&
hg_log hgrepo2 >actual &&
test_cmp expected actual
'

156
contrib/remote-helpers/test-hg-hg-git.sh
View File

@ -10,17 +10,20 @@ test_description='Test remote-hg output compared to hg-git'
. ./test-lib.sh
if ! test_have_prereq PYTHON; then
if ! test_have_prereq PYTHON
then
skip_all='skipping remote-hg tests; python not available'
test_done
fi
if ! python -c 'import mercurial'; then
if ! python -c 'import mercurial'
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
fi
if ! python -c 'import hggit'; then
if ! python -c 'import hggit'
then
skip_all='skipping remote-hg tests; hg-git not available'
test_done
fi
@ -66,7 +69,7 @@ hg_push_git () {
git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
git branch -D default &&
git checkout -q @{-1} &&
git branch -q -D tmp 2> /dev/null || true
git branch -q -D tmp 2>/dev/null || true
)
}
@ -100,7 +103,7 @@ setup () {
echo "hgext.bookmarks ="
echo "hggit ="
echo "graphlog ="
) >> "$HOME"/.hgrc &&
) >>"$HOME"/.hgrc &&
git config --global receive.denycurrentbranch warn
git config --global remote-hg.hg-git-compat true
git config --global remote-hg.track-branches false
@ -121,7 +124,7 @@ test_expect_success 'executable bit' '
(
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
chmod 0644 alpha &&
git add alpha &&
git commit -m "add alpha" &&
@ -133,17 +136,18 @@ test_expect_success 'executable bit' '
git commit -m "clear executable bit"
) &&
for x in hg git; do
for x in hg git
do
(
hg_clone_$x gitrepo hgrepo-$x &&
cd hgrepo-$x &&
hg_log . &&
hg manifest -r 1 -v &&
hg manifest -v
) > output-$x &&
) >"output-$x" &&
git_clone_$x hgrepo-$x gitrepo2-$x &&
git_log gitrepo2-$x > log-$x
git_log gitrepo2-$x >"log-$x"
done &&
test_cmp output-hg output-git &&
@ -156,7 +160,7 @@ test_expect_success 'symlink' '
(
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
ln -s alpha beta &&
@ -164,16 +168,17 @@ test_expect_success 'symlink' '
git commit -m "add beta"
) &&
for x in hg git; do
for x in hg git
do
(
hg_clone_$x gitrepo hgrepo-$x &&
cd hgrepo-$x &&
hg_log . &&
hg manifest -v
) > output-$x &&
) >"output-$x" &&
git_clone_$x hgrepo-$x gitrepo2-$x &&
git_log gitrepo2-$x > log-$x
git_log gitrepo2-$x >"log-$x"
done &&
test_cmp output-hg output-git &&
@ -186,28 +191,29 @@ test_expect_success 'merge conflict 1' '
(
hg init hgrepo1 &&
cd hgrepo1 &&
echo A > afile &&
echo A >afile &&
hg add afile &&
hg ci -m "origin" &&
echo B > afile &&
echo B >afile &&
hg ci -m "A->B" &&
hg up -r0 &&
echo C > afile &&
echo C >afile &&
hg ci -m "A->C" &&
hg merge -r1 &&
echo C > afile &&
echo C >afile &&
hg resolve -m afile &&
hg ci -m "merge to C"
) &&
for x in hg git; do
for x in hg git
do
git_clone_$x hgrepo1 gitrepo-$x &&
hg_clone_$x gitrepo-$x hgrepo2-$x &&
hg_log hgrepo2-$x > hg-log-$x &&
git_log gitrepo-$x > git-log-$x
hg_log hgrepo2-$x >"hg-log-$x" &&
git_log gitrepo-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -220,28 +226,29 @@ test_expect_success 'merge conflict 2' '
(
hg init hgrepo1 &&
cd hgrepo1 &&
echo A > afile &&
echo A >afile &&
hg add afile &&
hg ci -m "origin" &&
echo B > afile &&
echo B >afile &&
hg ci -m "A->B" &&
hg up -r0 &&
echo C > afile &&
echo C >afile &&
hg ci -m "A->C" &&
hg merge -r1 || true &&
echo B > afile &&
echo B >afile &&
hg resolve -m afile &&
hg ci -m "merge to B"
) &&
for x in hg git; do
for x in hg git
do
git_clone_$x hgrepo1 gitrepo-$x &&
hg_clone_$x gitrepo-$x hgrepo2-$x &&
hg_log hgrepo2-$x > hg-log-$x &&
git_log gitrepo-$x > git-log-$x
hg_log hgrepo2-$x >"hg-log-$x" &&
git_log gitrepo-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -254,29 +261,30 @@ test_expect_success 'converged merge' '
(
hg init hgrepo1 &&
cd hgrepo1 &&
echo A > afile &&
echo A >afile &&
hg add afile &&
hg ci -m "origin" &&
echo B > afile &&
echo B >afile &&
hg ci -m "A->B" &&
echo C > afile &&
echo C >afile &&
hg ci -m "B->C" &&
hg up -r0 &&
echo C > afile &&
echo C >afile &&
hg ci -m "A->C" &&
hg merge -r2 || true &&
hg ci -m "merge"
) &&
for x in hg git; do
for x in hg git
do
git_clone_$x hgrepo1 gitrepo-$x &&
hg_clone_$x gitrepo-$x hgrepo2-$x &&
hg_log hgrepo2-$x > hg-log-$x &&
git_log gitrepo-$x > git-log-$x
hg_log hgrepo2-$x >"hg-log-$x" &&
git_log gitrepo-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -290,32 +298,33 @@ test_expect_success 'encoding' '
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add älphà" &&
GIT_AUTHOR_NAME="tést èncödîng" &&
export GIT_AUTHOR_NAME &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta" &&
echo gamma > gamma &&
echo gamma >gamma &&
git add gamma &&
git commit -m "add gämmâ" &&
: TODO git config i18n.commitencoding latin-1 &&
echo delta > delta &&
echo delta >delta &&
git add delta &&
git commit -m "add déltà"
) &&
for x in hg git; do
for x in hg git
do
hg_clone_$x gitrepo hgrepo-$x &&
git_clone_$x hgrepo-$x gitrepo2-$x &&
HGENCODING=utf-8 hg_log hgrepo-$x > hg-log-$x &&
git_log gitrepo2-$x > git-log-$x
HGENCODING=utf-8 hg_log hgrepo-$x >"hg-log-$x" &&
git_log gitrepo2-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -328,14 +337,14 @@ test_expect_success 'file removal' '
(
git init -q gitrepo &&
cd gitrepo &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta"
mkdir foo &&
echo blah > foo/bar &&
echo blah >foo/bar &&
git add foo &&
git commit -m "add foo" &&
git rm alpha &&
@ -344,17 +353,18 @@ test_expect_success 'file removal' '
git commit -m "remove foo/bar"
) &&
for x in hg git; do
for x in hg git
do
(
hg_clone_$x gitrepo hgrepo-$x &&
cd hgrepo-$x &&
hg_log . &&
hg manifest -r 3 &&
hg manifest
) > output-$x &&
) >"output-$x" &&
git_clone_$x hgrepo-$x gitrepo2-$x &&
git_log gitrepo2-$x > log-$x
git_log gitrepo2-$x >"log-$x"
done &&
test_cmp output-hg output-git &&
@ -368,20 +378,21 @@ test_expect_success 'git tags' '
git init -q gitrepo &&
cd gitrepo &&
git config receive.denyCurrentBranch ignore &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
git tag alpha &&
echo beta > beta &&
echo beta >beta &&
git add beta &&
git commit -m "add beta" &&
git tag -a -m "added tag beta" beta
) &&
for x in hg git; do
for x in hg git
do
hg_clone_$x gitrepo hgrepo-$x &&
hg_log hgrepo-$x > log-$x
hg_log hgrepo-$x >"log-$x"
done &&
test_cmp log-hg log-git
@ -390,12 +401,13 @@ test_expect_success 'git tags' '
test_expect_success 'hg author' '
test_when_finished "rm -rf gitrepo* hgrepo*" &&
for x in hg git; do
for x in hg git
do
(
git init -q gitrepo-$x &&
cd gitrepo-$x &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
git checkout -q -b not-master
@ -406,38 +418,38 @@ test_expect_success 'hg author' '
cd hgrepo-$x &&
hg co master &&
echo beta > beta &&
echo beta >beta &&
hg add beta &&
hg commit -u "test" -m "add beta" &&
echo gamma >> beta &&
echo gamma >>beta &&
hg commit -u "test <test@example.com> (comment)" -m "modify beta" &&
echo gamma > gamma &&
echo gamma >gamma &&
hg add gamma &&
hg commit -u "<test@example.com>" -m "add gamma" &&
echo delta > delta &&
echo delta >delta &&
hg add delta &&
hg commit -u "name<test@example.com>" -m "add delta" &&
echo epsilon > epsilon &&
echo epsilon >epsilon &&
hg add epsilon &&
hg commit -u "name <test@example.com" -m "add epsilon" &&
echo zeta > zeta &&
echo zeta >zeta &&
hg add zeta &&
hg commit -u " test " -m "add zeta" &&
echo eta > eta &&
echo eta >eta &&
hg add eta &&
hg commit -u "test < test@example.com >" -m "add eta" &&
echo theta > theta &&
echo theta >theta &&
hg add theta &&
hg commit -u "test >test@example.com>" -m "add theta" &&
echo iota > iota &&
echo iota >iota &&
hg add iota &&
hg commit -u "test <test <at> example <dot> com>" -m "add iota"
) &&
@ -445,8 +457,8 @@ test_expect_success 'hg author' '
hg_push_$x hgrepo-$x gitrepo-$x &&
hg_clone_$x gitrepo-$x hgrepo2-$x &&
hg_log hgrepo2-$x > hg-log-$x &&
git_log gitrepo-$x > git-log-$x
hg_log hgrepo2-$x >"hg-log-$x" &&
git_log gitrepo-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -456,12 +468,13 @@ test_expect_success 'hg author' '
test_expect_success 'hg branch' '
test_when_finished "rm -rf gitrepo* hgrepo*" &&
for x in hg git; do
for x in hg git
do
(
git init -q gitrepo-$x &&
cd gitrepo-$x &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -q -m "add alpha" &&
git checkout -q -b not-master
@ -481,8 +494,8 @@ test_expect_success 'hg branch' '
hg_push_$x hgrepo-$x gitrepo-$x &&
hg_clone_$x gitrepo-$x hgrepo2-$x &&
hg_log hgrepo2-$x > hg-log-$x &&
git_log gitrepo-$x > git-log-$x
hg_log hgrepo2-$x >"hg-log-$x" &&
git_log gitrepo-$x >"git-log-$x"
done &&
test_cmp hg-log-hg hg-log-git &&
@ -492,12 +505,13 @@ test_expect_success 'hg branch' '
test_expect_success 'hg tags' '
test_when_finished "rm -rf gitrepo* hgrepo*" &&
for x in hg git; do
for x in hg git
do
(
git init -q gitrepo-$x &&
cd gitrepo-$x &&
echo alpha > alpha &&
echo alpha >alpha &&
git add alpha &&
git commit -m "add alpha" &&
git checkout -q -b not-master
@ -518,7 +532,7 @@ test_expect_success 'hg tags' '
git --git-dir=gitrepo-$x/.git tag -l &&
hg_log hgrepo2-$x &&
cat hgrepo2-$x/.hgtags
) > output-$x
) >"output-$x"
done &&
test_cmp output-hg output-git

160
contrib/remote-helpers/test-hg.sh
View File

@ -10,40 +10,44 @@ test_description='Test remote-hg'
. ./test-lib.sh
if ! test_have_prereq PYTHON; then
if ! test_have_prereq PYTHON
then
skip_all='skipping remote-hg tests; python not available'
test_done
fi
if ! python -c 'import mercurial'; then
if ! python -c 'import mercurial'
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
fi
check () {
echo $3 > expected &&
git --git-dir=$1/.git log --format='%s' -1 $2 > actual
echo $3 >expected &&
git --git-dir=$1/.git log --format='%s' -1 $2 >actual
test_cmp expected actual
}
check_branch () {
if [ -n "$3" ]; then
echo $3 > expected &&
hg -R $1 log -r $2 --template '{desc}\n' > actual &&
if test -n "$3"
then
echo $3 >expected &&
hg -R $1 log -r $2 --template '{desc}\n' >actual &&
test_cmp expected actual
else
hg -R $1 branches > out &&
hg -R $1 branches >out &&
! grep $2 out
fi
}
check_bookmark () {
if [ -n "$3" ]; then
echo $3 > expected &&
hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' > actual &&
if test -n "$3"
then
echo $3 >expected &&
hg -R $1 log -r "bookmark('$2')" --template '{desc}\n' >actual &&
test_cmp expected actual
else
hg -R $1 bookmarks > out &&
hg -R $1 bookmarks >out &&
! grep $2 out
fi
}
@ -52,7 +56,7 @@ check_push () {
local expected_ret=$1 ret=0 ref_ret=0 IFS=':'
shift
git push origin "$@" 2> error
git push origin "$@" 2>error
ret=$?
cat error
@ -75,10 +79,10 @@ check_push () {
grep "^ [a-f0-9]*\.\.[a-f0-9]* *${branch} -> ${branch}$" error || ref_ret=1
;;
esac
let 'ref_ret' && echo "match for '$branch' failed" && break
test $ref_ret -ne 0 && echo "match for '$branch' failed" && break
done
if let 'expected_ret != ret || ref_ret'
if test $expected_ret -ne $ret -o $ref_ret -ne 0
then
return 1
fi
@ -92,7 +96,7 @@ setup () {
echo "username = H G Wells <wells@example.com>"
echo "[extensions]"
echo "mq ="
) >> "$HOME"/.hgrc &&
) >>"$HOME"/.hgrc &&
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230" &&
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" &&
@ -107,7 +111,7 @@ test_expect_success 'cloning' '
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero
) &&
@ -122,7 +126,7 @@ test_expect_success 'cloning with branches' '
(
cd hgrepo &&
hg branch next &&
echo next > content &&
echo next >content &&
hg commit -m next
) &&
@ -137,7 +141,7 @@ test_expect_success 'cloning with bookmarks' '
cd hgrepo &&
hg checkout default &&
hg bookmark feature-a &&
echo feature-a > content &&
echo feature-a >content &&
hg commit -m feature-a
) &&
@ -157,7 +161,7 @@ test_expect_success 'update bookmark' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git checkout --quiet devel &&
echo devel > content &&
echo devel >content &&
git commit -a -m devel &&
git push --quiet
) &&
@ -172,7 +176,7 @@ test_expect_success 'new bookmark' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git checkout --quiet -b feature-b &&
echo feature-b > content &&
echo feature-b >content &&
git commit -a -m feature-b &&
git push --quiet origin feature-b
) &&
@ -184,9 +188,9 @@ test_expect_success 'new bookmark' '
rm -rf hgrepo
author_test () {
echo $1 >> content &&
echo $1 >>content &&
hg commit -u "$2" -m "add $1" &&
echo "$3" >> ../expected
echo "$3" >>../expected
}
test_expect_success 'authors' '
@ -199,7 +203,7 @@ test_expect_success 'authors' '
touch content &&
hg add content &&
> ../expected &&
>../expected &&
author_test alpha "" "H G Wells <wells@example.com>" &&
author_test beta "test" "test <unknown>" &&
author_test beta "test <test@example.com> (comment)" "test <test@example.com>" &&
@ -214,7 +218,7 @@ test_expect_success 'authors' '
) &&
git clone "hg::hgrepo" gitrepo &&
git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" >actual &&
test_cmp expected actual
'
@ -226,11 +230,11 @@ test_expect_success 'strip' '
hg init hgrepo &&
cd hgrepo &&
echo one >> content &&
echo one >>content &&
hg add content &&
hg commit -m one &&
echo two >> content &&
echo two >>content &&
hg commit -m two
) &&
@ -240,20 +244,20 @@ test_expect_success 'strip' '
cd hgrepo &&
hg strip 1 &&
echo three >> content &&
echo three >>content &&
hg commit -m three &&
echo four >> content &&
echo four >>content &&
hg commit -m four
) &&
(
cd gitrepo &&
git fetch &&
git log --format="%s" origin/master > ../actual
git log --format="%s" origin/master >../actual
) &&
hg -R hgrepo log --template "{desc}\n" > expected &&
hg -R hgrepo log --template "{desc}\n" >expected &&
test_cmp actual expected
'
@ -263,18 +267,18 @@ test_expect_success 'remote push with master bookmark' '
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero &&
hg bookmark master &&
echo one > content &&
echo one >content &&
hg commit -m one
) &&
(
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
echo two > content &&
echo two >content &&
git commit -a -m two &&
git push
) &&
@ -282,7 +286,7 @@ test_expect_success 'remote push with master bookmark' '
check_branch hgrepo default two
'
cat > expected <<EOF
cat >expected <<\EOF
changeset: 0:6e2126489d3d
tag: tip
user: A U Thor <author@example.com>
@ -300,13 +304,13 @@ test_expect_success 'remote push from master branch' '
git init gitrepo &&
cd gitrepo &&
git remote add origin "hg::../hgrepo" &&
echo one > content &&
echo one >content &&
git add content &&
git commit -a -m one &&
git push origin master
) &&
hg -R hgrepo log > actual &&
hg -R hgrepo log >actual &&
cat actual &&
test_cmp expected actual &&
@ -322,7 +326,7 @@ test_expect_success 'remote cloning' '
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero
) &&
@ -343,7 +347,7 @@ test_expect_success 'remote update bookmark' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git checkout --quiet devel &&
echo devel > content &&
echo devel >content &&
git commit -a -m devel &&
git push --quiet
) &&
@ -358,7 +362,7 @@ test_expect_success 'remote new bookmark' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git checkout --quiet -b feature-b &&
echo feature-b > content &&
echo feature-b >content &&
git commit -a -m feature-b &&
git push --quiet origin feature-b
) &&
@ -374,15 +378,15 @@ test_expect_success 'remote push diverged' '
(
cd hgrepo &&
hg checkout default &&
echo bump > content &&
echo bump >content &&
hg commit -m bump
) &&
(
cd gitrepo &&
echo diverge > content &&
echo diverge >content &&
git commit -a -m diverged &&
check_push 1 <<-EOF
check_push 1 <<-\EOF
master:non-fast-forward
EOF
) &&
@ -403,16 +407,16 @@ test_expect_success 'remote update bookmark diverge' '
(
cd hgrepo &&
echo "bump bookmark" > content &&
echo "bump bookmark" >content &&
hg commit -m "bump bookmark"
) &&
(
cd gitrepo &&
git checkout --quiet diverge &&
echo diverge > content &&
echo diverge >content &&
git commit -a -m diverge &&
check_push 1 <<-EOF
check_push 1 <<-\EOF
diverge:fetch-first
EOF
) &&
@ -427,7 +431,7 @@ test_expect_success 'remote new bookmark multiple branch head' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git checkout --quiet -b feature-c HEAD^ &&
echo feature-c > content &&
echo feature-c >content &&
git commit -a -m feature-c &&
git push --quiet origin feature-c
) &&
@ -442,20 +446,20 @@ setup_big_push () {
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero &&
hg bookmark bad_bmark1 &&
echo one > content &&
echo one >content &&
hg commit -m one &&
hg bookmark bad_bmark2 &&
hg bookmark good_bmark &&
hg bookmark -i good_bmark &&
hg -q branch good_branch &&
echo "good branch" > content &&
echo "good branch" >content &&
hg commit -m "good branch" &&
hg -q branch bad_branch &&
echo "bad branch" > content &&
echo "bad branch" >content &&
hg commit -m "bad branch"
) &&
@ -463,40 +467,40 @@ setup_big_push () {
(
cd gitrepo &&
echo two > content &&
echo two >content &&
git commit -q -a -m two &&
git checkout -q good_bmark &&
echo three > content &&
echo three >content &&
git commit -q -a -m three &&
git checkout -q bad_bmark1 &&
git reset --hard HEAD^ &&
echo four > content &&
echo four >content &&
git commit -q -a -m four &&
git checkout -q bad_bmark2 &&
git reset --hard HEAD^ &&
echo five > content &&
echo five >content &&
git commit -q -a -m five &&
git checkout -q -b new_bmark master &&
echo six > content &&
echo six >content &&
git commit -q -a -m six &&
git checkout -q branches/good_branch &&
echo seven > content &&
echo seven >content &&
git commit -q -a -m seven &&
echo eight > content &&
echo eight >content &&
git commit -q -a -m eight &&
git checkout -q branches/bad_branch &&
git reset --hard HEAD^ &&
echo nine > content &&
echo nine >content &&
git commit -q -a -m nine &&
git checkout -q -b branches/new_branch master &&
echo ten > content &&
echo ten >content &&
git commit -q -a -m ten
)
}
@ -509,7 +513,7 @@ test_expect_success 'remote big push' '
(
cd gitrepo &&
check_push 1 --all <<-EOF
check_push 1 --all <<-\EOF
master
good_bmark
branches/good_branch
@ -537,17 +541,17 @@ test_expect_success 'remote big push fetch first' '
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero &&
hg bookmark bad_bmark &&
hg bookmark good_bmark &&
hg bookmark -i good_bmark &&
hg -q branch good_branch &&
echo "good branch" > content &&
echo "good branch" >content &&
hg commit -m "good branch" &&
hg -q branch bad_branch &&
echo "bad branch" > content &&
echo "bad branch" >content &&
hg commit -m "bad branch"
) &&
@ -556,39 +560,37 @@ test_expect_success 'remote big push fetch first' '
(
cd hgrepo &&
hg bookmark -f bad_bmark &&
echo update_bmark > content &&
echo update_bmark >content &&
hg commit -m "update bmark"
) &&
(
cd gitrepo &&
echo two > content &&
echo two >content &&
git commit -q -a -m two &&
git checkout -q good_bmark &&
echo three > content &&
echo three >content &&
git commit -q -a -m three &&
git checkout -q bad_bmark &&
echo four > content &&
echo four >content &&
git commit -q -a -m four &&
git checkout -q branches/bad_branch &&
echo five > content &&
echo five >content &&
git commit -q -a -m five &&
check_push 1 --all <<-EOF
check_push 1 --all <<-\EOF &&
master
good_bmark
new_bmark:new
new_branch:new
bad_bmark:fetch-first
branches/bad_branch:festch-first
EOF
git fetch &&
check_push 1 --all <<-EOF
check_push 1 --all <<-\EOF
master
good_bmark
bad_bmark:non-fast-forward
@ -605,7 +607,7 @@ test_expect_failure 'remote big push force' '
(
cd gitrepo &&
check_push 0 --force --all <<-EOF
check_push 0 --force --all <<-\EOF
master
good_bmark
branches/good_branch
@ -635,7 +637,7 @@ test_expect_failure 'remote big push dry-run' '
(
cd gitrepo &&
check_push 0 --dry-run --all <<-EOF
check_push 1 --dry-run --all <<-\EOF &&
master
good_bmark
branches/good_branch
@ -646,7 +648,7 @@ test_expect_failure 'remote big push dry-run' '
branches/bad_branch:non-fast-forward
EOF
check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-EOF
check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF
master
good_bmark
branches/good_branch
@ -671,10 +673,10 @@ test_expect_success 'remote double failed push' '
(
hg init hgrepo &&
cd hgrepo &&
echo zero > content &&
echo zero >content &&
hg add content &&
hg commit -m zero &&
echo one > content &&
echo one >content &&
hg commit -m one
) &&
@ -682,7 +684,7 @@ test_expect_success 'remote double failed push' '
git clone "hg::hgrepo" gitrepo &&
cd gitrepo &&
git reset --hard HEAD^ &&
echo two > content &&
echo two >content &&
git commit -a -m two &&
test_expect_code 1 git push &&
test_expect_code 1 git push