summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers
AgeCommit message (Collapse)AuthorFilesLines
2013-04-26test-hg-hg-git.sh: do not use export X=YLibravatar Torsten Bögershausen1-4/+6
The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-26test-hg-bidi.sh: do not use export X=YLibravatar Torsten Bögershausen1-5/+6
The shell syntax "export X=Y A=B" is not understood by all shells. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-17remote-hg: fix commit messagesLibravatar Felipe Contreras1-1/+2
git fast-import expects an extra newline after the commit message data, but we are adding it only on hg-git compat mode, which is why the bidirectionality tests pass. We should add it unconditionally. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-07Sync with 1.8.1.6Libravatar Junio C Hamano1-1/+1
2013-04-07remote-helpers/test-bzr.sh: do not use "grep '\s'"Libravatar Torsten Bögershausen1-1/+1
Using grep "devel\s\+3:" to find at least one whitspace is not portable on all grep versions; not all grep versions understand "\s" as a "whitespace". Use a literal TAB followed by SPACE. The + as a qualifier for "one or more" is not a basic regular expression; use egrep instead of grep. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-21Merge branch 'mh/remote-hg-mode-bits-fix'Libravatar Junio C Hamano2-1/+69
Update to the Hg remote helper (in contrib/). * mh/remote-hg-mode-bits-fix: remote-hg: fix handling of file perms when pushing
2013-01-15remote-hg: fix handling of file perms when pushingLibravatar Max Horn2-1/+69
Previously, when changing and committing an executable file, the file would loose its executable bit on the hg side. Likewise, symlinks ended up as "normal" files". This was not immediately apparent on the git side unless one did a fresh clone. Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-15remote-hg: store converted URLLibravatar Felipe Contreras1-0/+11
Mercurial might convert the URL to something more appropriate, like an absolute path. Lets store that instead of the original URL, which won't work from a different working directory if it's relative. Suggested-by: Max Horn <max@quendi.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-09Merge branch 'fc/remote-bzr'Libravatar Junio C Hamano2-0/+868
New remote helper for bzr, with minimum fix squashed in. * fc/remote-bzr: remote-bzr: detect local repositories remote-bzr: add support for older versions of bzr remote-bzr: add support to push special modes remote-bzr: add support for fecthing special modes remote-bzr: add simple tests remote-bzr: update working tree upon pushing remote-bzr: add support for remote repositories remote-bzr: add support for pushing Add new remote-bzr transport helper
2013-01-08remote-hg: Fix biridectionality -> bidirectionality typosLibravatar W. Trevor King2-2/+2
Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-02remote-bzr: detect local repositoriesLibravatar Felipe Contreras1-20/+28
So we don't create a clone unnecessarily. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-02remote-bzr: add support for older versions of bzrLibravatar Felipe Contreras1-5/+9
At least as old as 2.0. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-02remote-bzr: add support to push special modesLibravatar Felipe Contreras1-17/+43
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-02remote-bzr: add support for fecthing special modesLibravatar Felipe Contreras2-11/+59
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-02remote-bzr: add simple testsLibravatar Felipe Contreras1-0/+111
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-13remote-bzr: update working tree upon pushingLibravatar Felipe Contreras1-0/+2
A 'git push' doesn't update the working directory on the remote, but a 'bzr push' does. Teach the remote helper for bzr to update the working tree on the bzr side upon pushing via the "export" command. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28remote-bzr: add support for remote repositoriesLibravatar Felipe Contreras1-2/+24
Strictly speaking bzr doesn't need any changes to interact with remote repositories, but it's dead slow. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28remote-bzr: add support for pushingLibravatar Felipe Contreras1-0/+295
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28Add new remote-bzr transport helperLibravatar Felipe Contreras1-0/+352
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-27remote-hg: fix for older versions of pythonLibravatar Felipe Contreras1-4/+8
As Amit Bakshi reported, older versions of python (< 2.7) don't have subprocess.check_output, so let's use subprocess.Popen directly as suggested. Suggested-by: Amit Bakshi <ambakshi@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-27remote-hg: fix for files with spacesLibravatar Felipe Contreras1-1/+1
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-12remote-hg: avoid bad refsLibravatar Felipe Contreras1-0/+3
Turns out fast-export throws bad 'reset' commands because of a behavior in transport-helper that is not even needed. Either way, better to ignore them, otherwise the user will get warnings when we OK them. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-12remote-hg: try the 'tip' if no checkout presentLibravatar Felipe Contreras1-0/+2
There's no concept of HEAD in mercurial, but let's try our best to do something sensible. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-12remote-hg: fix compatibility with older versions of hgLibravatar Felipe Contreras1-1/+1
Turns out repo.revs was introduced quite late, and it doesn't do anything fancy for our refspec; only list all the numbers in that range. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-12remote-hg: add missing config for basic testsLibravatar Ramkumar Ramachandra1-0/+9
'hg commit' fails otherwise in some versions of mercurial because of the missing user information. Other versions simply throw a warning and guess though. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: the author email can be nullLibravatar Felipe Contreras1-3/+3
Like 'Foo <>'. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add option to not track branchesLibravatar Felipe Contreras1-8/+14
Some people prefer it this way. % git config --global remote-hg.track-branches false Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add extra author testLibravatar Felipe Contreras1-1/+5
For hg.hg. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add tests to compare with hg-gitLibravatar Felipe Contreras1-0/+462
The base commands come from the tests of the hg-git project. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add bidirectional testsLibravatar Felipe Contreras1-0/+243
Base commands from hg-git tests: https://bitbucket.org/durin42/hg-git/src Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add basic testsLibravatar Felipe Contreras2-0/+125
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: fake bookmark when there's noneLibravatar Felipe Contreras1-5/+14
Or at least no current bookmark. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add compat for hg-git author fixesLibravatar Felipe Contreras1-6/+53
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add support for hg-git compat modeLibravatar Felipe Contreras1-6/+83
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: match hg merge behaviorLibravatar Felipe Contreras1-0/+17
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: make sure the encoding is correctLibravatar Felipe Contreras1-1/+11
Independently of the environment. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add support to push URLsLibravatar Felipe Contreras1-2/+12
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add support for remote pushingLibravatar Felipe Contreras1-2/+7
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04remote-hg: add support for pushingLibravatar Felipe Contreras1-2/+215
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
2012-11-04Add new remote-hg transport helperLibravatar Felipe Contreras1-0/+391
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>