kallithea Changeset - e576410f911d

Changeset - e576410f911d

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-04 03:55:28
marcin@python-works.com

Don't do git pull on remote repos since they are bare now, we need to use git fetch on them

2 files changed with 14 insertions and 1 deletions:

rhodecode/lib/vcs/backends/git/repository.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -491,24 +491,35 @@ class GitRepository(BaseRepository): @@
     def pull(self, url):
         """
         Tries to pull changes from external location.
         """
         url = self._get_url(url)
         cmd = ['pull']
         cmd.append("--ff-only")
         cmd.append(url)
         cmd = ' '.join(cmd)
         # If error occurs run_git_command raises RepositoryError already
         self.run_git_command(cmd)
     def fetch(self, url):
         """
         Tries to pull changes from external location.
         """
         url = self._get_url(url)
         cmd = ['fetch']
         cmd.append(url)
         cmd = ' '.join(cmd)
         # If error occurs run_git_command raises RepositoryError already
         self.run_git_command(cmd)
     @LazyProperty
     def workdir(self):
         """
         Returns ``Workdir`` instance for this repository.
         """
         return GitWorkdir(self)
     def get_config_value(self, section, name, config_file=None):
         """
         Returns configuration value for a given [``section``] and ``name``.
         :param section: Section we want to retrieve value from

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -351,25 +351,27 @@ class ScmModel(BaseModel): @@
         try:
             extras = {
                 'ip': '',
                 'username': username,
                 'action': 'push_remote',
                 'repository': repo_name,
                 'scm': repo.alias,
+            }
             # inject ui extra param to log this action via push logger
             for k, v in extras.items():
                 repo._repo.ui.setconfig('rhodecode_extras', k, v)
             if repo.alias == 'git':
                 repo.fetch(clone_uri)
             else:
             repo.pull(clone_uri)
             self.mark_for_invalidation(repo_name)
         except:
             log.error(traceback.format_exc())
             raise
     def commit_change(self, repo, repo_name, cs, user, author, message,
                       content, f_path):
         if repo.alias == 'hg':
             from rhodecode.lib.vcs.backends.hg import \
                 MercurialInMemoryChangeset as IMC

0 comments (0 inline, 0 general)