# HG changeset patch
# User domruf <dominikruf@gmail.com>
# Date 1494526165 -7200
# Node ID 8390da12aa16027b25fb45653418b2bc1993bd42
# Parent  182f46d62ab4b23f0287f86fe875ad4c170bf068
repositories: allow to pull changes from forked repo

It should be possible to pull changes not only from remote,
but also from locally forked repositories.

diff -r 182f46d62ab4 -r 8390da12aa16 kallithea/model/scm.py
--- a/kallithea/model/scm.py	Tue May 30 02:59:45 2017 +0200
+++ b/kallithea/model/scm.py	Thu May 11 20:09:25 2017 +0200
@@ -390,10 +390,10 @@
 
     def pull_changes(self, repo, username):
         """
-        Pull from "clone URL".
+        Pull from "clone URL" or fork origin.
         """
         dbrepo = self.__get_repo(repo)
-        clone_uri = dbrepo.clone_uri
+        clone_uri = dbrepo.clone_uri or dbrepo.fork and dbrepo.fork.repo_full_path
         if not clone_uri:
             raise Exception("This repository doesn't have a clone uri")
 
diff -r 182f46d62ab4 -r 8390da12aa16 kallithea/templates/admin/repos/repo_edit_remote.html
--- a/kallithea/templates/admin/repos/repo_edit_remote.html	Tue May 30 02:59:45 2017 +0200
+++ b/kallithea/templates/admin/repos/repo_edit_remote.html	Thu May 11 20:09:25 2017 +0200
@@ -1,6 +1,12 @@
-%if c.repo_info.clone_uri:
+%if c.repo_info.clone_uri or c.repo_info.fork:
 <h4>
-   ${_('Remote repository URL')}: <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
+  %if c.repo_info.fork:
+    ${_('Fork of repository')}:
+    <a href="${h.url('summary_home',repo_name=c.repo_info.fork.repo_name)}">${c.repo_info.fork.repo_name}</a>
+  %else:
+    ${_('Remote repository URL')}:
+    <a href="${c.repo_info.clone_uri}">${c.repo_info.clone_uri_hidden}</a>
+  %endif
 </h4>
 ${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))}
 <div class="form">