From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 47/48] remote-hg: add support for --dry-run
Date: Fri, 24 May 2013 21:30:03 -0500 [thread overview]
Message-ID: <1369449004-17981-48-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369449004-17981-1-git-send-email-felipe.contreras@gmail.com>
This needs a specific patch from Git not applied yet.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/remote-helpers/git-remote-hg | 29 +++++++++++++++++++++++++--
contrib/remote-helpers/test-hg.sh | 38 ++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index b983627..20abb34 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -557,6 +557,7 @@ def do_capabilities(parser):
if os.path.exists(path):
print "*import-marks %s" % path
print "*export-marks %s" % path
+ print "option"
print
@@ -724,6 +725,11 @@ def parse_commit(parser):
die('Unknown file command: %s' % line)
files[path] = f
+ # only export the commits if we are on an internal proxy repo
+ if dry_run and not peer:
+ parsed_refs[ref] = None
+ return
+
def getfilectx(repo, memctx, f):
of = files[f]
if 'deleted' in of:
@@ -809,7 +815,10 @@ def parse_reset(parser):
from_mark = parser.get_mark()
parser.next()
- rev = mark_to_rev(from_mark)
+ try:
+ rev = mark_to_rev(from_mark)
+ except KeyError:
+ rev = None
parsed_refs[ref] = rev
def parse_tag(parser):
@@ -1007,7 +1016,7 @@ def do_export(parser):
need_fetch = False
for ref, node in parsed_refs.iteritems():
- bnode = hgbin(node)
+ bnode = hgbin(node) if node else None
if ref.startswith('refs/heads/branches'):
branch = ref[len('refs/heads/branches/'):]
if branch in branches and bnode in branches[branch]:
@@ -1048,6 +1057,9 @@ def do_export(parser):
p_revs[bnode] = ref
elif ref.startswith('refs/tags/'):
+ if dry_run:
+ print "ok %s" % ref
+ continue
tag = ref[len('refs/tags/'):]
tag = hgref(tag)
author, msg = parsed_tags.get(tag, (None, None))
@@ -1097,6 +1109,15 @@ def do_export(parser):
print
+def do_option(parser):
+ global dry_run
+ _, key, value = parser.line.split(' ')
+ if key == 'dry-run':
+ dry_run = (value == 'true')
+ print 'ok'
+ else:
+ print 'unsupported'
+
def fix_path(alias, repo, orig_url):
url = urlparse.urlparse(orig_url, 'file')
if url.scheme != 'file' or os.path.isabs(url.path):
@@ -1113,6 +1134,7 @@ def main(args):
global parsed_tags
global filenodes
global fake_bmark, hg_version
+ global dry_run
alias = args[1]
url = args[2]
@@ -1151,6 +1173,7 @@ def main(args):
hg_version = tuple(int(e) for e in util.version().split('.'))
except:
hg_version = None
+ dry_run = False
repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias
@@ -1175,6 +1198,8 @@ def main(args):
do_import(parser)
elif parser.check('export'):
do_export(parser)
+ elif parser.check('option'):
+ do_option(parser)
else:
die('unhandled command: %s' % line)
sys.stdout.flush()
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 91ddac7..bf3635e 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -594,6 +594,44 @@ test_expect_success 'remote big push fetch first' '
)
'
+test_expect_failure 'remote big push dry-run' '
+ test_when_finished "rm -rf hgrepo gitrepo*" &&
+
+ setup_big_push
+
+ (
+ cd gitrepo &&
+
+ check_push 0 --dry-run --all <<-EOF
+ master
+ good_bmark
+ branches/good_branch
+ new_bmark:new
+ branches/new_branch:new
+ bad_bmark1:non-fast-forward
+ bad_bmark2:non-fast-forward
+ branches/bad_branch:non-fast-forward
+ EOF
+
+ check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-EOF
+ master
+ good_bmark
+ branches/good_branch
+ new_bmark:new
+ branches/new_branch:new
+ EOF
+ ) &&
+
+ check_branch hgrepo default one &&
+ check_branch hgrepo good_branch "good branch" &&
+ check_branch hgrepo bad_branch "bad branch" &&
+ check_branch hgrepo new_branch '' &&
+ check_bookmark hgrepo good_bmark one &&
+ check_bookmark hgrepo bad_bmark1 one &&
+ check_bookmark hgrepo bad_bmark2 one &&
+ check_bookmark hgrepo new_bmark ''
+'
+
test_expect_success 'remote double failed push' '
test_when_finished "rm -rf hgrepo gitrepo*" &&
--
1.8.3.rc3.312.g47657de
next prev parent reply other threads:[~2013-05-25 2:34 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-25 2:29 [PATCH v2 00/48] remote-hg: fixes for next Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 01/48] remote-hg: test: be a little more quiet Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 02/48] remote-hg: trivial reorganization Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 03/48] remote-helpers: test: cleanup white-spaces Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 04/48] remote-helpers: test: cleanup style Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 05/48] remote-helpers: tests: general improvements Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 06/48] remote-helpers: test: simplify remote URLs Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 07/48] remote-hg: test: simplify previous branch checkout Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 08/48] remote-hg: load all extensions Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 09/48] remote-hg: use a shared repository store Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 10/48] remote-hg: shuffle some code Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 11/48] remote-hg: improve node traversing Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 12/48] remote-hg: add version checks to the marks Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 13/48] remote-hg: switch from revisions to SHA-1 noteids Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 14/48] remote-hg: upgrade version 1 marks Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 15/48] remote-hg: ensure remote rebasing works Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 16/48] remote-hg: trivial cleanups Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 17/48] remote-hg: improve progress calculation Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 18/48] remote-hg: always point HEAD to master Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 19/48] remote-hg: add tests for 'master' bookmark Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 20/48] remote-bzr: simplify test checks Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 21/48] remote-hg: add check_bookmark() test helper Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 22/48] remote-hg: update bookmarks when using a remote Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 23/48] remote-hg: add remote tests Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 24/48] remote-hg: add test to push new bookmark Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 25/48] remote-hg: add test for diverged push Felipe Contreras
2013-05-25 6:28 ` Eric Sunshine
2013-05-25 2:29 ` [PATCH v2 26/48] remote-hg: add test for bookmark diverge Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 27/48] remote-hg: add test for new bookmark special Felipe Contreras
2013-05-25 6:27 ` Eric Sunshine
2013-05-25 2:29 ` [PATCH v2 28/48] remote-hg: add test for big push Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 29/48] remote-hg: add test for failed double push Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 30/48] remote-hg: reorganize bookmark handling Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 31/48] remote-hg: force remote bookmark push selectively Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 32/48] remote-hg: only update necessary revisions Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 33/48] remote-hg: implement custom push() Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 34/48] remote-hg: implement custom checkheads() Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 35/48] remote-hg: pass around revision refs Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 36/48] remote-hg: check diverged bookmarks Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 37/48] remote-hg: simplify branch_tip() Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 38/48] remote-hg: improve branch listing Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 39/48] remote-hg: use remote 'default' not local one Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 40/48] remote-hg: improve lightweight tag author Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 41/48] remote-hg: remove files before modifications Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 42/48] remote-hg: add setup_big_push() helper Felipe Contreras
2013-05-25 2:29 ` [PATCH v2 43/48] remote-hg: add check_push() helper Felipe Contreras
2013-05-25 2:30 ` [PATCH v2 44/48] remote-helpers: improve marks usage Felipe Contreras
2013-05-25 2:30 ` [PATCH v2 45/48] remote-hg: trivial cleanup Felipe Contreras
2013-05-25 2:30 ` [PATCH v2 46/48] remote-hg: check if a fetch is needed Felipe Contreras
2013-05-25 2:30 ` Felipe Contreras [this message]
2013-05-25 2:30 ` [PATCH v2 48/48] remote-hg: add support for --force Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369449004-17981-48-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).