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 34/48] remote-hg: implement custom checkheads()
Date: Fri, 24 May 2013 21:29:50 -0500 [thread overview]
Message-ID: <1369449004-17981-35-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369449004-17981-1-git-send-email-felipe.contreras@gmail.com>
The version from Mercurial is extremely inefficient and convoluted, this
version achieves basically the same, at least for our purposes.
No functional changes.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/remote-helpers/git-remote-hg | 52 +++++++++++++++++++++++++++++++++---
1 file changed, 49 insertions(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index c2c1cb8..7eb809b 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -12,7 +12,7 @@
# For remote repositories a local clone is stored in
# "$GIT_DIR/hg/origin/clone/.hg/".
-from mercurial import hg, ui, bookmarks, context, encoding, node, error, extensions, discovery
+from mercurial import hg, ui, bookmarks, context, encoding, node, error, extensions, discovery, util
import re
import sys
@@ -86,6 +86,11 @@ def hgref(ref):
def gitref(ref):
return ref.replace(' ', '___')
+def check_version(*check):
+ if not hg_version:
+ return True
+ return hg_version >= check
+
def get_config(config):
cmd = ['git', 'config', '--get', config]
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -854,6 +859,42 @@ def write_tag(repo, tag, node, msg, author):
return tagnode
+def checkheads(repo, remote, p_revs):
+
+ remotemap = remote.branchmap()
+ if not remotemap:
+ # empty repo
+ return
+
+ new = {}
+
+ for node in p_revs:
+ ctx = repo[node]
+ branch = ctx.branch()
+ if not branch in remotemap:
+ # new branch
+ continue
+ new.setdefault(branch, []).append(ctx.rev())
+
+ for branch, heads in new.iteritems():
+ old = [repo.changelog.rev(x) for x in remotemap[branch]]
+ for rev in heads:
+ if check_version(2, 3):
+ ancestors = repo.changelog.ancestors([rev], stoprev=min(old))
+ else:
+ ancestors = repo.changelog.ancestors(rev)
+ found = False
+
+ for x in old:
+ if x in ancestors:
+ found = True
+ break
+
+ if found:
+ continue
+
+ raise Exception("non-fast-forward")
+
def push_unsafe(repo, remote, parsed_refs, p_revs):
force = force_push
@@ -862,7 +903,8 @@ def push_unsafe(repo, remote, parsed_refs, p_revs):
commoninc = fci(repo, remote, force=force)
common, _, remoteheads = commoninc
- # TODO checkheads
+ if not force:
+ checkheads(repo, remote, p_revs)
cg = repo.getbundle('push', heads=list(p_revs), common=common)
@@ -991,7 +1033,7 @@ def main(args):
global track_branches, force_push, is_tmp
global parsed_tags
global filenodes
- global fake_bmark
+ global fake_bmark, hg_version
alias = args[1]
url = args[2]
@@ -1026,6 +1068,10 @@ def main(args):
parsed_tags = {}
filenodes = {}
fake_bmark = None
+ try:
+ hg_version = tuple(int(e) for e in util.version().split('.'))
+ except:
+ hg_version = None
repo = get_repo(url, alias)
prefix = 'refs/hg/%s' % alias
--
1.8.3.rc3.312.g47657de
next prev parent reply other threads:[~2013-05-25 2:33 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 ` Felipe Contreras [this message]
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 ` [PATCH v2 47/48] remote-hg: add support for --dry-run Felipe Contreras
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-35-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).