delta/git.git, branch jh/status-v2-porcelain

status: unit tests for --porcelain=v2

2016-08-12T21:36:45+00:00

Test porcelain v2 status format.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

test-lib-functions.sh: add lf_to_nul helper

2016-08-11T18:16:13+00:00

Add lf_to_nul helper function to test-lib-functions.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

git-status.txt: describe --porcelain=v2 format

2016-08-11T18:15:56+00:00

Update status manpage to include information about
porcelain v2 format.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: print branch info with --porcelain=v2 --branch

2016-08-11T18:15:40+00:00

Expand porcelain v2 output to include branch and tracking
branch information. This includes the commit id, the branch,
the upstream branch, and the ahead and behind counts.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: print per-file porcelain v2 status data

2016-08-11T18:15:22+00:00

Print per-file information in porcelain v2 format.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: collect per-file data for --porcelain=v2

2016-08-11T18:14:43+00:00

Collect extra per-file data for porcelain V2 format.

The output of `git status --porcelain` leaves out many
details about the current status that clients might like
to have.  This can force them to be less efficient as they
may need to launch secondary commands (and try to match
the logic within git) to accumulate this extra information.
For example, a GUI IDE might want the file mode to display
the correct icon for a changed item (without having to stat
it afterwards).

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: support --porcelain[=]

2016-08-05T22:46:42+00:00

Update --porcelain argument to take optional version parameter
to allow multiple porcelain formats to be supported in the future.

The token "v1" is the default value and indicates the traditional
porcelain format.  (The token "1" is an alias for that.)

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: cleanup API to wt_status_print

2016-08-05T22:46:08+00:00

Refactor the API between builtin/commit.c and wt-status.[ch].

Hide the details of the various wt_*status_print() routines inside
wt-status.c behind a single (new) wt_status_print() routine.
Eliminate the switch statements from builtin/commit.c.
Allow details of new status formats to be isolated within wt-status.c

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

status: rename long-format print routines

2016-08-05T22:45:47+00:00

Rename the various wt_status_print*() routines to be
wt_longstatus_print*() to make it clear that these
routines are only concerned with the normal/long
status output and reduce developer confusion as other
status formats are added in the future.

Signed-off-by: Jeff Hostetler 
Signed-off-by: Junio C Hamano

Sync with maint

2016-07-28T21:21:18+00:00

* maint:
  Some fixes for 2.9.3