Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2014-05-21 Thread Anders Kaseorg 
As of v2.0.0-rc4, upstream has removed git-remote-hg and git-remote-bzr 
from contrib.  They are now maintained in independent repositories.

https://git.kernel.org/cgit/git/git.git/commit/?id=b2c851a8e67da752d8a5dbde5a9dae6e3428a4c9
https://git.kernel.org/cgit/git/git.git/commit/?id=896ba14d653c43bd7a43b6b291e941ab60855c04

So this will need to happen outside the git source package.  (And, uh, I 
guess we’ll need to do something about git-bzr.)

Anders


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2014-05-21 Thread Jonathan Nieder 
retitle 703864 RFP: git-remote-hg -- bidirectional bridge between Git and 
Mercurial
reassign 703864 wnpp
affects 703864 + src:git
quit

Anders Kaseorg wrote:

 https://git.kernel.org/cgit/git/git.git/commit/?id=b2c851a8e67da752d8a5dbde5a9dae6e3428a4c9
 https://git.kernel.org/cgit/git/git.git/commit/?id=896ba14d653c43bd7a43b6b291e941ab60855c04

 So this will need to happen outside the git source package.

Yep.  Marking so.

I'm happy to sponsor once a package is ready.  The main missing bit is
registering git-remote-hg through the alternatives system to avoid
having to conflict with other hg remote helpers.

* Package name: git-remote-hg
  Version : 0.2
  Upstream Maintainer : Felipe Contreras felipe.contre...@gmail.com, 
git...@googlegroups.com
* URL : https://github.com/felipec/git-remote-hg
* License : GPLv2
  Programming Lang: Python
  Description : bidirectional bridge between Git and Mercurial

Thanks,
Jonathan


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2014-03-30 Thread Jonathan McCrohan 
Package: git
Version: 1:1.9.1-1
Followup-For: Bug #703864

Hi Jonathan,

Any news on this? Is there anything I can do to help get this patch
applied in time for Jessie?

