Diffusion git-phab (master)

git-phab
ActivePublic
Actions

Details

Clone
Clone
Clone

Description

Phabricator support for git

Locate File

git-phab
Browse Repository

PathModifiedDetailsCommitted
.arcconfig
.arclint
.gitignore
.pre-commit-config.yaml
COPYING
MANIFEST.in
README.md
git-phab
git-phab.txt
requirements.txt
setup.cfg
setup.py

Recent Commits
View History

CommitAuthorDetailsCommitted
6877964ef448D1738Philip Withnall/thiblahute
git-phab: Handle NoSection exception from configparser 
May 31
937fb36ff5d8thiblahute
Back to development toward 3.0 
Apr 17
e160e1baf35dthiblahute
Release 2.1.0 
Apr 17
7ec3adf73b23D1724aleb/thiblahute
Handle a different title placeholder 
Apr 17
91cc0e260774D1723aleb/thiblahute
Set the title in the dict only once 
Apr 17
1a6b88154f34D1722aleb/thiblahute
man: Fix incorrect flag 
Apr 17
8da2725c51e2thiblahute
man: Remove now removed documentation about checkout 
Mar 21
23383a4dea15D1510andrewsh/thiblahute
Document 'apply' subcommand. 
Mar 21
3f8e5f61ad86D1672thiblahute
Use branches from staging repo to set task branches 
Mar 21
bdce4b379d68D1641thiblahute
Allow stashing changes before applying/attaching/landing patches 
Mar 21
7575cd81ef17D1694daniels
Explicitly set revision title when creating 
Mar 16
154fa6c20ca6D1693daniels
Update pre-commit config 
Mar 16
bdaeadef362athiblahute
Checkout the base commit of the first differential when building fake branch 
Feb 28
dcc28348e9d2D1673thiblahute
README: Add some documentation about how to first setup a project 
Feb 17
166ba8eabe9eD1470smcv/thiblahute
If there are multiple remotes, use the one we are tracking 
Feb 17

Tags
Show All Tags

TagCommitAuthorDescriptionCreated
2.1.0rGITPHABe160e1baf35dthiblahute2.1.0Apr 17
2.0.0rGITPHABdb570171317bThibault SaunierRelease 2.0.0Nov 17 2016
1.0.0rGITPHAB629b3d800b2athiblahuteRelease 1.0.0Apr 6 2016

Branches
Show All

BranchHeadDetailsCommitted
master6877964ef448
git-phab: Handle NoSection exception from configparser 
May 31
1.0629b3d800b2a
Add a setup.py file so user can install with pip 
Apr 6 2016

README.md

Table of Contents

INSTALL

Install dependencies and copy or symlink executables into your $PATH

$ pip3 install -r requirements.txt
$ ln -s $PWD/git-phab ~/.local/bin/

Optionaly generate and copy or symlink manpage into your $MANPATH

$ a2x --doctype manpage --format manpage git-phab.txt
$ ln -s $PWD/git-phab.1 ~/.local/share/man/man1/

Optionaly enable bash completion:

$ sudo activate-global-python-argcomplete3

And add this in your ~/.bash_completion:

function _git_phab()
{
  COMP_WORDS=(git-phab ${COMP_WORDS[@]:2})
  COMP_CWORD=$((COMP_CWORD - 1))
  COMP_LINE=${COMP_LINE/git phab/git-phab}
  _python_argcomplete_global git-phab
}

REQUIREMENTS

See requirements.txt

DESCRIPTION

Git subcommand to integrate with phabricator.

WORKFLOW EXAMPLE

First, specify a personal remote repository where to push WIP branches:

$ git config phab.remote xclaesse

Make sure the fetch URL of the repository can be accessed by the reviewers. For example if your remote is called github:

$ git remote show github | grep URL
  Fetch URL: git@github.com:NICK/PROJECT.git
  Push  URL: git@github.com:NICK/PROJECT.git
$ git remote set-url github https://github.com/NICK/PROJECT.git
$ git remote set-url --push github git@github.com:NICK/PROJECT.git
$ git remote show github | grep URL
  Fetch URL: https://github.com/NICK/PROJECT.git
  Push  URL: git@github.com:NICK/PROJECT.git

Before starting your work, create a branch:

$ git checkout -b fix-bugs origin/master
Branch fix-bugs set up to track remote branch master from origin.
Switched to a new branch 'fix-bugs'

Note that is it important to set the tracking remote branch, git-phab will use it to set the default commit range to attach.

Now fix your bugs...

When the branch is ready for review, attach it (requesting the creation of a new task):

$ git phab attach --task
Using revision range 'origin/master..'
a3beba9 — Not attached — Truncate all_commits when filtering already proposed commits
Attach above commits and create a new task? [yn] y
(...)
Push HEAD to xclaesse/wip/phab/T3436-fix-bugs? [yn] y
Create and checkout a new branch called: T3436-fix-bugs? [yn] y

Summary:
New: task T3436
New: 66b48b9 — D483 — Truncate all_commits when filtering already proposed commits
Branch pushed to xclaesse/wip/phab/T3436-fix-bugs
Branch T3436-fix-bugs created and checked out

Note that the current branch name wasn't starting with a task ID, so it proposed to create a new one. If you already had a task for it, just pass --task option. But it created a new branch prefixed with the task ID so future git-phab commands will know which task this branch refers to:

$ git branch
* T3436-fix-bugs
  fix-bugs
  master

When your commits have been accepted, merge them:

$ git checkout master
$ git merge T3436-fix-bugs
$ git phab land
66b48b9 — D483 Accepted — Truncate all_commits when filtering already proposed commits
Do you want to push above commits? [yn] y
Do you want to close 'T3436'? [yn] y

You can now cleanup your branches:

$ git phab clean
Task 'T3436' has been closed, do you want to delete branch 'T3436-fix-bugs'? [yn] y
  -> Branch T3436-fix-bugs was deleted
Task 'T3436' has been closed, do you want to delete branch 'xclaesse/wip/phab/T3436-fix-a-bug'? [yn] y
  -> Branch xclaesse/wip/phab/T3436-fix-a-bug was deleted

HOW TO SET UP YOUR PROJECT

First of all, you need to add an .arcconfig to your project repository. This file is the same one as used by [arcanist] and you should follow their '[Configuring a New Project]' documentation to set write the configuration file.

[Configuring a New Project]: https://secure.phabricator.com/book/phabricator/article/arcanist_new_project/
[arcanist]: https://secure.phabricator.com/book/phabricator/article/arcanist/
Code of Conduct