# [PATCH 0/4] remote-helpers: general fixes 8 messages from 2012-11-28 to 2012-11-28. Participants: Felipe Contreras, Junio C Hamano. Thread: https://gitlist.dev/t/32220 ## Felipe Contreras, 2012-11-28 01:01 Subject: [PATCH 0/4] remote-helpers: general fixes Message-ID: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1354064495-23171-1-git-send-email-felipe.contreras%40gmail.com ``` Hi, These are general fixes, some for old versions of bazaar, mercurial, and python. Some of these have already been sent, but here they go alone so they are not missed. The bazaar fixes are on top of the series v3 which is still not in 'pu'. Felipe Contreras (4): remote-hg: fix for files with spaces remote-hg: fix for older versions of python remote-bzr: add support for older versions of bzr remote-bzr: detect local repositories contrib/remote-helpers/git-remote-bzr | 54 +++++++++++++++++++++-------------- contrib/remote-helpers/git-remote-hg | 14 +++++---- 2 files changed, 42 insertions(+), 26 deletions(-) -- 1.8.0 ``` ## Felipe Contreras, 2012-11-28 01:01 Subject: [PATCH 1/4] remote-hg: fix for files with spaces Message-ID: <1354064495-23171-2-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1354064495-23171-2-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> ``` Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 07754bd..62c39db 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -565,7 +565,7 @@ def parse_commit(parser): for line in parser: if parser.check('M'): - t, m, mark_ref, path = line.split(' ') + t, m, mark_ref, path = line.split(' ', 3) mark = int(mark_ref[1:]) f = { 'mode' : hgmode(m), 'data' : blob_marks[mark] } elif parser.check('D'): -- 1.8.0 ``` ## Felipe Contreras, 2012-11-28 01:01 Subject: [PATCH 2/4] remote-hg: fix for older versions of python Message-ID: <1354064495-23171-3-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1354064495-23171-3-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> ``` As Amit Bakshi reported, older versions of python (< 2.7) don't have subprocess.check_output, so let's use subprocess.Popen directly as suggested. Suggested-by: Amit Bakshi Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 62c39db..016cdad 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -56,6 +56,12 @@ def hgmode(mode): m = { '0100755': 'x', '0120000': 'l' } return m.get(mode, '') +def get_config(config): + cmd = ['git', 'config', '--get', config] + process = subprocess.Popen(cmd, stdout=subprocess.PIPE) + output, _ = process.communicate() + return output + class Marks: def __init__(self, path): @@ -727,12 +733,10 @@ def main(args): hg_git_compat = False track_branches = True try: - cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat'] - if subprocess.check_output(cmd) == 'true\n': + if get_config('remote-hg.hg-git-compat') == 'true\n': hg_git_compat = True track_branches = False - cmd = ['git', 'config', '--get', 'remote-hg.track-branches'] - if subprocess.check_output(cmd) == 'false\n': + if get_config('remote-hg.track-branches') == 'false\n': track_branches = False except subprocess.CalledProcessError: pass -- 1.8.0 ``` ## Felipe Contreras, 2012-11-28 01:01 Subject: [PATCH 3/4] remote-bzr: add support for older versions of bzr Message-ID: <1354064495-23171-4-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1354064495-23171-4-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> ``` At least as old as 2.0. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index f8919f4..6cdfac6 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -17,7 +17,8 @@ import sys import bzrlib -bzrlib.initialize() +if hasattr(bzrlib, "initialize"): + bzrlib.initialize() import bzrlib.plugin bzrlib.plugin.load_plugins() @@ -553,7 +554,7 @@ def parse_commit(parser): repo.lock_write() try: - builder = repo.get_commit_builder(parents, None, date, tz, committer, props, revid, False) + builder = repo.get_commit_builder(parents, None, date, tz, committer, props, revid) try: list(builder.record_iter_changes(mtree, mtree.last_revision(), changes)) builder.finish_inventory() @@ -612,7 +613,10 @@ def do_export(parser): if ref == 'refs/heads/master': repo.generate_revision_history(revid, marks.get_tip('master')) revno, revid = repo.last_revision_info() - peer.import_last_revision_info_and_tags(repo, revno, revid) + 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) wt = peer.bzrdir.open_workingtree() wt.update() print "ok %s" % ref @@ -646,12 +650,12 @@ def get_repo(url, alias): global dirname, peer clone_path = os.path.join(dirname, 'clone') - origin = bzrlib.controldir.ControlDir.open(url) + origin = bzrlib.bzrdir.BzrDir.open(url) remote_branch = origin.open_branch() if os.path.exists(clone_path): # pull - d = bzrlib.controldir.ControlDir.open(clone_path) + d = bzrlib.bzrdir.BzrDir.open(clone_path) branch = d.open_branch() result = branch.pull(remote_branch, [], None, False) else: -- 1.8.0 ``` ## Felipe Contreras, 2012-11-28 01:01 Subject: [PATCH 4/4] remote-bzr: detect local repositories Message-ID: <1354064495-23171-5-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1354064495-23171-5-git-send-email-felipe.contreras%40gmail.com In-Reply-To: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> ``` So we don't create a clone unnecessarily. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 48 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 6cdfac6..c5822e4 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -24,6 +24,7 @@ import bzrlib.plugin bzrlib.plugin.load_plugins() import bzrlib.generate_ids +import bzrlib.transport import sys import os @@ -613,11 +614,14 @@ def do_export(parser): if ref == 'refs/heads/master': repo.generate_revision_history(revid, marks.get_tip('master')) revno, revid = repo.last_revision_info() - if hasattr(peer, "import_last_revision_info_and_tags"): - peer.import_last_revision_info_and_tags(repo, revno, revid) + 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) + wt = peer.bzrdir.open_workingtree() else: - peer.import_last_revision_info(repo.repository, revno, revid) - wt = peer.bzrdir.open_workingtree() + wt = repo.bzrdir.open_workingtree() wt.update() print "ok %s" % ref print @@ -649,24 +653,28 @@ def do_list(parser): def get_repo(url, alias): global dirname, peer - clone_path = os.path.join(dirname, 'clone') origin = bzrlib.bzrdir.BzrDir.open(url) - remote_branch = origin.open_branch() - - if os.path.exists(clone_path): - # pull - d = bzrlib.bzrdir.BzrDir.open(clone_path) - branch = d.open_branch() - result = branch.pull(remote_branch, [], None, False) + branch = origin.open_branch() + + if not isinstance(origin.transport, bzrlib.transport.local.LocalTransport): + clone_path = os.path.join(dirname, 'clone') + remote_branch = branch + if os.path.exists(clone_path): + # pull + d = bzrlib.bzrdir.BzrDir.open(clone_path) + branch = d.open_branch() + result = branch.pull(remote_branch, [], None, False) + else: + # clone + d = origin.sprout(clone_path, None, + hardlink=True, create_tree_if_local=False, + source_branch=remote_branch) + branch = d.open_branch() + branch.bind(remote_branch) + + peer = remote_branch else: - # clone - d = origin.sprout(clone_path, None, - hardlink=True, create_tree_if_local=False, - source_branch=remote_branch) - branch = d.open_branch() - branch.bind(remote_branch) - - peer = remote_branch + peer = None return branch -- 1.8.0 ``` ## Junio C Hamano, 2012-11-28 02:02 Subject: Re: [PATCH 0/4] remote-helpers: general fixes Message-ID: <7vfw3ujxh8.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vfw3ujxh8.fsf%40alter.siamese.dyndns.org In-Reply-To: <1354064495-23171-1-git-send-email-felipe.contreras@gmail.com> ``` Felipe Contreras writes: > These are general fixes, some for old versions of bazaar, mercurial, and > python. Some of these have already been sent, but here they go alone so they > are not missed. > > The bazaar fixes are on top of the series v3 which is still not in 'pu'. Please stop then. Its v2 has been cooking in 'next' and it won't be replaced. ``` ## Felipe Contreras, 2012-11-28 02:26 Subject: Re: [PATCH 0/4] remote-helpers: general fixes Message-ID: URL: https://gitlist.dev/e/CAMP44s0JK8b4bfTyXBeL9Q%2BcebuMC0qfdz673jkvTc7%2BUoy-mw%40mail.gmail.com In-Reply-To: <7vfw3ujxh8.fsf@alter.siamese.dyndns.org> ``` On Wed, Nov 28, 2012 at 3:02 AM, Junio C Hamano wrote: > Felipe Contreras writes: > >> These are general fixes, some for old versions of bazaar, mercurial, and >> python. Some of these have already been sent, but here they go alone so they >> are not missed. >> >> The bazaar fixes are on top of the series v3 which is still not in 'pu'. > > Please stop then. Its v2 has been cooking in 'next' and it won't be > replaced. Cooking since when? 9 days ago? I sent the series 17 days ago. But suit yourself. I re-rolled for a reason. -- Felipe Contreras ``` ## Junio C Hamano, 2012-11-28 02:30 Subject: Re: [PATCH 0/4] remote-helpers: general fixes Message-ID: <7vtxsaihml.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vtxsaihml.fsf%40alter.siamese.dyndns.org In-Reply-To: <7vfw3ujxh8.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Felipe Contreras writes: > >> These are general fixes, some for old versions of bazaar, mercurial, and >> python. Some of these have already been sent, but here they go alone so they >> are not missed. >> >> The bazaar fixes are on top of the series v3 which is still not in 'pu'. > > Please stop then. Its v2 has been cooking in 'next' and it won't be > replaced. Picked up the -hg bit. The other two has to wait until fc/remote-bzr gets updated (but see other thread). ```