Thanks,
Jon

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (650, 'testing'), (600, 'unstable'), (450, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git depends on:
ii  git-man  1:1.9.1-1
ii  libc62.18-4
ii  libcurl3-gnutls  7.35.0-1
ii  liberror-perl0.17-1.1
ii  libexpat12.1.0-4
ii  libpcre3 1:8.31-2
ii  perl-modules 5.18.2-2
ii  zlib1g   1:1.2.8.dfsg-1

Versions of packages git recommends:
pn  less none
ii  openssh-client [ssh-client]  1:6.5p1-6
ii  patch2.7.1-4
ii  rsync3.1.0-2

Versions of packages git suggests:
ii  gettext-base  0.18.3.2-1
pn  git-arch  none
ii  git-bzr   1:1.9.1-1
pn  git-cvs   none
pn  git-daemon-run | git-daemon-sysvinit  none
pn  git-doc   none
pn  git-elnone
ii  git-email 1:1.9.1-1
ii  git-gui   1:1.9.1-1
pn  git-mediawiki none
ii  git-svn   1:1.9.1-1
ii  gitk  1:1.9.1-1
pn  gitwebnone

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2013-10-18 Thread Jonathan McCrohan 
On 16/10/13 02:22, Jonathan McCrohan wrote:
 I just noticed I inadvertently sent a version in which I had disabled
 the testsuite for faster debuilds.

Updated version attached; cleaned up one or two rough edges in the
previous patch.

Thanks,
Jon
From 75cea44a35fb823bd2575e14ecf3b232a8ccf289 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan jmccro...@gmail.com
Date: Sat, 19 Oct 2013 00:55:09 +0100
Subject: [PATCHv3] Add git-remote-hg support though git-hg package

Signed-off-by: Jonathan McCrohan jmccro...@gmail.com
---
 debian/changelog| 14 ++
 debian/control  | 23 +--
 debian/git-doc.docs |  1 +
 debian/git-hg.README.Debian | 27 +++
 debian/git-hg.postinst  |  8 
 debian/git-hg.prerm |  6 ++
 debian/git-remote-hg.txt| 36 
 debian/rules| 27 +++
 8 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 debian/git-hg.README.Debian
 create mode 100755 debian/git-hg.postinst
 create mode 100755 debian/git-hg.prerm
 create mode 100644 debian/git-remote-hg.txt

diff --git a/debian/changelog b/debian/changelog
index f78b6ec..c26f286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+git (1:1.8.4-2) UNRELEASED; urgency=low
+
+  * add a git-hg package with hg remote helper (closes: #703864).
+* debian/control: new package git-hg; Priority: extra; Depends: mercurial;
+  package git now Suggests and git-all Recommends: git-hg
+  * debian/git-remote-hg.txt: new; explain usage.
+  * debian/rules: process debian/git-remote-hg.txt with git's documentation
+toolchain and install to /usr/share/man/man1/; munge
+contrib/remote-helpers/git-remote-hg shebang line and install to
+/usr/lib/git-core
+  * debian/git-doc.docs install git-remote-hg.html
+
+ -- Jonathan McCrohan jmccro...@gmail.com  Sat, 19 Oct 2013 00:47:35 +0100
+
 git (1:1.8.4-1.1) experimental; urgency=low
 
   * debian/control: Build-Depends tcl instead of tcl8.5.
diff --git a/debian/control b/debian/control
index 75c4359..36d10e6 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, perl-modules, liberror-perl,
 Recommends: patch, less, rsync, ssh-client
 Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit,
  git-doc, git-el, git-email, git-gui, gitk, gitweb,
- git-arch, git-bzr, git-cvs, git-svn
+ git-arch, git-bzr, git-cvs, git-hg, git-svn
 Replaces: gitweb ( 1:1.7.4~rc1),
  git-core ( 1:1.7.0.4-1.)
 Breaks: bash-completion ( 1:1.90-1), gitweb ( 1:1.7.4~rc1),
@@ -172,6 +172,25 @@ Description: fast, scalable, distributed revision control 
system (cvs interopera
  incorrect results. For reliable, one-shot imports, cvs2git from the
  cvs2svn package or parsecvs may be a better fit.
 
+Package: git-hg
+Architecture: all
+Multi-Arch: foreign
+Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.), python, mercurial
+Suggests: git-doc, mercurial
+Description: fast, scalable, distributed revision control system (hg 
interoperability)
+ Git is a popular version control system designed to handle very large 
+ projects with speed and efficiency; it is used for many high profile  
+ open source projects, most notably the Linux kernel.  
+ . 
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a  
+ central server.   
+ . 
+ This package provides the hg remote helper, which allows Git to  
+ read from and write to Mercurial repositories as though they were remote  
   
+ Git repositories. 
+
 Package: git-svn
 Architecture: all
 Multi-Arch: foreign
@@ -358,7 +377,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.),
  git-doc, git-el, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb
-Recommends: git-bzr, git-daemon-run | git-daemon-sysvinit
+Recommends: git-bzr, git-hg, git-daemon-run | git-daemon-sysvinit
 Description: fast, scalable, distributed revision control system (all 
subpackages)
  Git is popular version control system designed to handle very large
  projects with speed and efficiency; it is used for many high profile
diff --git a/debian/git-doc.docs b/debian/git-doc.docs
index 4caccf4..6ef3d46 100644
--- a/debian/git-doc.docs
+++ b/debian/git-doc.docs
@@ -1,3 +1,4 @@
 tmp/html/*
 debian/git-remote-bzr.html
+debian/git-remote-hg.html
 Documentation/technical
diff --git a/debian/git-hg.README.Debian

Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2013-10-15 Thread Jonathan McCrohan 
tags 703864 + patch
thanks

Hi Jonathan,

On 25/03/13 02:05, Jonathan Nieder wrote:
 Paul Wise wrote:
 Please move these two files to the correct path and give them execute
 permissions so that git clone hg::... and git clone bzr::... work out of
 the box. For now I've enabled them via a wrapper script in $PATH.

 /usr/share/doc/git/contrib/remote-helpers/git-remote-bzr
 /usr/share/doc/git/contrib/remote-helpers/git-remote-hg
 
 Thanks for filing this.  Upstream doesn't include documentation or
 installation rules for these, so splitting into two bugs to track work
 on each separately.

Please consider applying the attached patch to the next git upload. It
adds git-remote-hg support to git through the use of a git-hg package. I
tried to follow the style of the recent git-bzr package; feel free to
make any changes as required.

Thanks,
Jon
From 64e81b12b3fcce2926019c08b6aeaf830a527da2 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan jmccro...@gmail.com
Date: Wed, 16 Oct 2013 01:09:00 +0100
Subject: [PATCH] Add git-remote-hg support though git-hg package

Signed-off-by: Jonathan McCrohan jmccro...@gmail.com
---
 debian/changelog | 14 ++
 debian/control   | 23 +--
 debian/git-doc.docs  |  1 +
 debian/git-remote-hg.txt | 36 
 debian/rules | 28 +++-
 5 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 debian/git-remote-hg.txt

diff --git a/debian/changelog b/debian/changelog
index f78b6ec..3a2bcbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+git (1:1.8.4-2) UNRELEASED; urgency=low
+
+  * add a git-hg package with hg remote helper (closes: #703864).
+* debian/control: new package git-hg; Priority: extra; Depends: mercurial;
+  package git now Suggests and git-all Recommends: git-hg
+  * debian/git-remote-hg.txt: new; explain usage.
+  * debian/rules: process debian/git-remote-hg.txt with git's documentation
+toolchain and install to /usr/share/man/man1/; munge
+contrib/remote-helpers/git-remote-hg shebang line and install to
+/usr/lib/git-core
+  * debian/git-doc.docs install git-remote-hg.html
+
+ -- Jonathan McCrohan jmccro...@gmail.com  Wed, 16 Oct 2013 01:06:36 +0100
+
 git (1:1.8.4-1.1) experimental; urgency=low
 
   * debian/control: Build-Depends tcl instead of tcl8.5.
diff --git a/debian/control b/debian/control
index 75c4359..36d10e6 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, perl-modules, liberror-perl,
 Recommends: patch, less, rsync, ssh-client
 Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit,
  git-doc, git-el, git-email, git-gui, gitk, gitweb,
- git-arch, git-bzr, git-cvs, git-svn
+ git-arch, git-bzr, git-cvs, git-hg, git-svn
 Replaces: gitweb ( 1:1.7.4~rc1),
  git-core ( 1:1.7.0.4-1.)
 Breaks: bash-completion ( 1:1.90-1), gitweb ( 1:1.7.4~rc1),
@@ -172,6 +172,25 @@ Description: fast, scalable, distributed revision control 
system (cvs interopera
  incorrect results. For reliable, one-shot imports, cvs2git from the
  cvs2svn package or parsecvs may be a better fit.
 
+Package: git-hg
+Architecture: all
+Multi-Arch: foreign
+Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.), python, mercurial
+Suggests: git-doc, mercurial
+Description: fast, scalable, distributed revision control system (hg 
interoperability)
+ Git is a popular version control system designed to handle very large 
+ projects with speed and efficiency; it is used for many high profile  
+ open source projects, most notably the Linux kernel.  
+ . 
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a  
+ central server.   
+ . 
+ This package provides the hg remote helper, which allows Git to  
+ read from and write to Mercurial repositories as though they were remote  
   
+ Git repositories. 
+
 Package: git-svn
 Architecture: all
 Multi-Arch: foreign
@@ -358,7 +377,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.),
  git-doc, git-el, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb
-Recommends: git-bzr, git-daemon-run | git-daemon-sysvinit
+Recommends: git-bzr, git-hg, git-daemon-run | git-daemon-sysvinit
 Description: fast, scalable, distributed revision control system (all 
subpackages)
  Git is popular version control system designed to handle very large
  projects with speed and efficiency; it is used for many high

Bug#703864: RFP: git-mercurial -- hg remote helper from git/contrib/remote-helpers

2013-10-15 Thread Jonathan McCrohan 
On 16/10/13 02:14, Jonathan McCrohan wrote:
 Please consider applying the attached patch to the next git upload. It
 adds git-remote-hg support to git through the use of a git-hg package. I
 tried to follow the style of the recent git-bzr package; feel free to
 make any changes as required.

I just noticed I inadvertently sent a version in which I had disabled
the testsuite for faster debuilds.

Please apply this version instead.

Thanks,
Jon
From a0e2f7b0ff5d0c25c5b43e2ed44db3c6cb77ff68 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan jmccro...@gmail.com
Date: Wed, 16 Oct 2013 01:09:00 +0100
Subject: [PATCHv2] Add git-remote-hg support though git-hg package

Signed-off-by: Jonathan McCrohan jmccro...@gmail.com
---
 debian/changelog | 14 ++
 debian/control   | 23 +--
 debian/git-doc.docs  |  1 +
 debian/git-remote-hg.txt | 36 
 debian/rules | 27 +++
 5 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 debian/git-remote-hg.txt

diff --git a/debian/changelog b/debian/changelog
index f78b6ec..3a2bcbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+git (1:1.8.4-2) UNRELEASED; urgency=low
+
+  * add a git-hg package with hg remote helper (closes: #703864).
+* debian/control: new package git-hg; Priority: extra; Depends: mercurial;
+  package git now Suggests and git-all Recommends: git-hg
+  * debian/git-remote-hg.txt: new; explain usage.
+  * debian/rules: process debian/git-remote-hg.txt with git's documentation
+toolchain and install to /usr/share/man/man1/; munge
+contrib/remote-helpers/git-remote-hg shebang line and install to
+/usr/lib/git-core
+  * debian/git-doc.docs install git-remote-hg.html
+
+ -- Jonathan McCrohan jmccro...@gmail.com  Wed, 16 Oct 2013 01:06:36 +0100
+
 git (1:1.8.4-1.1) experimental; urgency=low
 
   * debian/control: Build-Depends tcl instead of tcl8.5.
diff --git a/debian/control b/debian/control
index 75c4359..36d10e6 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, perl-modules, liberror-perl,
 Recommends: patch, less, rsync, ssh-client
 Suggests: gettext-base, git-daemon-run | git-daemon-sysvinit,
  git-doc, git-el, git-email, git-gui, gitk, gitweb,
- git-arch, git-bzr, git-cvs, git-svn
+ git-arch, git-bzr, git-cvs, git-hg, git-svn
 Replaces: gitweb ( 1:1.7.4~rc1),
  git-core ( 1:1.7.0.4-1.)
 Breaks: bash-completion ( 1:1.90-1), gitweb ( 1:1.7.4~rc1),
@@ -172,6 +172,25 @@ Description: fast, scalable, distributed revision control 
system (cvs interopera
  incorrect results. For reliable, one-shot imports, cvs2git from the
  cvs2svn package or parsecvs may be a better fit.
 
+Package: git-hg
+Architecture: all
+Multi-Arch: foreign
+Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.), python, mercurial
+Suggests: git-doc, mercurial
+Description: fast, scalable, distributed revision control system (hg 
interoperability)
+ Git is a popular version control system designed to handle very large 
+ projects with speed and efficiency; it is used for many high profile  
+ open source projects, most notably the Linux kernel.  
+ . 
+ Git falls in the category of distributed source code management tools.
+ Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a  
+ central server.   
+ . 
+ This package provides the hg remote helper, which allows Git to  
+ read from and write to Mercurial repositories as though they were remote  
   
+ Git repositories. 
+
 Package: git-svn
 Architecture: all
 Multi-Arch: foreign
@@ -358,7 +377,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends: git ( ${source:Upstream-Version}), git ( 
${source:Upstream-Version}-.),
  git-doc, git-el, git-arch, git-cvs, git-svn, git-email, git-gui, gitk, gitweb
-Recommends: git-bzr, git-daemon-run | git-daemon-sysvinit
+Recommends: git-bzr, git-hg, git-daemon-run | git-daemon-sysvinit
 Description: fast, scalable, distributed revision control system (all 
subpackages)
  Git is popular version control system designed to handle very large
  projects with speed and efficiency; it is used for many high profile
diff --git a/debian/git-doc.docs b/debian/git-doc.docs
index 4caccf4..6ef3d46 100644
--- a/debian/git-doc.docs
+++ b/debian/git-doc.docs
@@ -1,3 +1,4 @@
 tmp/html/*
 debian/git-remote-bzr.html
+debian/git-remote-hg.html
 Documentation/technical
diff --git a/debian/git-remote-hg.txt b/debian/git-remote-hg.txt
new file mode 100644
index 000..d9d0157
--- /dev/null
+++