git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
	Dmitry Ivankov <divanorama@gmail.com>,
	git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>
Subject: [PATCH 4/8] t5800: document some non-functional parts of remote helpers
Date: Tue, 7 Jun 2011 13:20:30 -0400	[thread overview]
Message-ID: <20110607172030.GC22111@sigill.intra.peff.net> (raw)
In-Reply-To: <20110607171838.GA21685@sigill.intra.peff.net>

These are all things one might expect to work in a helper
that is capable of handling multiple branches (which our
testgit helper in theory should be able to do, as it is
backed by git). All of these bugs are specific to the
import/export codepaths, so they don't affect helpers like
git-remote-curl that use fetch/push commands.

The first and fourth tests are about fetching and pushing
new refs, and demonstrate bugs in the git_remote_helpers
library (so they would be most likely to impact helpers for
other VCSs which import/export git).

The second test is about importing multiple refs; it
demonstrates a bug in git-remote-testgit, which is mostly
for exercising the test code. Therefore it probably doesn't
affect anyone in practice.

The third test demonstrates a bug in git's side of the
helper code when the upstream has added new refs without us.
This could impact git users who use remote helpers to access
foreign VCSs.

All of those bugs have fixes later in this series.

The fifth test is the most complex, and does not have a fix
in this series. It tests pushing a ref via the export
mechanism to a new name on the remote side (i.e.,
"git push $remote old:new").

The problem is that we push all of the work of generating
the export stream onto fast-export, but we have no way of
communicating to fast-export that this name mapping is
happening. So we tell fast-export to generate a stream with
the commits for "old", but we can't tell it to label them
all as "new".

There are two possible solutions:

  1. Indicate the mapping to fast-export, so that it can
     generate the "mapped" names. Unfortunately, this is
     somewhat difficult due to the way fast-import is
     implemented. It feeds its revision parameters to the
     regular rev-walking machinery, asking the revision code
     to mark the "source" of each commit. So if fast-export
     sees that we want commits from "refs/heads/old", but
     also that we want to call commits from old as
     "refs/heads/new", it can't distinguish between the
     case of "I want _only_ new, using the commits of old"
     and "I want _both_ old and new, which happen to point
     to the same commits".

     And it's important to distinguish those cases, because
     in one, the remote will update master, and in the
     other, it will not.

     This isn't an insurmountable obstacle, but it's going
     to mean either fast-export has to take on more of the
     revision argument parsing and revwalking
     responsibility, or the revision walker's show_source
     code will have to learn about mapping names.

  2. Indicate the mapping to the remote helper, who can then
     apply the mapping to the results of the export. Right
     now the export remote helper command has no arguments;
     it simply says "hey, I'm going to dump a fast-export
     stream on you". And the remote-helper looks through the
     results of the stream to decide which refs are being
     pushed. This could be extended instead to something
     like:

       export refs/heads/foo
       export refs/heads/old:refs/heads/new
       <blank line>

     which would allow the remote helper to map names as
     appropriate. This a reasonably elegant solution; the
     downside is that it breaks compatibility with existing
     remote helpers.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t5800-remote-helpers.sh |   47 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 3a37ad0..a10a48d 100755
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -81,4 +81,51 @@ test_expect_success PYTHON_24 'pushing remote local repo' '
 	compare_refs clone HEAD server HEAD
 '
 
+test_expect_failure PYTHON_24 'fetch new branch' '
+	(cd public &&
+	 git checkout -b new &&
+	 echo content >>file &&
+	 git commit -a -m five &&
+	 git push origin new
+	) &&
+	(cd localclone &&
+	 git fetch origin new
+	) &&
+	compare_refs public HEAD localclone FETCH_HEAD
+'
+
+test_expect_failure PYTHON_24 'fetch multiple branches' '
+	(cd localclone &&
+	 git fetch
+	) &&
+	compare_refs server master localclone refs/remotes/origin/master &&
+	compare_refs server new localclone refs/remotes/origin/new
+'
+
+test_expect_failure PYTHON_24 'push when remote has extra refs' '
+	(cd clone &&
+	 echo content >>file &&
+	 git commit -a -m six &&
+	 git push
+	) &&
+	compare_refs clone master server master
+'
+
+test_expect_failure PYTHON_24 'push new branch by name' '
+	(cd clone &&
+	 git checkout -b new-name  &&
+	 echo content >>file &&
+	 git commit -a -m seven &&
+	 git push origin new-name
+	) &&
+	compare_refs clone HEAD server refs/heads/new-name
+'
+
+test_expect_failure PYTHON_24 'push new branch with old:new refspec' '
+	(cd clone &&
+	 git push origin new-name:new-refspec
+	) &&
+	compare_refs clone HEAD server refs/heads/new-refspec
+'
+
 test_done
