{"thread":{"id":"33721","subject":"[PATCH 0/2] remote-bzr: couple of fixes","startedAt":"2013-05-04T00:22:35Z","lastAt":"2013-05-04T00:32:16Z","messageCount":4,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"216388","messageId":"1367626957-13858-1-git-send-email-felipe.contreras@gmail.com","threadId":"33721","inReplyTo":null,"subject":"[PATCH 0/2] remote-bzr: couple of fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-04T00:22:35Z","receivedAt":"2013-05-04T00:22:35Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nA few fixes to be applied on top of the massive changes already queued. Nothing major.\n\nFelipe Contreras (2):\n remote-bzr: convert all unicode keys to str\n remote-bzr: avoid bad refs\n\n contrib/remote-helpers/git-remote-bzr | 32 ++++++++++++++++++++------------\n 1 file changed, 20 insertions(+), 12 deletions(-)\n\n-- \n1.8.3.rc0.401.g45bba44\n"},{"id":"216389","messageId":"1367626957-13858-2-git-send-email-felipe.contreras@gmail.com","threadId":"33721","inReplyTo":"1367626957-13858-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/2] remote-bzr: convert all unicode keys to str","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-04T00:22:36Z","receivedAt":"2013-05-04T00:22:36Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Otherwise some versions of bazaar might barf.\n\nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-bzr | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex 161f831..bbaaa8f 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -95,7 +95,7 @@ class Marks:\n return self.marks[rev]\n \n def to_rev(self, mark):\n- return self.rev_marks[mark]\n+ return str(self.rev_marks[mark])\n \n def next_mark(self):\n self.last_mark += 1\n@@ -621,7 +621,7 @@ def parse_commit(parser):\n files[path] = f\n \n committer, date, tz = committer\n- parents = [str(mark_to_rev(p)) for p in parents]\n+ parents = [mark_to_rev(p) for p in parents]\n revid = bzrlib.generate_ids.gen_revision_id(committer, date)\n props = {}\n props['branch-nick'] = branch.nick\n-- \n1.8.3.rc0.401.g45bba44\n"},{"id":"216390","messageId":"1367626957-13858-3-git-send-email-felipe.contreras@gmail.com","threadId":"33721","inReplyTo":"1367626957-13858-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/2] remote-bzr: avoid bad refs","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-04T00:22:37Z","receivedAt":"2013-05-04T00:22:37Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Turns out fast-export throws bad 'reset' commands because of a behavior\nin transport-helper that is not even needed.\n\nWe should ignore them, otherwise we will threat them as branches and\nfail.\n\nThis was fixed in v1.8.2, but some people use this script in older\nversions of git.\n\nAlso, check if the ref was a tag, and skip it for now.\n\nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-bzr | 28 ++++++++++++++++++----------\n 1 file changed, 18 insertions(+), 10 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex bbaaa8f..1f48b00 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -682,23 +682,31 @@ def do_export(parser):\n die('unhandled export command: %s' % line)\n \n for ref, revid in parsed_refs.iteritems():\n- name = ref[len('refs/heads/'):]\n- branch = bzrlib.branch.Branch.open(branches[name])\n- branch.generate_revision_history(revid, marks.get_tip(name))\n+ if ref.startswith('refs/heads/'):\n+ name = ref[len('refs/heads/'):]\n+ branch = bzrlib.branch.Branch.open(branches[name])\n+ branch.generate_revision_history(revid, marks.get_tip(name))\n \n- if name in peers:\n- peer = bzrlib.branch.Branch.open(peers[name])\n+ if name in peers:\n+ peer = bzrlib.branch.Branch.open(peers[name])\n try:\n peer.bzrdir.push_branch(branch, revision_id=revid)\n except bzrlib.errors.DivergedBranches:\n print \"error %s non-fast forward\" % ref\n continue\n \n- try:\n- wt = branch.bzrdir.open_workingtree()\n- wt.update()\n- except bzrlib.errors.NoWorkingTree:\n- pass\n+ try:\n+ wt = branch.bzrdir.open_workingtree()\n+ wt.update()\n+ except bzrlib.errors.NoWorkingTree:\n+ pass\n+ elif ref.startswith('refs/tags/'):\n+ # TODO: implement tag push\n+ print \"error %s pushing tags not supported\" % ref\n+ continue\n+ else:\n+ # transport-helper/fast-export bugs\n+ continue\n \n print \"ok %s\" % ref\n \n-- \n1.8.3.rc0.401.g45bba44\n"},{"id":"216391","messageId":"CAMP44s02Mf2PqGg=zJe-szKdUYb1tg5ryU8ykWcMPTSEB7qsgw@mail.gmail.com","threadId":"33721","inReplyTo":"1367626957-13858-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH 0/2] remote-bzr: couple of fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-04T00:32:16Z","receivedAt":"2013-05-04T00:32:16Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, May 3, 2013 at 7:22 PM, Felipe Contreras\n wrote:\n> A few fixes to be applied on top of the massive changes already queued. Nothing major.\n>\n> Felipe Contreras (2):\n> remote-bzr: convert all unicode keys to str\n> remote-bzr: avoid bad refs\n\nThere's a problem with the second patch. Re-rolling.\n\n-- \nFelipe Contreras\n"}]}