{"thread":{"id":"14303","subject":"[PATCH 3/5] hg-to-git: rewrite \"git-frotz\" to \"git frotz\"","startedAt":"2008-07-06T03:15:16Z","lastAt":"2008-07-06T03:15:21Z","messageCount":6,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"82329","messageId":"cover.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":null,"subject":"[PATCH 0/5] hg-to-git fixes","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:16Z","receivedAt":"2008-07-06T03:15:16Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Hi,\n\nI just noticed that hg-to-git was not updated to use dash-less git\ncommands, which now causes problems on 'next'. If I was at it, I fixed a\nfew minor issues I noticed as well.\n\nMiklos Vajna (5):\n hg-to-git: avoid raising a string exception\n hg-to-git: abort if the project directory is not a hg repo\n hg-to-git: rewrite \"git-frotz\" to \"git frotz\"\n hg-to-git: use git init instead of git init-db\n hg-to-git: use git rev-parse instead of git show\n\n contrib/hg-to-git/hg-to-git.py | 27 +++++++++++++++------------\n 1 files changed, 15 insertions(+), 12 deletions(-)\n"},{"id":"82330","messageId":"89a68bb21125c4ff706412cde5c04f5d96658789.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":"cover.1215313871.git.vmiklos@frugalware.org","subject":"[PATCH 1/5] hg-to-git: avoid raising a string exception","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:17Z","receivedAt":"2008-07-06T03:15:17Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"This fixes the following warning:\nhg-to-git.py:92: DeprecationWarning: raising a string exception is deprecated\n\nSigned-off-by: Miklos Vajna \n---\n contrib/hg-to-git/hg-to-git.py | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex f68ef72..25d9941 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -89,7 +89,7 @@ try:\n if o in ('-v', '--verbose'):\n verbose = True\n if len(args) != 1:\n- raise('params')\n+ raise Exception('params')\n except:\n usage()\n sys.exit(1)\n-- \n1.5.6.1.322.ge904b.dirty\n"},{"id":"82327","messageId":"ca2e01fa1446afa551f5a6a36242a03d79cb685c.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":"89a68bb21125c4ff706412cde5c04f5d96658789.1215313871.git.vmiklos@frugalware.org","subject":"[PATCH 2/5] hg-to-git: abort if the project directory is not a hg repo","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:18Z","receivedAt":"2008-07-06T03:15:18Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Check the exit code of the first hg command, and abort to avoid a later\nValueError exception.\n\nSigned-off-by: Miklos Vajna \n---\n contrib/hg-to-git/hg-to-git.py | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex 25d9941..130b1c4 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -106,7 +106,10 @@ if state:\n else:\n print 'State does not exist, first run'\n \n-tip = os.popen('hg tip --template \"{rev}\"').read()\n+sock = os.popen('hg tip --template \"{rev}\"')\n+tip = sock.read()\n+if sock.close():\n+ sys.exit(1)\n if verbose:\n print 'tip is', tip\n \n-- \n1.5.6.1.322.ge904b.dirty\n"},{"id":"82325","messageId":"5b692cd189e0afbd4b0e372f1671aa343dfb0d78.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":"ca2e01fa1446afa551f5a6a36242a03d79cb685c.1215313871.git.vmiklos@frugalware.org","subject":"[PATCH 3/5] hg-to-git: rewrite \"git-frotz\" to \"git frotz\"","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:19Z","receivedAt":"2008-07-06T03:15:19Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"This is not just nice but necessary since git-frotz is no longer in\nPATH.\n\nSigned-off-by: Miklos Vajna \n---\n contrib/hg-to-git/hg-to-git.py | 20 ++++++++++----------\n 1 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex 130b1c4..61540ef 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -152,7 +152,7 @@ for cset in range(1, int(tip) + 1):\n \n if not hgvers.has_key(\"0\"):\n print 'creating repository'\n- os.system('git-init-db')\n+ os.system('git init-db')\n \n # loop through every hg changeset\n for cset in range(int(tip) + 1):\n@@ -194,10 +194,10 @@ for cset in range(int(tip) + 1):\n if cset != 0:\n if hgbranch[str(cset)] == \"branch-\" + str(cset):\n print 'creating new branch', hgbranch[str(cset)]\n- os.system('git-checkout -b %s %s' % (hgbranch[str(cset)], hgvers[parent]))\n+ os.system('git checkout -b %s %s' % (hgbranch[str(cset)], hgvers[parent]))\n else:\n print 'checking out branch', hgbranch[str(cset)]\n- os.system('git-checkout %s' % hgbranch[str(cset)])\n+ os.system('git checkout %s' % hgbranch[str(cset)])\n \n # merge\n if mparent:\n@@ -206,7 +206,7 @@ for cset in range(int(tip) + 1):\n else:\n otherbranch = hgbranch[parent]\n print 'merging', otherbranch, 'into', hgbranch[str(cset)]\n- os.system(getgitenv(user, date) + 'git-merge --no-commit -s ours \"\" %s %s' % (hgbranch[str(cset)], otherbranch))\n+ os.system(getgitenv(user, date) + 'git merge --no-commit -s ours \"\" %s %s' % (hgbranch[str(cset)], otherbranch))\n \n # remove everything except .git and .hg directories\n os.system('find . \\( -path \"./.hg\" -o -path \"./.git\" \\) -prune -o ! -name \".\" -print | xargs rm -rf')\n@@ -215,9 +215,9 @@ for cset in range(int(tip) + 1):\n os.system('hg update -C %d' % cset)\n \n # add new files\n- os.system('git-ls-files -x .hg --others | git-update-index --add --stdin')\n+ os.system('git ls-files -x .hg --others | git update-index --add --stdin')\n # delete removed files\n- os.system('git-ls-files -x .hg --deleted | git-update-index --remove --stdin')\n+ os.system('git ls-files -x .hg --deleted | git update-index --remove --stdin')\n \n # commit\n os.system(getgitenv(user, date) + 'git commit --allow-empty -a -F %s' % filecomment)\n@@ -225,20 +225,20 @@ for cset in range(int(tip) + 1):\n \n # tag\n if tag and tag != 'tip':\n- os.system(getgitenv(user, date) + 'git-tag %s' % tag)\n+ os.system(getgitenv(user, date) + 'git tag %s' % tag)\n \n # delete branch if not used anymore...\n if mparent and len(hgchildren[str(cset)]):\n print \"Deleting unused branch:\", otherbranch\n- os.system('git-branch -d %s' % otherbranch)\n+ os.system('git branch -d %s' % otherbranch)\n \n # retrieve and record the version\n- vvv = os.popen('git-show --quiet --pretty=format:%H').read()\n+ vvv = os.popen('git show --quiet --pretty=format:%H').read()\n print 'record', cset, '->', vvv\n hgvers[str(cset)] = vvv\n \n if hgnewcsets >= opt_nrepack and opt_nrepack != -1:\n- os.system('git-repack -a -d')\n+ os.system('git repack -a -d')\n \n # write the state for incrementals\n if state:\n-- \n1.5.6.1.322.ge904b.dirty\n"},{"id":"82328","messageId":"b9e0cd170819882800fe1f0def7ac740a3176a7b.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":"5b692cd189e0afbd4b0e372f1671aa343dfb0d78.1215313871.git.vmiklos@frugalware.org","subject":"[PATCH 4/5] hg-to-git: use git init instead of git init-db","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:20Z","receivedAt":"2008-07-06T03:15:20Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Signed-off-by: Miklos Vajna \n---\n contrib/hg-to-git/hg-to-git.py | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex 61540ef..7b03204 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -152,7 +152,7 @@ for cset in range(1, int(tip) + 1):\n \n if not hgvers.has_key(\"0\"):\n print 'creating repository'\n- os.system('git init-db')\n+ os.system('git init')\n \n # loop through every hg changeset\n for cset in range(int(tip) + 1):\n-- \n1.5.6.1.322.ge904b.dirty\n"},{"id":"82326","messageId":"d93e9bf965d52f749c8bf63afb73815043ebf88d.1215313871.git.vmiklos@frugalware.org","threadId":"14303","inReplyTo":"b9e0cd170819882800fe1f0def7ac740a3176a7b.1215313871.git.vmiklos@frugalware.org","subject":"[PATCH 5/5] hg-to-git: use git rev-parse instead of git show","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-06T03:15:21Z","receivedAt":"2008-07-06T03:15:21Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"'show' is a high-level command, scripts are better if they use\n'rev-parse'.\n\nSigned-off-by: Miklos Vajna \n---\n contrib/hg-to-git/hg-to-git.py | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex 7b03204..0ecb38b 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -233,7 +233,7 @@ for cset in range(int(tip) + 1):\n os.system('git branch -d %s' % otherbranch)\n \n # retrieve and record the version\n- vvv = os.popen('git show --quiet --pretty=format:%H').read()\n+ vvv = os.popen('git rev-parse HEAD').read()\n print 'record', cset, '->', vvv\n hgvers[str(cset)] = vvv\n \n-- \n1.5.6.1.322.ge904b.dirty\n"}]}