From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v4 00/13] New remote-hg helper
Date: Sun, 28 Oct 2012 04:54:00 +0100 [thread overview]
Message-ID: <1351396453-29042-1-git-send-email-felipe.contreras@gmail.com> (raw)
Hi,
I've ported the tests from hg-git and made sure that the output from remote-hg
matches the output of hg-git. With these extensive tests I would consider this
one ready for wide use. Not only do the tests pass, I've compared the generated
repos of a few projects, and the SHA-1's are exactly the same :)
This remote-hg has advantages other tools don't have:
* Uses transport-helper (git clone hg::path)
* The code is small
* The code is simple
* No external dependencies (other than mercurial)
* It's easy to install (put into your path)
* Has extensive tests
* Active development
* Has compatibility with hg-git
* The required patches are available
* No changes necesary to git core
One important alternative is the one written by Sverre Rabbelier that is now
maintained and distributed in msysgit. It's hard to evaluate this option as
there isn't a branch specific to this remote helper so it would be possible to
evaluate the necessary patches.
Changes since v3:
* New extensive tests
* Add compatibility mode with hg-git
* Added support for boomkars
* Add mercurial information to the git msg (branch, renames, extra, etc.)
* Properly handle HEAD
* Fix author/committer information
* Implement 'done' feature for error handling
* Restore hg user properly
* Set file correct modes
* Match hg merge behavior
* Prefix hg branches
* Encoding fixes
* Stricter parser
* Support for 'reset' command
* Fix support for URL pushing (unaliased)
Changes since v2:
* Added support for pushing
* Tests copied from original remote-hg
* Custom default -> master renames removed
* Code reorganized
Changes since v1:
* Improved documentation
* Use more common 'python' binary
* Warn, don't barf when a branch has multiple heads
* Fixed marks to fetch after cloned
* Support for cloning/pulling remote repositories
* Use a more appropriate internal directory (e.g. .git/hg/origin)
* Fixes for python3
Felipe Contreras (13):
Add new remote-hg transport helper
remote-hg: add support for bookmarks
remote-hg: add support for pushing
remote-hg: add support for remote pushing
remote-hg: add support to push URLs
remote-hg: make sure the encoding is correct
remote-hg: match hg merge behavior
remote-hg: add support for hg-git compat mode
remote-hg: add compat for hg-git author fixes
remote-hg: fake bookmark when there's none
remote-hg: add support for fake remote
remote-hg: add tests to compare with hg-git
remote-hg: add extra author test
contrib/remote-hg/git-remote-hg | 770 ++++++++++++++++++++++++++++++++++++++++
t/t5802-remote-hg-hg-git.sh | 449 +++++++++++++++++++++++
2 files changed, 1219 insertions(+)
create mode 100755 contrib/remote-hg/git-remote-hg
create mode 100755 t/t5802-remote-hg-hg-git.sh
--
1.8.0
next reply other threads:[~2012-10-28 3:54 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 3:54 Felipe Contreras [this message]
2012-10-28 3:54 ` [PATCH v4 01/13] Add new remote-hg transport helper Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 02/13] remote-hg: add support for bookmarks Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 03/13] remote-hg: add support for pushing Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 04/13] remote-hg: add support for remote pushing Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 05/13] remote-hg: add support to push URLs Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 06/13] remote-hg: make sure the encoding is correct Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 07/13] remote-hg: match hg merge behavior Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 08/13] remote-hg: add support for hg-git compat mode Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 09/13] remote-hg: add compat for hg-git author fixes Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 10/13] remote-hg: fake bookmark when there's none Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 11/13] remote-hg: add support for fake remote Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 12/13] remote-hg: add tests to compare with hg-git Felipe Contreras
2012-10-28 3:54 ` [PATCH v4 13/13] remote-hg: add extra author test Felipe Contreras
2012-10-29 8:50 ` [PATCH v4 00/13] New remote-hg helper Jeff King
2012-10-29 14:56 ` Felipe Contreras
2012-10-29 21:26 ` Jeff King
2012-10-29 21:47 ` Felipe Contreras
2012-10-29 21:56 ` Jeff King
2012-10-29 22:02 ` Felipe Contreras
2012-10-29 22:06 ` Jeff King
2012-10-30 17:18 ` Felipe Contreras
2012-10-30 17:20 ` Johannes Schindelin
2012-10-30 18:10 ` Felipe Contreras
2012-10-30 19:33 ` Johannes Schindelin
2012-10-30 20:15 ` Felipe Contreras
2012-10-31 9:30 ` Michael J Gruber
2012-10-31 10:27 ` Jeff King
2012-10-31 15:58 ` Felipe Contreras
2012-10-31 18:20 ` Johannes Schindelin
2012-10-31 18:41 ` Felipe Contreras
2012-10-31 18:59 ` Jonathan Nieder
2012-10-31 19:24 ` Felipe Contreras
2012-10-31 20:28 ` Lack of netiquette, was " Johannes Schindelin
2012-10-31 20:37 ` Felipe Contreras
2012-11-01 1:32 ` Junio C Hamano
2012-11-01 2:58 ` Felipe Contreras
2012-11-01 13:46 ` René Scharfe
2012-11-01 14:18 ` Tomas Carnecky
2012-11-01 14:18 ` Martin Langhoff
2012-11-01 14:34 ` Felipe Contreras
2012-11-01 14:47 ` Martin Langhoff
2012-11-01 17:13 ` Felipe Contreras
2012-11-02 9:38 ` Andreas Ericsson
2012-11-02 11:03 ` Michael J Gruber
2012-11-02 16:09 ` Felipe Contreras
2012-11-05 9:25 ` Michael J Gruber
2012-11-05 15:22 ` Felipe Contreras
2012-11-05 15:58 ` Felipe Contreras
2012-11-05 16:00 ` Michael J Gruber
2012-11-05 16:15 ` Felipe Contreras
2012-11-01 20:46 ` Jonathan Nieder
2012-10-31 23:14 ` Daniel Barkalow
2012-11-01 2:46 ` Felipe Contreras
2012-11-01 1:41 ` Junio C Hamano
2012-11-01 2:54 ` Felipe Contreras
2012-10-31 15:39 ` Felipe Contreras
2012-10-31 15:55 ` Michael J Gruber
2012-10-31 16:11 ` Felipe Contreras
2012-11-02 14:46 ` Jeff King
2012-11-02 18:39 ` Felipe Contreras
2012-11-02 19:20 ` Felipe Contreras
2012-11-04 2:28 ` Felipe Contreras
2012-11-02 23:18 ` Thomas Adam
2012-11-02 23:52 ` Felipe Contreras
2012-10-31 18:04 ` Felipe Contreras
2012-10-31 19:47 ` Felipe Contreras
2012-11-01 4:08 ` Felipe Contreras
2012-11-02 14:48 ` Jeff King
2012-11-02 16:41 ` Felipe Contreras
2012-11-02 18:01 ` Felipe Contreras
2012-11-05 14:13 ` Michael J Gruber
2012-11-05 15:36 ` Felipe Contreras
2012-11-01 1:22 ` Junio C Hamano
2012-11-01 2:50 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351396453-29042-1-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=peff@peff.net \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.