Dulwich

Merge lp:~quartz25/dulwich/alt-ssh-path into lp:~vcs-imports/dulwich/trunk

  1. alt-ssh-path
  2. Merge into trunk
Proposed by Ross Light
Status: Superseded
Proposed branch: lp:~quartz25/dulwich/alt-ssh-path
Merge into: lp:~vcs-imports/dulwich/trunk
Diff against target: 29 lines (+6/-2)
1 file modified
dulwich/client.py (+6/-2)
To merge this branch: bzr merge lp:~quartz25/dulwich/alt-ssh-path
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+26108@code.launchpad.net

This proposal has been superseded by a proposal from 2010-06-04.

Description of the change

Allows alternate paths for the git-receive-pack and git-upload-pack over SSH connections.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks.

review: Approve (code)
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

We need to make sure this is merged in the right order, Augie has some upcoming refactoring work that might conflict with this.

lp:~quartz25/dulwich/alt-ssh-path updated
603. By Ross Light

Merged changes from trunk

Unmerged revisions

603. By Ross Light

Merged changes from trunk

602. By Ross Light

Added SSHGitClient.receive_pack_path and SSHGitClient.upload_pack_path attributes

601. By Jelmer Vernooij

release 0.6.0.

600. By Jelmer Vernooij

Add reminder to update NEWS to HACKING.

599. By Jelmer Vernooij

Update NEWS.

598. By Jelmer Vernooij

Merge some extra tests for packed ref deletion with no peeled refs

597. By Jelmer Vernooij

Merge fix for crash deleting a ref.

596. By Jelmer Vernooij

Merge fix for send pack when there is nothing to fetch from Augie.

595. By Jelmer Vernooij

Remove PackData.__del__ as it causes reference loops; use PackData.close
instead.

594. By Augie Fackler

dulwich.client: fix fetch if no progress function is specified

Change-Id: I0627b9bea8d7259984fb6587a877bb027dde7367

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dulwich/client.py'
2--- dulwich/client.py 2010-05-20 21:51:34 +0000
3+++ dulwich/client.py 2010-05-26 22:14:23 +0000
4@@ -369,19 +369,23 @@
5 self.host = host
6 self.port = port
7 self.username = username
8+ self.receive_pack_path = "git-receive-pack"
9+ self.upload_pack_path = "git-upload-pack"
10 self._args = args
11 self._kwargs = kwargs
12
13 def send_pack(self, path, determine_wants, generate_pack_contents):
14 remote = get_ssh_vendor().connect_ssh(
15- self.host, ["git-receive-pack '%s'" % path],
16+ self.host, ["'%s' '%s'" % (self.receive_pack_path, path)],
17 port=self.port, username=self.username)
18 client = GitClient(lambda: _fileno_can_read(remote.proc.stdout.fileno()), remote.recv, remote.send, *self._args, **self._kwargs)
19 return client.send_pack(path, determine_wants, generate_pack_contents)
20
21 def fetch_pack(self, path, determine_wants, graph_walker, pack_data,
22 progress):
23- remote = get_ssh_vendor().connect_ssh(self.host, ["git-upload-pack '%s'" % path], port=self.port, username=self.username)
24+ remote = get_ssh_vendor().connect_ssh(
25+ self.host, ["'%s' '%s'" % (self.upload_pack_path, path)],
26+ port=self.port, username=self.username)
27 client = GitClient(lambda: _fileno_can_read(remote.proc.stdout.fileno()), remote.recv, remote.send, *self._args, **self._kwargs)
28 return client.fetch_pack(path, determine_wants, graph_walker, pack_data,
29 progress)

Subscribers

People subscribed via source and target branches