Commit 56b28b98 authored by Thibault Saunier's avatar Thibault Saunier Committed by Thibault Saunier

Update guides and links to gitlab

parent ec62911e
......@@ -25,7 +25,7 @@
</screenshot>
</screenshots>
<url type="homepage">http://www.pitivi.org</url>
<url type="bugtracker">https://phabricator.freedesktop.org/tag/pitivi/</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/pitivi/</url>
<url type="donation">http://www.pitivi.org/?go=donators</url>
<url type="help">http://www.pitivi.org/manual/</url>
<url type="translate">https://wiki.gnome.org/TranslationProject#How_can_I_help.3F</url>
......
......@@ -4,28 +4,15 @@ Welcome, testers!
To report a bug/problem in the software, or request a new
feature/enhancement, [create a
task](https://phabricator.freedesktop.org/maniphest/task/edit/form/1/?projects=pitivi)
task](https://gitlab.gnome.org/GNOME/pitivi/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=)
and set Projects: Pitivi.
Bug reporting and feature requests are managed with Freedesktop's
[Phabricator](https://phabricator.freedesktop.org). You need to create
Bug reporting and feature requests are managed with GNOME's
[GitLab](https://gitlab.gnome.org/). You need to create
an account to file tasks and comment on them. Take a look at the
[existing list of bugs/feature
requests](https://phabricator.freedesktop.org/tag/pitivi/) to see if
your problem has already been reported *(hint: use control+F in your
browser to search!)*.
Example queries:
- [Everything](https://phabricator.freedesktop.org/tag/pitivi/) - All
the tasks (bug reports and feature requests).
- [Patches](https://phabricator.freedesktop.org/differential/query/8RA8XgY0ogT3/)
— All the patches (diffs) attached to tasks that have not yet been
merged.
- [Pitivi tasks for
newcomers](https://phabricator.freedesktop.org/project/view/111/) —
feature requests and some small bugs that are considered easier for
new contributors to tackle.
requests](https://gitlab.gnome.org/GNOME/pitivi/issues) to see if
your problem has already been reported.
# Providing debugging information
......
......@@ -4,8 +4,7 @@ short-description: How we do it
# Development Workflow
We use [Phabricator
tasks](https://phabricator.freedesktop.org/tag/pitivi/) to track all
We use [Gitlab](https://gitlab.gnome.org/GNOME/pitivi/issues) to track all
bugs and feature requests. Feel free to open a task if you have found a
bug or wish to see a feature implemented. If it already exists,
subscribe to it to keep yourself updated with its progress. You can also
......@@ -14,12 +13,11 @@ subscribe to the entire project.
## Picking a task to work on
To get involved, you can start with tasks tagged [Pitivi tasks for
newcomers](https://phabricator.freedesktop.org/tag/pitivi_tasks_for_newcomers/).
newcomers](https://gitlab.gnome.org/GNOME/pitivi/issues?label_name%5B%5D=4.+Newcomers).
It's best to get in touch with us on our IRC channel `#pitivi` on
Freenode, to see if it's still meaningful.
Once you decide, assign the task to yourself in Phabricator.
Once you decide, assign the task to yourself in GitLab.
## Fixing the task
......@@ -30,18 +28,11 @@ annoying bug:
### Create a new git branch
Create a new branch with a relevant name in your local git repository.
The name must start with the task ID.
For example, if you're
going to work on task [T7674](https://phabricator.freedesktop.org/T7674)
titled "Traceback when selecting a JPG file in the import dialog", the
branch could be called T7674-import-img:
```
$ git checkout -b T7674-import-img origin/master
$ git checkout -b feature_name origin/master
```
### Commit your changes
Once you have made your changes, commit them in your local git
......@@ -54,67 +45,22 @@ perform checks on the changes. In some cases it does some automatic
fixes – when this happens, make sure those are included in the commit you
want to create.
### Propose your patches
### Upload your commit to Phabricator
Now you're all set to push your first diff to
[Phabricator](https://phabricator.freedesktop.org/tag/pitivi) for review!
```
(ptv-flatpak) $ git-phab attach
```
If there is no tracking information for the current branch,
[git-phab](https://phabricator.freedesktop.org/diffusion/GITPHAB/repository/master/)
will complain, as it won't be able to figure out what your changes are.
You can specify the tracked branch like this:
```
$ git branch --set-upstream-to=origin/master
```
Attaching does many things:
- Creates multiple Differential Revisions representing each of your
unattached commits and updates the ones already attached. See for
example [D1617](https://phabricator.freedesktop.org/D1617).
- Amends the message of the previously-unattached commits so they
contain the associated Differential Revision URL. See for example
[b6a1384dbeef](https://phabricator.freedesktop.org/rPTVb6a1384dbeefe228158ad5aaf96fb53f6a7fffa9).
- Finds out the Task ID from the branch name.
- Attaches the Differential Revisions to the Task.
- Pushes your branch to a "staging" git repo, so we can try exactly what
you did.
We'll get an automatic email and then review it ASAP.
For those of you familiar with Phabricator's tool for managing
revisions, pay attention `arc` creates a single revision for the entire
branch, while our `git-phab` attaches each commit in the branch as a
separate revision.
1. In the [GitLab UI](https://gitlab.gnome.org/GNOME/pitivi) press the "fork"
button (*WARNING: Make sure to be authenticated otherwise the button won't be
avalaible*)
2. Add the remote git repository you just forked as a remote to your local git repository:
## Using a custom staging repository
git remote add *yourgitlabusername* https://gitlab.gnome.org/yourgitlabusername/pitivi
Optionally, you can set git-phab to push your branches to a personal
remote repository when you attach:
3. Push your branch to your fork with:
1. Add your cloned remote Pitivi repository as a remote to your local repository:
git push *yourgitlabusername*
```
$ git remote add github https://github.com/NICK/pitivi.git
$ git remote set-url github https://github.com/NICK/pitivi.git
$ git remote set-url --push github git@github.com:NICK/pitivi.git
$ git remote show github | grep URL
Fetch URL: https://github.com/NICK/pitivi.git
Push URL: git@github.com:NICK/pitivi.git
```
2. Set git-phab remote to your cloned remote Pitivi repository:
4. Create merge request either by the link that shows in the command line after
pushing or in the GitLab UI clicking "Create merge request" in your branch.
```
$ git config phab.remote github
```
[Gitlab workflow for contribution]: https://gitlab.gnome.org/GNOME/pitivi/
[gitlab]: https://gitlab.gnome.org/GNOME/pitivi/
\ No newline at end of file
......@@ -4,7 +4,8 @@ short-description: Things beginners can help us with
# Pitivi Love
The [Pitivi tasks for
newcomers](https://phabricator.freedesktop.org/project/view/111/)
The [Pitivi tasks for newcomers]
lists small bugs and features you could jump on right away and also larger
cool features to implement.
[Pitivi tasks for newcomers]: https://gitlab.gnome.org/GNOME/pitivi/issues?label_name%5B%5D=4.+Newcomers
......@@ -33,4 +33,4 @@ Show help message and exit
This manual page was written by Hicham HAOUARI <hicham@fedoraproject.org>,
for the Fedora project (but may be used by others).
.SH BUGS
Please report bugs at https://phabricator.freedesktop.org/maniphest/task/edit/form/1/?projects=pitivi
Please report bugs at https://gitlab.gnome.org/GNOME/pitivi/issues/new
# Pitivi 1.0
Still WIP, follow advancement [on phabricator](https://phabricator.freedesktop.org/project/view/125/)
Still WIP, follow advancement [on gitlab](https://gitlab.gnome.org/GNOME/pitivi/milestones/1)
......@@ -27,6 +27,6 @@
</section>
<section id="patches">
<title>Patches welcome</title>
<p>If you happen to find errors, missing information or unclear passages in this manual, please feel free to submit corrections. You can find contact information on <link href="http://jeff.ecchi.ca/">my personal website</link>. You can also <link href="https://phabricator.freedesktop.org/maniphest/task/create/?projects=pitivi,pitivi_documentation">file bugs in our bug tracker</link>.</p>
<p>If you happen to find errors, missing information or unclear passages in this manual, please feel free to submit corrections. You can find contact information on <link href="http://jeff.ecchi.ca/">my personal website</link>. You can also <link href="https://gitlab.gnome.org/GNOME/pitivi/issues?label_name%5B%5D=8.+User+Docs">file bugs in our bug tracker</link>.</p>
</section>
</page>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment