Skip to content

Commit

Permalink
remote-testgit: fix direction of marks
Browse files Browse the repository at this point in the history
Basically this is what we want:

  == pull ==

	testgit			transport-helper

	* export ->		import

	# testgit.marks		git.marks

  == push ==

	testgit			transport-helper

	* import		<- export

	# testgit.marks		git.marks

Each side should be agnostic of the other side. Because testgit.marks
(our helper marks) could be anything, not necessarily a format parsable
by fast-export or fast-import. In this test they happen to be compatible,
because we use those tools, but in the real world it would be something
completely different. For example, they might be mapping marks to
mercurial revisions (certainly not parsable by fast-import/export).

This is what we have:

  == pull ==

	testgit			transport-helper

	* export ->		import

	# testgit.marks		git.marks

  == push ==

	testgit			transport-helper

	* import		<- export

	# git.marks		testgit.marks

The only reason this is working is that git.marks and testgit.marks are
roughly the same.

This new behavior used to not be possible before due to a bug in
fast-export, but with the bug fixed, it works fine.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Nov 26, 2012
1 parent 5d3698f commit 3b70526
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion git-remote-testgit.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def do_capabilities(repo, args):
if not os.path.exists(dirname):
os.makedirs(dirname)

path = os.path.join(dirname, 'testgit.marks')
path = os.path.join(dirname, 'git.marks')

print "*export-marks %s" % path
if os.path.exists(path):
Expand Down
2 changes: 1 addition & 1 deletion git_remote_helpers/git/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def do_import(self, base):
gitdir = self.repo.gitpath
else:
gitdir = os.path.abspath(os.path.join(dirname, '.git'))
path = os.path.abspath(os.path.join(dirname, 'git.marks'))
path = os.path.abspath(os.path.join(dirname, 'testgit.marks'))

if not os.path.exists(dirname):
os.makedirs(dirname)
Expand Down

0 comments on commit 3b70526

Please sign in to comment.