From: Felipe Contreras Date: Thu, 25 Apr 2013 11:25:37 +0000 (-0500) Subject: remote-bzr: use proper push method X-Git-Tag: v1.8.3-rc0~15^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbd3f0e53ca9b88709ceadea48d9383c7ffa9382?ds=inline;hp=--cc remote-bzr: use proper push method Do not just randomly synchronize the revisions with no checks at all. I don't have any evidence that there's anything wrong with the current code, which Bazaar seems to use, but for different purposes. Let's use the logic Bazaar UI uses to avoid surprises. Also, add a non-ff check. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- fbd3f0e53ca9b88709ceadea48d9383c7ffa9382 diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index fad4a48cdc..6fedc28afb 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -630,12 +630,12 @@ def do_export(parser): for ref, revid in parsed_refs.iteritems(): if ref == 'refs/heads/master': repo.generate_revision_history(revid, marks.get_tip('master')) - revno, revid = repo.last_revision_info() if peer: - if hasattr(peer, "import_last_revision_info_and_tags"): - peer.import_last_revision_info_and_tags(repo, revno, revid) - else: - peer.import_last_revision_info(repo.repository, revno, revid) + try: + repo.push(peer, stop_revision=revid) + except bzrlib.errors.DivergedBranches: + print "error %s non-fast forward" % ref + continue else: wt = repo.bzrdir.open_workingtree() wt.update()