{"thread":{"id":"33768","subject":"[PATCH 0/4] remote-hg: trivial fixes and cleanups","startedAt":"2013-05-10T10:16:59Z","lastAt":"2013-05-10T12:20:46Z","messageCount":6,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"216860","messageId":"1368181023-10402-1-git-send-email-felipe.contreras@gmail.com","threadId":"33768","inReplyTo":null,"subject":"[PATCH 0/4] remote-hg: trivial fixes and cleanups","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T10:16:59Z","receivedAt":"2013-05-10T10:16:59Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nSimple no-brainers.\n\nFelipe Contreras (4):\n remote-hg: don't push fake 'master' bookmark\n remote-hg: update bookmarks when pulling\n remote-hg: test: be a little more quiet\n remote-hg: fix new branch creation\n\n contrib/remote-helpers/git-remote-hg | 7 +++++--\n contrib/remote-helpers/test-hg.sh | 4 ++--\n 2 files changed, 7 insertions(+), 4 deletions(-)\n\n-- \n1.8.3.rc1.555.gd13b5a0\n"},{"id":"216861","messageId":"1368181023-10402-2-git-send-email-felipe.contreras@gmail.com","threadId":"33768","inReplyTo":"1368181023-10402-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/4] remote-hg: don't push fake 'master' bookmark","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T10:17:00Z","receivedAt":"2013-05-10T10:17:00Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"We skip it locally, but not for the remote, so let's do so.\n\nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-hg | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg\nindex 96ad30d..5647ed5 100755\n--- a/contrib/remote-helpers/git-remote-hg\n+++ b/contrib/remote-helpers/git-remote-hg\n@@ -867,7 +867,7 @@ def do_export(parser):\n \n if bmark == 'master' and 'master' not in parser.repo._bookmarks:\n # fake bookmark\n- pass\n+ continue\n elif bookmarks.pushbookmark(parser.repo, bmark, old, new):\n # updated locally\n pass\n-- \n1.8.3.rc1.555.gd13b5a0\n"},{"id":"216862","messageId":"1368181023-10402-3-git-send-email-felipe.contreras@gmail.com","threadId":"33768","inReplyTo":"1368181023-10402-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/4] remote-hg: update bookmarks when pulling","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T10:17:01Z","receivedAt":"2013-05-10T10:17:01Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-hg | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg\nindex 5647ed5..85b9319 100755\n--- a/contrib/remote-helpers/git-remote-hg\n+++ b/contrib/remote-helpers/git-remote-hg\n@@ -357,6 +357,9 @@ def get_repo(url, alias):\n die('Repository error')\n repo.pull(peer, heads=None, force=True)\n \n+ rb = peer.listkeys('bookmarks')\n+ bookmarks.updatefromremote(myui, repo, rb, url)\n+\n return repo\n \n def rev_to_mark(rev):\n-- \n1.8.3.rc1.555.gd13b5a0\n"},{"id":"216864","messageId":"1368181023-10402-4-git-send-email-felipe.contreras@gmail.com","threadId":"33768","inReplyTo":"1368181023-10402-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 3/4] remote-hg: test: be a little more quiet","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T10:17:02Z","receivedAt":"2013-05-10T10:17:02Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n contrib/remote-helpers/test-hg.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh\nindex 8de2aa7..f8d1f9e 100755\n--- a/contrib/remote-helpers/test-hg.sh\n+++ b/contrib/remote-helpers/test-hg.sh\n@@ -109,10 +109,10 @@ test_expect_success 'update bookmark' '\n (\n git clone \"hg::$PWD/hgrepo\" gitrepo &&\n cd gitrepo &&\n- git checkout devel &&\n+ git checkout --quiet devel &&\n echo devel > content &&\n git commit -a -m devel &&\n- git push\n+ git push --quiet\n ) &&\n \n hg -R hgrepo bookmarks | egrep \"devel[\t ]+3:\"\n-- \n1.8.3.rc1.555.gd13b5a0\n"},{"id":"216863","messageId":"1368181023-10402-5-git-send-email-felipe.contreras@gmail.com","threadId":"33768","inReplyTo":"1368181023-10402-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 4/4] remote-hg: fix new branch creation","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T10:17:03Z","receivedAt":"2013-05-10T10:17:03Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"When force_push is disabled, we need to turn the argument to True.\n\nSigned-off-by: Felipe Contreras \n---\n contrib/remote-helpers/git-remote-hg | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg\nindex 85b9319..10f073a 100755\n--- a/contrib/remote-helpers/git-remote-hg\n+++ b/contrib/remote-helpers/git-remote-hg\n@@ -853,7 +853,7 @@ def do_export(parser):\n continue\n \n if peer:\n- parser.repo.push(peer, force=force_push)\n+ parser.repo.push(peer, force=force_push, newbranch=True)\n \n # handle bookmarks\n for bmark, node in p_bmarks:\n-- \n1.8.3.rc1.555.gd13b5a0\n"},{"id":"216871","messageId":"CAMP44s2=xj=PS8Eb7D-meAO9U1x1yTD9PShJrMXP1dHMVUYXnA@mail.gmail.com","threadId":"33768","inReplyTo":"1368181023-10402-2-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH 1/4] remote-hg: don't push fake 'master' bookmark","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-05-10T12:20:46Z","receivedAt":"2013-05-10T12:20:46Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, May 10, 2013 at 5:17 AM, Felipe Contreras\n wrote:\n> --- a/contrib/remote-helpers/git-remote-hg\n> +++ b/contrib/remote-helpers/git-remote-hg\n> @@ -867,7 +867,7 @@ def do_export(parser):\n>\n> if bmark == 'master' and 'master' not in parser.repo._bookmarks:\n> # fake bookmark\n> - pass\n\nMissed:\n\n+ print \"ok %s\" % ref\n\n> + continue\n> elif bookmarks.pushbookmark(parser.repo, bmark, old, new):\n> # updated locally\n> pass\n\n-- \nFelipe Contreras\n"}]}