| Git使用说明 | +
|---|
| 我们将使用 git 这个分布式版本控制系统来提交代码，下面就来介绍一下代码的提交方法。 | +
| + |
Step1： |
+
打开终端，输入如下命令： |
+
$git config --global user.name “your_name” + +$git config --global user.email “your_email” |
+
用户名和email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到）。 |
+
| + |
Tips： |
+
在碰到不熟悉的命令时，可以通过 git help命令查看git的用户手册，命令如下： |
+
$git help <command> |
+
| + |
Step2: |
+
创建版本库（两种途径） |
+
（1）从远程服务器上克隆一个已存在的版本库到本地： |
+
$git clone http://user_name@domain/repo_path.git |
+
其中，domain是服务器的域名(在trustie系统域名222.247.54.100)，repo_path.git是版本库在服务器的相对路径(这个地址在trustie系统中会给出) |
+
| + |
（2）在本地初始化一个版本库，比如将版本库命名为“DEMO”，使用名为/path/to/my/workspace的目录作为个人的工作区根目录，进入该目录后，执行git init创建版本库。 |
+
$cd /path/to/my/workspace |
+
$mkdir demo |
+
$cd demo |
+
$git init |
+
+
+
完成上述操作后，可以看到git init命令在工作区创建了隐藏目录 .git。这个隐藏的 .git目录就是git版本库（repository）。 |
+
| + |
Step3： |
+
提交文件到本地仓库： |
+
$git add file1 file2 |
+
files是做了修改的文件，多个文件使用空格隔开。 |
+
$git commit –m "commit message" |
+
通过-m参数设置提交说明为“commit message”，Git强制性的要求在提交过程中需要输入提交说明，可以使用git log命令来查看提交日志。 |
+
| + |
Step4： |
+
将本地分支推送到远程仓库： |
+
上述操作仅仅是在本地建立了一个git版本库，为了协同工作，我们可以将其推送到远程服务器。 |
+
$git remote add origin http://user_name@domain/repo_path.git |
+
远程库别名为origin |
+
$git push origin master |
+
将本地的master分支推送到origin的master分支 |
+
| + |
Step5： |
+
将远程仓库的分支更新到本地： |
+
当项目小组有成员将其自己的代码推送到服务器，我们可以使用git pull (或者git fetch)获取更新后的代码。 |
+
$git pull origin master |
+
将远程库origin的master分支更新到本地的master分支 |
+
| + |
| ——Trustie团队 | +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/app/views/git_usage/en_usage.html.erb b/app/views/git_usage/en_usage.html.erb new file mode 100644 index 000000000..9579ae887 --- /dev/null +++ b/app/views/git_usage/en_usage.html.erb @@ -0,0 +1,245 @@ + + + + + + +
| Git User Guide | +
|---|
| We will use git which is a distributed version control and source code management system to submit our code, here is the submission method. | +
| + |
Step1： |
+
Enter the following command in the terminal： |
+
$git config --global user.name “your_name” + +$git config --global user.email “your_email” |
+
User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository). |
+
| + |
Tips： |
+
You can read the user manual by enter " git help " command when you are confused, command as follows: |
+
$git help <command> |
+
| + |
Step2: |
+
Create a new repository by two ways, here we go |
+
(1) The first way is clone a repository which is already exists from remote Server to local: |
+
$git clone http://user_name@domain/repo_path.git |
+
The "domain" in the command means the server's domain name(the domain name in Trustie system is 222.247.54.100), "repo_path.git" is the relative path(this address will be given in Trustie) |
+
| + |
(2) Initialize a repository on the local, we named repository as “DEMO” for example, use the directory "/path/to/my/workspace" as a root of personal workspace. |
+
Enter the directory, execute the "git init" command to create the repository. |
+
$cd /path/to/my/workspace |
+
$mkdir demo |
+
$cd demo |
+
$git init |
+
+
+
After completed these operation, you can see "git init " command creates a hidden directory in the workspace and this hidden directory is the git repository. |
+
| + |
Step3： |
+
Submit the file to the local repository: |
+
$git add file1 file2 |
+
"file1" is the file which is already modified, multiple files separated by spaces. |
+
$git commit –m "commit message" |
+
“commit message”is a submission instructions which is a mandatory requirement in the Git, you can use "git log" to list the commit log. |
+
| + |
Step4： |
+
Push the local branches to the remote repository: |
+
The operation we mentioned above is only to establish a local git repository, we can push it to the remote server in order to work together in the future. |
+
$git remote add origin http://user_name@domain/repo_path.git |
+
In Git, we call remote repository as origin |
+
$git push origin master |
+
Push the local master branch to the origin master branch . |
+
| + |
Step5： |
+
Get the latest branch from the remote repository: |
+
When your team members push the code to the server, we can use "git pull " (or "git fetch") to obtain the modified code.。 |
+
$git pull origin master |
+
Pull the remote master branch to the local master branch. |
+
| + |
| --By Trustie Team | +
+
+
+
+
+ + + + diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index b16159ce7..8294c6562 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,3 +1,9 @@ + +
| <%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %> | +
|
+ |||||||
<%= f.password_field :upassword, :required =>true, :label=> :field_password %> + <%= l(:label_upassword_info)%>
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index f6a0ef6c4..46713e9c6 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -4,10 +4,18 @@ <%= render :partial => 'navigation' %> - +<% project_path_cut = 40 %> +<% ip = "repository.trustie.net" %>
(<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| @@ -68,6 +76,8 @@ <% end %> <% end %> +如何提交代码 <%= link_to('中文', ch_usage_path)%> <%= link_to('English', en_usage_path)%> + <% content_for :header_tags do %> diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index 2bc1eb90d..f6a0ef6c4 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -1,58 +1,77 @@ - -
+ (<%= l(:label_all_revisions) %><%= @repositories.sort.collect {|repo| + link_to h(repo.name), + {:controller => 'repositories', :action => 'show', + :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil}, + :class => 'repository' + (repo == @repository ? ' selected' : '') + }.join(' | ').html_safe %>)
+ <% end %> + +<% if !@entries.nil? && authorize_for('repositories', 'browse') %> + <%= render :partial => 'dir_list' %> +<% end %> +<%= render_properties(@properties) %> -<% if @issues.present? %> -<%= form_tag({}) do -%> -| <%= check_box_tag 'ids[]', issue.id, false, :id => nil %> | -<%= link_to_issue(issue, :project => (@project != issue.project)) %> | -
+ <% has_branches = (!@repository.branches.nil? && @repository.branches.length > 0) + sep = '' %> + <% if @repository.supports_all_revisions? && @path.blank? %> + <%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project, + :repository_id => @repository.identifier_param %> + <% sep = '|' %> + <% end %> + <% if @repository.supports_directory_revisions? && + ( has_branches || !@path.blank? || !@rev.blank? ) %> + <%= sep %> + <%= link_to l(:label_view_revisions), + :action => 'changes', + :path => to_path_param(@path), + :id => @project, + :repository_id => @repository.identifier_param, + :rev => @rev %> + <% end %> +
+ <% if @repository.supports_all_revisions? %> + <% content_for :header_tags do %> + <%= auto_discovery_link_tag( + :atom, params.merge( + {:format => 'atom', :action => 'revisions', + :id => @project, :page => nil, :key => User.current.rss_key})) %> + <% end %> -| 朋友，系统仍在不断完善，有意见和建议请 <%= toggle_link '点击我', 'put-bid-form', {:focus => 'new_form_project_message'} %> | ||||
| + + | ||||
| <%= link_to image_tag("/images/welcome/1.png", weight:"190px", height:"190px"), :controller => 'projects', :action => 'index' %> | @@ -262,8 +307,12 @@ software development and software crowdsourcing. | <%= l(:label_milestone_description) %> | +||