{"thread":{"id":"33836","subject":"[PATCH 0/8] remote-bzr: patches for next","startedAt":"2013-05-16T08:36:39Z","lastAt":"2013-05-16T23:38:17Z","messageCount":12,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"217528","messageId":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":null,"subject":"[PATCH 0/8] remote-bzr: patches for next","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:39Z","receivedAt":"2013-05-16T08:36:39Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nThese patches have been cooking in my github repository, and improve the\nsituation when bzr servers don't support repositories properly.\n\nFelipe Contreras (8):\n  remote-bzr: recover from failed clones\n  remote-bzr: fix for files with spaces\n  remote-bzr: simplify get_remote_branch()\n  remote-bzr: delay cloning/pulling\n  remote-bzr: change global repo\n  remote-bzr: trivial cleanups\n  remote-bzr: reorganize the way 'wanted' works\n  remote-bzr: add fallback check for a partial clone\n\n contrib/remote-helpers/git-remote-bzr | 102 +++++++++++++++++-----------------\n 1 file changed, 50 insertions(+), 52 deletions(-)\n\n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217530","messageId":"1368693407-21267-2-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/8] remote-bzr: recover from failed clones","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:40Z","receivedAt":"2013-05-16T08:36:40Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 18 ++++++++++--------\n 1 file changed, 10 insertions(+), 8 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex b295dd4..7cd9ed8 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -768,22 +768,24 @@ def get_remote_branch(origin, remote_branch, name):\n     global dirname, peers\n \n     branch_path = os.path.join(dirname, 'clone', name)\n-    if os.path.exists(branch_path):\n-        # pull\n+\n+    try:\n         d = bzrlib.bzrdir.BzrDir.open(branch_path)\n         branch = d.open_branch()\n-        try:\n-            branch.pull(remote_branch, [], None, False)\n-        except bzrlib.errors.DivergedBranches:\n-            # use remote branch for now\n-            return remote_branch\n-    else:\n+    except bzrlib.errors.NotBranchError:\n         # clone\n         d = origin.sprout(branch_path, None,\n                 hardlink=True, create_tree_if_local=False,\n                 force_new_repo=False,\n                 source_branch=remote_branch)\n         branch = d.open_branch()\n+    else:\n+        # pull\n+        try:\n+            branch.pull(remote_branch, [], None, False)\n+        except bzrlib.errors.DivergedBranches:\n+            # use remote branch for now\n+            return remote_branch\n \n     return branch\n \n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217529","messageId":"1368693407-21267-3-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/8] remote-bzr: fix for files with spaces","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:41Z","receivedAt":"2013-05-16T08:36:41Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Set the maximum number of splits to make when dividing the diff stat\nlines based on space characters.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex 7cd9ed8..b849336 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -620,7 +620,7 @@ def parse_commit(parser):\n             mark = int(mark_ref[1:])\n             f = { 'mode' : m, 'mark' : mark }\n         elif parser.check('D'):\n-            t, path = line.split(' ')\n+            t, path = line.split(' ', 1)\n             f = { 'deleted' : True }\n         else:\n             die('Unknown file command: %s' % line)\n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217534","messageId":"1368693407-21267-4-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 3/8] remote-bzr: simplify get_remote_branch()","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:42Z","receivedAt":"2013-05-16T08:36:42Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"No need for 'origin', it's only needed for the bzrdir 'sprout' method,\nwhich can be greatly simplified.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 23 ++++++++++++-----------\n 1 file changed, 12 insertions(+), 11 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex b849336..b7656df 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -764,25 +764,26 @@ def do_list(parser):\n     print \"@refs/heads/%s HEAD\" % master_branch\n     print\n \n-def get_remote_branch(origin, remote_branch, name):\n+def clone(path, remote_branch):\n+    bdir = bzrlib.bzrdir.BzrDir.create(path)\n+    repo = bdir.find_repository()\n+    repo.fetch(remote_branch.repository)\n+    return remote_branch.sprout(bdir, repository=repo)\n+\n+def get_remote_branch(remote_branch, name):\n     global dirname, peers\n \n     branch_path = os.path.join(dirname, 'clone', name)\n \n     try:\n-        d = bzrlib.bzrdir.BzrDir.open(branch_path)\n-        branch = d.open_branch()\n+        branch = bzrlib.branch.Branch.open(branch_path)\n     except bzrlib.errors.NotBranchError:\n         # clone\n-        d = origin.sprout(branch_path, None,\n-                hardlink=True, create_tree_if_local=False,\n-                force_new_repo=False,\n-                source_branch=remote_branch)\n-        branch = d.open_branch()\n+        branch = clone(branch_path, remote_branch)\n     else:\n         # pull\n         try:\n-            branch.pull(remote_branch, [], None, False)\n+            branch.pull(remote_branch, overwrite=True)\n         except bzrlib.errors.DivergedBranches:\n             # use remote branch for now\n             return remote_branch\n@@ -850,7 +851,7 @@ def get_repo(url, alias):\n \n         if not is_local:\n             peers[name] = remote_branch.base\n-            branch = get_remote_branch(origin, remote_branch, name)\n+            branch = get_remote_branch(remote_branch, name)\n         else:\n             branch = remote_branch\n \n@@ -868,7 +869,7 @@ def get_repo(url, alias):\n \n             if not is_local:\n                 peers[name] = remote_branch.base\n-                branch = get_remote_branch(origin, remote_branch, name)\n+                branch = get_remote_branch(remote_branch, name)\n             else:\n                 branch = remote_branch\n \n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217531","messageId":"1368693407-21267-5-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 4/8] remote-bzr: delay cloning/pulling","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:43Z","receivedAt":"2013-05-16T08:36:43Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Until the branch is actually going to be used.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 28 +++++++++++++---------------\n 1 file changed, 13 insertions(+), 15 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex b7656df..2ba49ff 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -277,7 +277,7 @@ def export_branch(repo, name):\n     ref = '%s/heads/%s' % (prefix, name)\n     tip = marks.get_tip(name)\n \n-    branch = bzrlib.branch.Branch.open(branches[name])\n+    branch = get_remote_branch(name)\n     repo = branch.repository\n \n     branch.lock_read()\n@@ -589,7 +589,7 @@ def parse_commit(parser):\n \n     if ref.startswith('refs/heads/'):\n         name = ref[len('refs/heads/'):]\n-        branch = bzrlib.branch.Branch.open(branches[name])\n+        branch = get_remote_branch(name)\n     else:\n         die('unknown ref')\n \n@@ -691,7 +691,7 @@ def do_export(parser):\n     for ref, revid in parsed_refs.iteritems():\n         if ref.startswith('refs/heads/'):\n             name = ref[len('refs/heads/'):]\n-            branch = bzrlib.branch.Branch.open(branches[name])\n+            branch = get_remote_branch(name)\n             branch.generate_revision_history(revid, marks.get_tip(name))\n \n             if name in peers:\n@@ -748,7 +748,7 @@ def do_list(parser):\n             master_branch = name\n         print \"? refs/heads/%s\" % name\n \n-    branch = bzrlib.branch.Branch.open(branches[master_branch])\n+    branch = get_remote_branch(master_branch)\n     branch.lock_read()\n     for tag, revid in branch.tags.get_tag_dict().items():\n         try:\n@@ -770,8 +770,12 @@ def clone(path, remote_branch):\n     repo.fetch(remote_branch.repository)\n     return remote_branch.sprout(bdir, repository=repo)\n \n-def get_remote_branch(remote_branch, name):\n-    global dirname, peers\n+def get_remote_branch(name):\n+    global dirname, branches\n+\n+    remote_branch = bzrlib.branch.Branch.open(branches[name])\n+    if isinstance(remote_branch.user_transport, bzrlib.transport.local.LocalTransport):\n+        return remote_branch\n \n     branch_path = os.path.join(dirname, 'clone', name)\n \n@@ -851,13 +855,10 @@ def get_repo(url, alias):\n \n         if not is_local:\n             peers[name] = remote_branch.base\n-            branch = get_remote_branch(remote_branch, name)\n-        else:\n-            branch = remote_branch\n \n-        branches[name] = branch.base\n+        branches[name] = remote_branch.base\n \n-        return branch.repository\n+        return remote_branch.repository\n     else:\n         # repository\n \n@@ -869,11 +870,8 @@ def get_repo(url, alias):\n \n             if not is_local:\n                 peers[name] = remote_branch.base\n-                branch = get_remote_branch(remote_branch, name)\n-            else:\n-                branch = remote_branch\n \n-            branches[name] = branch.base\n+            branches[name] = remote_branch.base\n \n         return repo\n \n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217533","messageId":"1368693407-21267-6-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 5/8] remote-bzr: change global repo","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:44Z","receivedAt":"2013-05-16T08:36:44Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"It's not used anyway.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\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 2ba49ff..fdc2e69 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -858,7 +858,7 @@ def get_repo(url, alias):\n \n         branches[name] = remote_branch.base\n \n-        return remote_branch.repository\n+        return origin\n     else:\n         # repository\n \n@@ -873,7 +873,7 @@ def get_repo(url, alias):\n \n             branches[name] = remote_branch.base\n \n-        return repo\n+        return origin\n \n def fix_path(alias, orig_url):\n     url = urlparse.urlparse(orig_url, 'file')\n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217532","messageId":"1368693407-21267-7-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 6/8] remote-bzr: trivial cleanups","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:45Z","receivedAt":"2013-05-16T08:36:45Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex fdc2e69..dd3d71c 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -814,7 +814,7 @@ def find_branches(repo, wanted):\n         except bzrlib.errors.NotBranchError:\n             continue\n         else:\n-            yield name, branch\n+            yield name, branch.base\n \n def get_repo(url, alias):\n     global dirname, peer, branches\n@@ -851,12 +851,12 @@ def get_repo(url, alias):\n         # branch\n \n         name = 'master'\n-        remote_branch = origin.open_branch()\n+        branch = origin.open_branch().base\n \n         if not is_local:\n-            peers[name] = remote_branch.base\n+            peers[name] = branch\n \n-        branches[name] = remote_branch.base\n+        branches[name] = branch\n \n         return origin\n     else:\n@@ -866,12 +866,12 @@ def get_repo(url, alias):\n         # stupid python\n         wanted = [e for e in wanted if e]\n \n-        for name, remote_branch in find_branches(repo, wanted):\n+        for name, branch in find_branches(repo, wanted):\n \n             if not is_local:\n-                peers[name] = remote_branch.base\n+                peers[name] = branch\n \n-            branches[name] = remote_branch.base\n+            branches[name] = branch\n \n         return origin\n \n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217535","messageId":"1368693407-21267-8-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 7/8] remote-bzr: reorganize the way 'wanted' works","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:46Z","receivedAt":"2013-05-16T08:36:46Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"If the user specified a list of branches, we ignore what the remote\nrepository lists, and simply use the branches directly. Since some\nremotes don't report the branches correctly, this is useful.\n\nOtherwise either fetch the repo, or the branch.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 48 +++++++++++++++--------------------\n 1 file changed, 21 insertions(+), 27 deletions(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex dd3d71c..434e613 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -794,7 +794,7 @@ def get_remote_branch(name):\n \n     return branch\n \n-def find_branches(repo, wanted):\n+def find_branches(repo):\n     transport = repo.user_transport\n \n     for fn in transport.iter_files_recursive():\n@@ -805,9 +805,6 @@ def find_branches(repo, wanted):\n         name = name if name != '' else 'master'\n         name = name.replace('/', '+')\n \n-        if wanted and not name in wanted:\n-            continue\n-\n         try:\n             cur = transport.clone(subdir)\n             branch = bzrlib.branch.Branch.open_from_transport(cur)\n@@ -845,35 +842,32 @@ def get_repo(url, alias):\n             except bzrlib.errors.NotBranchError:\n                 pass\n \n-    try:\n-        repo = origin.open_repository()\n-    except bzrlib.errors.NoRepositoryPresent:\n-        # branch\n-\n-        name = 'master'\n-        branch = origin.open_branch().base\n+    wanted = get_config('remote-bzr.branches').rstrip().split(', ')\n+    # stupid python\n+    wanted = [e for e in wanted if e]\n \n-        if not is_local:\n-            peers[name] = branch\n+    if not wanted:\n+        try:\n+            repo = origin.open_repository()\n+        except bzrlib.errors.NoRepositoryPresent:\n+            wanted = ['master']\n \n-        branches[name] = branch\n+    if wanted:\n+        def list_wanted(url, wanted):\n+            for name in wanted:\n+                subdir = name if name != 'master' else ''\n+                yield name, bzrlib.urlutils.join(url, subdir)\n \n-        return origin\n+        branch_list = list_wanted(url, wanted)\n     else:\n-        # repository\n-\n-        wanted = get_config('remote-bzr.branches').rstrip().split(', ')\n-        # stupid python\n-        wanted = [e for e in wanted if e]\n-\n-        for name, branch in find_branches(repo, wanted):\n+        branch_list = find_branches(repo)\n \n-            if not is_local:\n-                peers[name] = branch\n-\n-            branches[name] = branch\n+    for name, url in branch_list:\n+        if not is_local:\n+            peers[name] = url\n+        branches[name] = url\n \n-        return origin\n+    return origin\n \n def fix_path(alias, orig_url):\n     url = urlparse.urlparse(orig_url, 'file')\n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217536","messageId":"1368693407-21267-9-git-send-email-felipe.contreras@gmail.com","threadId":"33836","inReplyTo":"1368693407-21267-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 8/8] remote-bzr: add fallback check for a partial clone","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T08:36:47Z","receivedAt":"2013-05-16T08:36:47Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/remote-helpers/git-remote-bzr | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr\nindex 434e613..acc0dc9 100755\n--- a/contrib/remote-helpers/git-remote-bzr\n+++ b/contrib/remote-helpers/git-remote-bzr\n@@ -765,7 +765,10 @@ def do_list(parser):\n     print\n \n def clone(path, remote_branch):\n-    bdir = bzrlib.bzrdir.BzrDir.create(path)\n+    try:\n+        bdir = bzrlib.bzrdir.BzrDir.create(path)\n+    except bzrlib.errors.AlreadyControlDirError:\n+        bdir = bzrlib.bzrdir.BzrDir.open(path)\n     repo = bdir.find_repository()\n     repo.fetch(remote_branch.repository)\n     return remote_branch.sprout(bdir, repository=repo)\n-- \n1.8.3.rc2.542.g24820ba\n"},{"id":"217634","messageId":"7v7giy6aeh.fsf@alter.siamese.dyndns.org","threadId":"33836","inReplyTo":"1368693407-21267-8-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH 7/8] remote-bzr: reorganize the way 'wanted' works","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-16T18:35:02Z","receivedAt":"2013-05-16T18:35:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The series fails to apply (on top of the hotfix for 1.8.3 you sent\nearlier today) at this point.  It wants to remove the code added by\nthe hotfix but I do not see a corresponding check for listable,\nwhich may make sense, as the log message says, when the user\nspecified a list of branches:\n\n    If the user specified a list of branches, we ignore what the remote\n    repository lists, and simply use the branches directly. Since some\n    remotes don't report the branches correctly, this is useful.\n\nbut it is unclear if the listable code needs to go somewhere else\nwhen the user didn't.\n\nI'll stop at 6/8 for now, as this is not urgent before the 1.8.3\nrelease.\n"},{"id":"217655","messageId":"CAMP44s32kNXuijxfibejzOne+5-RsXofyr+CY85NTCy4QTOAaw@mail.gmail.com","threadId":"33836","inReplyTo":"7v7giy6aeh.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 7/8] remote-bzr: reorganize the way 'wanted' works","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-16T23:09:53Z","receivedAt":"2013-05-16T23:09:53Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Thu, May 16, 2013 at 1:35 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> The series fails to apply (on top of the hotfix for 1.8.3 you sent\n> earlier today) at this point.  It wants to remove the code added by\n> the hotfix but I do not see a corresponding check for listable,\n> which may make sense, as the log message says, when the user\n> specified a list of branches:\n>\n>     If the user specified a list of branches, we ignore what the remote\n>     repository lists, and simply use the branches directly. Since some\n>     remotes don't report the branches correctly, this is useful.\n>\n> but it is unclear if the listable code needs to go somewhere else\n> when the user didn't.\n>\n> I'll stop at 6/8 for now, as this is not urgent before the 1.8.3\n> release.\n\nI can send the conflict fix, or I can send a v2 of the 47-something\npatches. I already have a few fixes on top that might make sense to\nsquash. Up to you.\n\n-- \nFelipe Contreras\n"},{"id":"217662","messageId":"7vfvxm3386.fsf@alter.siamese.dyndns.org","threadId":"33836","inReplyTo":"CAMP44s32kNXuijxfibejzOne+5-RsXofyr+CY85NTCy4QTOAaw@mail.gmail.com","subject":"Re: [PATCH 7/8] remote-bzr: reorganize the way 'wanted' works","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-05-16T23:38:17Z","receivedAt":"2013-05-16T23:38:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras <felipe.contreras@gmail.com> writes:\n\n>> I'll stop at 6/8 for now, as this is not urgent before the 1.8.3\n>> release.\n>\n> I can send the conflict fix, or I can send a v2 of the 47-something\n> patches. I already have a few fixes on top that might make sense to\n> squash. Up to you.\n\nProbably neither at this point in the pre-1.8.3 cycle; a reroll that\nincludes these 6 or 8 patches as its early part after the next cycle\nbegins would be a good way to go.\n"}]}