-- 
1.7.6.rc0.35.gc40cb

  parent reply	other threads:[~2011-06-07 17:20 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-01 21:30 git clone (ssh://) skips detached HEAD Dmitry Ivankov
2011-06-01 22:05 ` Jeff King
2011-06-01 22:18   ` Dmitry Ivankov
2011-06-01 22:22   ` Junio C Hamano
2011-06-01 22:47     ` Jeff King
2011-06-01 22:53       ` Jeff King
2011-06-03  5:09       ` Jeff King
2011-06-03  5:10         ` [PATCH 1/3] t: add tests for cloning remotes with " Jeff King
2011-06-03  5:11         ` [PATCH 2/3] consider only branches in guess_remote_head Jeff King
2011-06-03  5:18         ` [PATCH 3/3] clone: always fetch remote HEAD Jeff King
2011-06-03  5:36           ` Sverre Rabbelier
2011-06-03  5:43             ` Jeff King
2011-06-03 14:51               ` Jeff King
2011-06-03 16:28                 ` Junio C Hamano
2011-06-03 18:10             ` Jeff King
2011-06-04  1:50               ` Sverre Rabbelier
2011-06-06 16:08                 ` Jeff King
2011-06-06  0:47               ` Junio C Hamano
2011-06-06  1:00                 ` Junio C Hamano
2011-06-06 13:05                   ` Sverre Rabbelier
2011-06-06 13:57                     ` Junio C Hamano
2011-06-06 16:11                   ` Jeff King
2011-06-06 19:05                     ` Sverre Rabbelier
2011-06-07 17:10                       ` Jeff King
2011-06-07 17:20                         ` Sverre Rabbelier
2011-06-07 17:18                     ` [PATCH 0/8] minor import/export remote helper fixes Jeff King
2011-06-07 17:19                       ` [PATCH 1/8] transport-helper: fix minor leak in push_refs_with_export Jeff King
2011-06-07 17:19                       ` [PATCH 2/8] git-remote-testgit: exit gracefully after push Jeff King
2011-06-07 17:48                         ` Sverre Rabbelier
2011-06-07 17:20                       ` [PATCH 3/8] t5800: factor out some ref tests Jeff King
2011-06-07 17:22                         ` Sverre Rabbelier
2011-06-07 17:20                       ` Jeff King [this message]
2011-06-07 17:25                         ` [PATCH 4/8] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-06-07 17:28                           ` Jeff King
2011-06-07 17:34                             ` Sverre Rabbelier
2011-06-07 17:51                               ` Jeff King
2011-06-07 17:53                                 ` Sverre Rabbelier
2011-06-07 17:55                                   ` Jeff King
2011-06-08 23:19                         ` Junio C Hamano
2011-06-09  0:11                           ` Jeff King
2011-06-09  0:43                             ` Junio C Hamano
2011-06-09  0:45                               ` Jeff King
2011-06-09  6:20                                 ` Sverre Rabbelier
2011-06-07 17:20                       ` [PATCH 5/8] teach remote-testgit to import non-HEAD refs Jeff King
2011-06-08 23:21                         ` Junio C Hamano
2011-06-09  0:17                           ` Jeff King
2011-06-07 17:21                       ` [PATCH 6/8] teach remote-testgit to import multiple refs Jeff King
2011-06-07 17:21                       ` [PATCH 7/8] transport-helper: don't feed bogus refs to export push Jeff King
2011-06-07 17:31                         ` Sverre Rabbelier
2011-06-07 17:21                       ` [PATCH 8/8] git_remote_helpers: push all refs during a non-local export Jeff King
2011-06-07 17:32                         ` Sverre Rabbelier
2011-06-07 17:42                           ` Jeff King
2011-06-07 17:44                             ` Sverre Rabbelier
2011-06-06 20:31           ` [PATCH 3/3] clone: always fetch remote HEAD Junio C Hamano
2011-06-06 22:08             ` Jeff King
2011-06-07 23:01               ` Jeff King
2011-06-07 23:03                 ` [PATCH 1/2] make copy_ref globally available Jeff King
2011-06-07 23:03                 ` [PATCH 2/2] clone: always fetch remote HEAD Jeff King
2011-06-07 23:18                 ` [PATCH 3/3] " Junio C Hamano
2011-06-03 16:11         ` git clone (ssh://) skips detached HEAD Junio C Hamano
2011-06-03 18:48           ` Jeff King
2011-06-01 22:42   ` Jakub Narebski
2011-06-01 22:51     ` Jeff King
2011-06-02 20:02       ` Jakub Narebski
2011-06-03  2:52         ` Jeff King

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=20110607172030.GC22111@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=artagnon@gmail.com \
    --cc=divanorama@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).