[Python-apps-commits] r10053 - in packages/hg-git/trunk/debian (7 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Thu Oct 10 17:59:28 UTC 2013
Date: Thursday, October 10, 2013 @ 17:59:26
Author: vicho
Revision: 10053
* Team upload.
* Fix "Incompatible with python-dulwich 0.9.1" by adding patches
"from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch",
"from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch"
and
"from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch"
(Closes: #724638)
Added:
packages/hg-git/trunk/debian/patches/
packages/hg-git/trunk/debian/patches/from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch
packages/hg-git/trunk/debian/patches/from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch
packages/hg-git/trunk/debian/patches/from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch
packages/hg-git/trunk/debian/patches/series
Modified:
packages/hg-git/trunk/debian/changelog
packages/hg-git/trunk/debian/control
Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog 2013-10-09 07:57:00 UTC (rev 10052)
+++ packages/hg-git/trunk/debian/changelog 2013-10-10 17:59:26 UTC (rev 10053)
@@ -1,3 +1,15 @@
+hg-git (0.4.0-2) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Fix "Incompatible with python-dulwich 0.9.1" by adding patches
+ "from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch",
+ "from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch"
+ and
+ "from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch"
+ (Closes: #724638)
+
+ -- Javi Merino <vicho at debian.org> Wed, 09 Oct 2013 22:29:00 +0100
+
hg-git (0.4.0-1) unstable; urgency=low
[Jakub Wilk]
Modified: packages/hg-git/trunk/debian/control
===================================================================
--- packages/hg-git/trunk/debian/control 2013-10-09 07:57:00 UTC (rev 10052)
+++ packages/hg-git/trunk/debian/control 2013-10-10 17:59:26 UTC (rev 10053)
@@ -12,7 +12,7 @@
Package: mercurial-git
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.9.1-1~), python-dulwich (>= 0.8)
+Depends: ${misc:Depends}, ${python:Depends}, mercurial (>= 1.9.1-1~), python-dulwich (>= 0.9.1)
Description: Git plugin for Mercurial
The Hg-Git plugin for Mercurial adds the ability to push and pull to/from
a Git server repository. This means you can collaborate on Git based
Added: packages/hg-git/trunk/debian/patches/from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch (rev 0)
+++ packages/hg-git/trunk/debian/patches/from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch 2013-10-10 17:59:26 UTC (rev 10053)
@@ -0,0 +1,48 @@
+Author: domruf <dominikruf at gmail.com>
+Origin: https://bitbucket.org/durin42/hg-git/commits/980c37f6a8f965abd3fd10b0cc6065ec99fab9c2
+Description: fix/work around https://bugs.launchpad.net/dulwich/+bug/1025886
+Bug-Debian: http://bugs.debian.org/724638
+
+diff --git a/hggit/git_handler.py b/hggit/git_handler.py
+--- a/hggit/git_handler.py
++++ b/hggit/git_handler.py
+@@ -8,6 +8,7 @@ from dulwich.pack import create_delta, a
+ from dulwich.repo import Repo
+ from dulwich import client
+ from dulwich import config as dul_config
++from StringIO import StringIO
+
+ try:
+ from mercurial import bookmarks
+@@ -993,19 +994,19 @@ class GitHandler(object):
+ if not ref.endswith('^{}')
+ and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ]
+ want = [x for x in want if x not in self.git]
++
+ return want
+- f, commit = self.git.object_store.add_pack()
+ try:
+- try:
+- progress = GitProgress(self.ui)
+- ret = client.fetch_pack(path, determine_wants, graphwalker,
+- f.write, progress.progress)
+- progress.flush()
+- return ret
+- except (HangupException, GitProtocolError), e:
+- raise hgutil.Abort(_("git remote error: ") + str(e))
+- finally:
+- commit()
++ progress = GitProgress(self.ui)
++ f = StringIO()
++ ret = client.fetch_pack(path, determine_wants, graphwalker, f.write, progress.progress)
++ if(f.pos != 0):
++ f.seek(0)
++ po = self.git.object_store.add_thin_pack(f.read, None)
++ progress.flush()
++ return ret
++ except (HangupException, GitProtocolError), e:
++ raise hgutil.Abort(_("git remote error: ") + str(e))
+
+ ## REFERENCES HANDLING
+
+
Added: packages/hg-git/trunk/debian/patches/from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch (rev 0)
+++ packages/hg-git/trunk/debian/patches/from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch 2013-10-10 17:59:26 UTC (rev 10053)
@@ -0,0 +1,26 @@
+Author: Augie Fackler <raf at durin42.com>
+Origin: https://bitbucket.org/durin42/hg-git/commits/30d502905da9e670f4131cc76d539f5539368023
+Description: git_handler: fix bugs introduced by 47df57f2bb2b which could never have passed tests
+Bug-Debian: http://bugs.debian.org/724638
+
+diff --git a/hggit/git_handler.py b/hggit/git_handler.py
+--- a/hggit/git_handler.py
++++ b/hggit/git_handler.py
+@@ -8,7 +8,6 @@ from dulwich.pack import create_delta, a
+ from dulwich.repo import Repo
+ from dulwich import client
+ from dulwich import config as dul_config
+-from StringIO import StringIO
+
+ try:
+ from mercurial import bookmarks
+@@ -998,7 +997,7 @@ class GitHandler(object):
+ return want
+ try:
+ progress = GitProgress(self.ui)
+- f = StringIO()
++ f = StringIO.StringIO()
+ ret = client.fetch_pack(path, determine_wants, graphwalker, f.write, progress.progress)
+ if(f.pos != 0):
+ f.seek(0)
+
Added: packages/hg-git/trunk/debian/patches/from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch (rev 0)
+++ packages/hg-git/trunk/debian/patches/from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch 2013-10-10 17:59:26 UTC (rev 10053)
@@ -0,0 +1,21 @@
+From: Alex Regueiro <alex at noldorin.com>
+Origin: https://bitbucket.org/durin42/hg-git/commits/980c37f6a8f965abd3fd10b0cc6065ec99fab9c2
+Description: Upgraded to use latest version of dulwich (0.9.1).
+Bug-Debian: http://bugs.debian.org/724638
+
+diff --git a/hggit/_ssh.py b/hggit/_ssh.py
+index 8d1f35e..a49c82c 100644
+--- a/hggit/_ssh.py
++++ b/hggit/_ssh.py
+@@ -11,7 +11,7 @@ def generate_ssh_vendor(ui):
+ """
+
+ class _Vendor(SSHVendor):
+- def connect_ssh(self, host, command, username=None, port=None):
++ def run_command(self, host, command, username=None, port=None):
+ from dulwich.client import SubprocessWrapper
+ from mercurial import util
+ import subprocess
+--
+1.8.4.rc3
+
Added: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series (rev 0)
+++ packages/hg-git/trunk/debian/patches/series 2013-10-10 17:59:26 UTC (rev 10053)
@@ -0,0 +1,3 @@
+from_upstream__upgraded_to_use_latest_version_of_dulwich_0.9.1.patch
+from_upstream__fix_work_around_https_bugs_launchpad_net_dulwich_bug_1025886.patch
+from_upstream__git_handler_fix_bugs_introduced_by_47df57f2bb2b.patch
More information about the Python-apps-commits
mailing list