return false
end
+ def render_error(msg)
+ flash.now[:error] = msg
+ render :nothing => true, :layout => !request.xhr?, :status => 500
+ end
+
def render_feed(items, options={})
@items = items || []
@items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
# latest changesets
@changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
show_error and return unless @entries || @changesets.any?
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def browse
else
show_error unless @entries
end
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def changes
@entry = @repository.scm.entry(@path, @rev)
show_error and return unless @entry
@changesets = @repository.changesets_for_path(@path)
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def revisions
# Prevent empty lines when displaying a file with Windows style eol
@content.gsub!("\r\n", "\n")
end
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def annotate
@annotate = @repository.scm.annotate(@path, @rev)
show_error and return if @annotate.nil? || @annotate.empty?
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def revision
end
rescue ChangesetNotFound
show_error
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def diff
@diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
show_error and return unless @diff
end
+ rescue Redmine::Scm::Adapters::CommandFailed => e
+ show_error_command_failed(e.message)
end
def stats
render_404
end
- def show_error
- flash.now[:error] = l(:notice_scm_error)
- render :nothing => true, :layout => true
+ def show_error_not_found
+ render_error l(:error_scm_not_found)
+ end
+
+ def show_error_command_failed(msg)
+ render_error l(:error_scm_command_failed, msg)
end
def graph_commits_per_month(repository)
notice_successful_connection: Успешно свързване.
notice_file_not_found: Несъществуваща или преместена страница.
notice_locking_conflict: Друг потребител променя тези данни в момента.
-notice_scm_error: Несъществуващ обект в склада.
notice_not_authorized: Нямате право на достъп до тази страница.
notice_email_sent: Изпратен e-mail на %s
notice_email_error: Грешка при изпращане на e-mail (%s)
notice_feeds_access_key_reseted: Вашия ключ за RSS достъп беше променен.
+error_scm_not_found: Несъществуващ обект в склада.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Вашата парола
mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
mail_subject_register: Активация на акаунт
notice_successful_connection: Úspěšné připojení.
notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.
notice_locking_conflict: Údaje byly změněny jiným uživatelem.
-notice_scm_error: Entry and/or revision doesn't exist in the repository.
notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.
notice_email_sent: Na adresu %s byl odeslán email
notice_email_error: Při odesílání emailu nastala chyba (%s)
notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
+error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Vaše heslo
mail_body_lost_password: 'To change your Redmine password, click on the following link:'
mail_subject_register: aktivace účtu
notice_successful_connection: Verbindung erfolgreich.
notice_file_not_found: Anhang besteht nicht oder ist gelöscht worden.
notice_locking_conflict: Datum wurde von einem anderen Benutzer geändert.
-notice_scm_error: Eintrag und/oder Revision besteht nicht im Projektarchiv.
notice_not_authorized: Sie sind nicht berechtigt, auf diese Seite zuzugreifen.
notice_email_sent: Eine E-Mail wurde an %s gesendet.
notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
+error_scm_not_found: "Eintrag und/oder Revision besteht nicht im Projektarchiv."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Ihr Redmine-Kennwort
mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
mail_subject_register: Redmine Kontoaktivierung
notice_successful_connection: Successful connection.
notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
notice_locking_conflict: Data have been updated by another user.
-notice_scm_error: Entry and/or revision doesn't exist in the repository.
notice_not_authorized: You are not authorized to access this page.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_default_data_loaded: Default configuration successfully loaded.
error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
mail_subject_lost_password: Your Redmine password
mail_body_lost_password: 'To change your Redmine password, click on the following link:'
notice_successful_connection: Conexión correcta.
notice_file_not_found: La página a la que intentas acceder no existe.
notice_locking_conflict: Los datos han sido modificados por otro usuario.
-notice_scm_error: La entrada y/o la revisión no existe en el repositorio.
notice_not_authorized: No tiene autorización para acceder a esta página.
+error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
mail_body_lost_password: 'Para cambiar su contraseña de Redmine, haga click en el siguiente enlace:'
mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
notice_successful_connection: Yhteyden muodostus onnistui.
notice_file_not_found: Hakemaasi sivua ei löytynyt tai se on poistettu.
notice_locking_conflict: Toinen käyttäjä on päivittänyt tiedot.
-notice_scm_error: Syötettä ja/tai versiota ei löydy säiliöstä.
notice_not_authorized: Sinulla ei ole oikeutta näyttää tätä sivua.
notice_email_sent: Sähköposti on lähetty osoitteeseen %s
notice_email_error: Sähköpostilähetyksessä tapahtui virhe (%s)
notice_default_data_loaded: Vakio asetusten palautus onnistui.
error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
+error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
mail_subject_lost_password: Sinun Redmine salasanasi
mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
+error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
+error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
mail_subject_lost_password: Votre mot de passe redMine
mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
notice_successful_connection: חיבור מוצלח.
notice_file_not_found: הדף שאת\ה מנסה לגשת אליו אינו קיים או שהוסר.
notice_locking_conflict: המידע עודכן על ידי משתמש אחר.
-notice_scm_error: כניסה ו\או גירסא אינם קיימים במאגר.
notice_not_authorized: אינך מורשה לראות דף זה.
notice_email_sent: דוא"ל נשלח לכתובת %s
notice_email_error: ארעה שגיאה בעט שליחת הדוא"ל (%s)
notice_failed_to_save_issues: "נכשרת בשמירת %d נושא\ים ב %d נבחרו: %s."
notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את הנושאים שברצונך לערוך."
+error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: סיסמת ה-Redmine שלך
mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:'
mail_subject_register: הפעלת חשבון Redmine
notice_successful_connection: Connessione effettuata.
notice_file_not_found: La pagina desiderata non esiste o è stata rimossa.
notice_locking_conflict: Le informazioni sono state modificate da un altro utente.
-notice_scm_error: La risorsa e/o la versione non esistono nel repository.
notice_not_authorized: You are not authorized to access this page.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_feeds_access_key_reseted: Your RSS access key was reseted.
+error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Password redMine
mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
mail_subject_register: Attivazione utenza redMine
notice_successful_connection: 接続しました。
notice_file_not_found: アクセスしようとしたページは存在しないか削除されています。
notice_locking_conflict: 別のユーザがデータを更新しています。
-notice_scm_error: リポジトリに、エントリ/リビジョンが存在しません。
notice_not_authorized: このページにアクセスするには認証が必要です。
notice_email_sent: %s宛にメールを送信しました。
notice_email_error: メール送信中にエラーが発生しました(%s)
notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
+error_scm_not_found: リポジトリに、エントリ/リビジョンが存在しません。
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Redmineパスワード
mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
mail_subject_register: Redmineアカウントが有効になりました
notice_successful_connection: 연결 성공.
notice_file_not_found: 요청하신 페이지는 삭제되었거나 옮겨졌습니다.
notice_locking_conflict: 다른 사용자에 의해서 데이터가 변경되었습니다.
-notice_scm_error: 소스 저장소에 해당 내용이 존재하지 않습니다.
notice_not_authorized: 이 페이지에 접근할 권한이 없습니다.
notice_email_sent: %s 님에게 Email이 발송되었습니다.
notice_email_error: 메일을 전송하는 과정에 오류가 발생했습니다. (%s)
notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
notice_no_issue_selected: "티켓이 선택되지 않았습니다. 수정하기 원하는 티켓을 선택하세요"
+error_scm_not_found: 소스 저장소에 해당 내용이 존재하지 않습니다.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: 당신의 비밀번호
mail_body_lost_password: '비밀번호를 변경하기 위해서 링크를 이용하세요'
mail_subject_register: 당신의 계정 활성화
notice_successful_connection: Sėkmingas susijungimas.
notice_file_not_found: Puslapis, į kurį ketinate įeiti, neegzistuoja arba pašalintas.
notice_locking_conflict: Duomenys atnaujinti kito vartotojo.
-notice_scm_error: Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja.
notice_not_authorized: Jūs neturite teisių gauti prieigą prie šio puslapio.
notice_email_sent: Laiškas išsiųstas %s
notice_email_error: Laiško siųntimo metu įvyko klaida (%s)
notice_failed_to_save_issues: "Nepavyko išsaugoti %d problemos(ų) iš %d pasirinkto: %s."
notice_no_issue_selected: "Nepasirinkta nė viena problema! Prašom pažymėti problemą, kurią norite redaguoti."
notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administratoriaus patvirtinimo."
-
+
+error_scm_not_found: "Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Jūsų Redmine slaptažodis
mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
mail_subject_register: 'Redmine paskyros aktyvavymas'
notice_successful_connection: Verbinding succesvol.
notice_file_not_found: De pagina die U probeerde te benaderen bestaat niet of is verwijderd.
notice_locking_conflict: De gegevens zijn gewijzigd door een andere gebruiker.
-notice_scm_error: Deze ingang of revisie bestaat niet in de repository.
notice_not_authorized: Het is U niet toegestaan om deze pagina te raadplegen.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_feeds_access_key_reseted: Your RSS access key was reseted.
+error_scm_not_found: "Deze ingang of revisie bestaat niet in de repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Uw redMine wachtwoord
mail_body_lost_password: 'Gebruik de volgende link om Uw wachtwoord te wijzigen:'
mail_subject_register: redMine account activatie
notice_successful_connection: Udane nawiązanie połączenia.
notice_file_not_found: Strona do której próbujesz się dostać nie istnieje lub została usunięta.
notice_locking_conflict: Dane poprawione przez innego użytkownika.
-notice_scm_error: Wejście i/lub zmiana nie istnieje w repozytorium.
notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
+error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Twoje hasło do redMine
mail_body_lost_password: 'W celu zmiany swojego hasła użyj poniższego odnośnika:'
mail_subject_register: Aktywacja konta w redMine
notice_successful_connection: Conectado com sucesso.\r
notice_file_not_found: A pagina que voce esta tentando acessar nao existe ou foi excluida.\r
notice_locking_conflict: Os dados foram atualizados por um outro usuario.\r
-notice_scm_error: A entrada e/ou a revisao nao existem no repositorio.\r
notice_not_authorized: You are not authorized to access this page.\r
notice_email_sent: An email was sent to %s\r
notice_email_error: An error occurred while sending mail (%s)\r
notice_feeds_access_key_reseted: Your RSS access key was reseted.\r
\r
+error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio."\r
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"\r
+\r
mail_subject_lost_password: Sua senha do redMine.\r
mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'\r
mail_subject_register: Ativacao de conta do redMine.\r
notice_successful_connection: Conectado com sucesso.
notice_file_not_found: A página que você está tentando acessar não existe ou foi excluída.
notice_locking_conflict: Os dados foram atualizados por um outro usuário.
-notice_scm_error: A entrada e/ou a revisão não existem no repositório.
notice_not_authorized: Você não está autorizado a acessar esta página.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_feeds_access_key_reseted: Your RSS access key was reseted.
+error_scm_not_found: "A entrada e/ou a revisão não existem no repositório."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Sua senha do redMine.
mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
mail_subject_register: Ativação de conta do redMine.
notice_successful_connection: Conectare cu succes.
notice_file_not_found: Pagina dorita nu exista sau nu mai este valabila.
notice_locking_conflict: Informatiile au fost modificate de un alt utilizator.
-notice_scm_error: Articolul sau reviziunea nu exista in stoc (Repository).
notice_not_authorized: Nu aveti autorizatia sa accesati aceasta pagina.
notice_email_sent: Un e-mail a fost trimis la adresa %s
notice_email_error: Eroare in trimiterea e-mailului (%s)
notice_feeds_access_key_reseted: Parola de acces RSS a fost resetat.
+error_scm_not_found: "Articolul sau reviziunea nu exista in stoc (Repository)."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Your Redmine password
mail_body_lost_password: 'To change your Redmine password, click on the following link:'
mail_subject_register: Redmine account activation
notice_successful_connection: Подключение успешно установлено.
notice_file_not_found: Страница, на которую вы пытаетесь зайти, не существует или удалена.
notice_locking_conflict: Информация обновлена другим пользователем.
-notice_scm_error: Записи и/или исправления нет в репозитории.
notice_not_authorized: У вас нет прав для посещения данной страницы.
notice_email_sent: Отправлено письмо %s
notice_email_error: Во время отправки письма произошла ошибка (%s)
notice_failed_to_save_issues: "Не удалось сохранить %d пункт(ов)из %d выбранных: %s."
notice_no_issue_selected: "Не выбрано ни одной задачи! Пожалуйста, отметьте задачи, которые вы хотите отредактировать."
+error_scm_not_found: Записи и/или исправления нет в репозитории.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Ваш Redmine пароль
mail_body_lost_password: 'Для изменения Redmine пароля, зайдите по следующей ссылке:'
mail_subject_register: Активация учетной записи Redmine
notice_successful_connection: Uspešna konekcija.
notice_file_not_found: Stranica kojoj pokušavate da pristupite ne postoji ili je uklonjena.
notice_locking_conflict: Podaci su izmenjeni od strane drugog korisnika.
-notice_scm_error: Unos i/ili revizija ne postoji u spremištu.
notice_not_authorized: Niste ovlašćeni da pristupite ovoj stranici.
notice_email_sent: Email je poslat %s
notice_email_error: Došlo je do greške pri slanju maila (%s)
notice_failed_to_save_issues: "Neuspešno snimanje %d kartica na %d izabrano: %s."
notice_no_issue_selected: "Nijedna kartica nije izabrana! Molim, izaberite kartice koje želite za editujete."
+error_scm_not_found: "Unos i/ili revizija ne postoji u spremištu."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Vaša redMine lozinka
mail_body_lost_password: 'Da biste izmenili vašu Redmine lozinku, kliknite na sledeći link:'
mail_subject_register: aktivacija redMine naloga
notice_successful_connection: Lyckad uppkoppling.
notice_file_not_found: Sidan du försökte komma åt existerar inte eller har blivit borttagen.
notice_locking_conflict: Data har uppdaterats av en annan användare.
-notice_scm_error: Inlägg och/eller revision finns inte i repositoriet.
notice_not_authorized: You are not authorized to access this page.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_feeds_access_key_reseted: Your RSS access key was reseted.
+error_scm_not_found: "Inlägg och/eller revision finns inte i repositoriet."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: Ditt redMine lösenord
mail_body_lost_password: 'För att ändra lösenord, följ denna länk:'
mail_subject_register: redMine kontoaktivering
notice_successful_connection: Successful connection.
notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
notice_locking_conflict: Data have been updated by another user.
-notice_scm_error: SCM 儲存庫中找不到這個專案或版本。
notice_not_authorized: 你未被授權存取此頁面。
notice_email_sent: 郵件已經成功寄送至以下收件者： %s
notice_email_error: 寄送郵件的過程中發生錯誤 (%s)
notice_account_pending: "您的帳號已經建立，正在等待管理員的審核。"
notice_default_data_loaded: Default configuration successfully loaded.
+error_scm_not_found: SCM 儲存庫中找不到這個專案或版本。
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
error_can_t_load_default_data: "Default configuration could not be loaded: %s"
mail_subject_lost_password: 您的 Redmine 網站密碼
notice_successful_connection: 连接成功
notice_file_not_found: 您访问的页面不存在或已被删除。
notice_locking_conflict: 数据已被另一个用户更新
-notice_scm_error: 在版本库中不存在该条目或修订
notice_not_authorized: You are not authorized to access this page.
notice_email_sent: An email was sent to %s
notice_email_error: An error occurred while sending mail (%s)
notice_feeds_access_key_reseted: Your RSS access key was reseted.
+error_scm_not_found: 在版本库中不存在该条目或修订
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
mail_subject_lost_password: 您的redMine口令
mail_body_lost_password: 'To change your Redmine password, click on the following link:'
mail_subject_register: redMine帐户激活
rescue Errno::ENOENT => e
# The command failed, log it and re-raise
logger.error("SCM command failed: #{cmd}\n with: #{e.message}")
- raise CommandFailed
+ raise CommandFailed.new(e.message)
end
end
end
entries = Entries.new\r
cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"\r
cmd << credentials_string\r
- cmd << " 2>&1"\r
shellout(cmd) do |io|\r
output = io.read\r
begin\r
projects / redmine.git / commitdiff