... | ... |
@@ -225,7 +225,7 @@ sub startup { |
225 | 225 |
$r->get('/network/graph/(*rev1)...(*rev2_abs)' => template '/network/graph'); |
226 | 226 |
|
227 | 227 |
# Import branch |
228 |
- $r->any('/import-branch/(*rev1)...(*rev2_abs)' => template '/import-branch'); |
|
228 |
+ $r->any('/import-branch/(*remote_branch_abs)' => template '/import-branch'); |
|
229 | 229 |
|
230 | 230 |
# Get branches and tags |
231 | 231 |
$r->get('/api/revs' => template '/api/revs'); |
... | ... |
@@ -1,9 +1,8 @@ |
1 | 1 |
<% |
2 | 2 |
my $user = param('user'); |
3 | 3 |
my $project = param('project'); |
4 |
- my $branch = param('rev1'); |
|
5 |
- my $rev2_abs = param('rev2_abs'); |
|
6 |
- my ($remote_user, $remote_project, $remote_branch) = split /\//, $rev2_abs, 3; |
|
4 |
+ my $remote_branch_abs = param('remote_branch_abs'); |
|
5 |
+ my ($remote_user, $remote_project, $remote_branch) = split /\//, $remote_branch_abs, 3; |
|
7 | 6 |
|
8 | 7 |
# Branches |
9 | 8 |
my $git = app->git; |
... | ... |
@@ -44,7 +44,7 @@ |
44 | 44 |
var remote_project = remote.find('[name=remote-project]').text(); |
45 | 45 |
var remote_branch = remote.find('[name=remote-branch]').val(); |
46 | 46 |
|
47 |
- location.href = '<%= url_for("/$user/$project/import-branch/") %>' + branch + '...' |
|
47 |
+ location.href = '<%= url_for("/$user/$project/import-branch/") %>' |
|
48 | 48 |
+ remote_member + '/' + remote_project + '/' + remote_branch; |
49 | 49 |
}); |
50 | 50 |
}); |