u-boot.git/tools/patman/gitutil.py, branch v2016.09

buildman: Allow branch names which conflict with directories

2016-03-18T03:27:39+00:00

At present if you try to use buildman with the branch 'test' it will
complain that it is unsure whether you mean the branch or the directory.
This is a feature of the 'git log' command that buildman uses. Fix it
by resolving the ambiguity.

Signed-off-by: Simon Glass 
Reviewed-by: Joe Hershberger

patman: Add --thread option

2016-01-21T02:06:23+00:00

Add option to create threaded series of patches.
With it, it will be possible to create patch threads like this:
[PATCH 0/10] Add support for time travel
  [PATCH 1/10] Add Flux Capacitor driver
  [PATCH 2/10] Add Mr. Fusion driver
  (...)

Internally it will call git send-email with --thread option

Signed-off-by: Mateusz Kulikowski 
Acked-by: Simon Glass

Revert "patman: use -D option for git format-patch"

2015-09-09T13:48:03+00:00

This reverts commit 19b4a3369876f9215e2b861f211e8df1a75e26ca.

Since that commit, patman generates useless patches for file removal;
"git format -D" prints only the header but not the diff when deleting
files, and "git am" always refuses such patches.

The following is the quotation from "man git-format-patch":

  -D, --irreversible-delete
    Omit the preimage for deletes, i.e. print only the header but
    not the diff between the preimage and /dev/null. The resulting
    patch is not meant to be applied with patch nor git apply; this
    is solely for people who want to just concentrate on reviewing
    the text after the change. In addition, the output obviously
    lack enough information to apply such a patch in reverse, even
    manually, hence the name of the option.

Signed-off-by: Masahiro Yamada 
Acked-by: Simon Glass

patman: use -D option for git format-patch

2015-08-26T14:54:13+00:00

This allows Patman to generate smaller patches for file removal.

Signed-off-by: Masahiro Yamada 
Acked-by: Simon Glass 
Acked-by: Heiko Schocher

patman: check git format.subjectprefix setting when generate patches prefix

2015-04-23T18:35:50+00:00

For the local project, we may specified format.subjectprefix setting.
Then the patch will be formated as [Project_prefix][PATCH].
But patman will not check this setting. It will remove the
format.subjectprefix.

So This patch will let patman check this setting and add it as a
project prefix.

Signed-off-by: Josh Wu 
Acked-by: Simon Glass 
Tested-by: Simon Glass

buildman: Fix incorrect arguemnt in GetUpstream()

2015-02-15T21:34:06+00:00

This causes an error when trying to build a local branch which has a local
branch as its upstream.

Signed-off-by: Simon Glass 
Reported-by: Masahiro Yamada

patman: Make dry-run output match real functionality

2015-01-30T22:52:29+00:00

When run with the --dry-run argument patman prints out information
showing what it would do.  This information currently doesn't line up
with what patman/git send-email really do.  Some basic examples:
- If an email address is addressed via "Series-cc" and "Patch-cc" patman
  shows that email address would be CC-ed two times.
- If an email address is addressed via "Series-to" and "Patch-cc" patman
  shows that email address would be sent TO and CC-ed.
- If an email address is addressed from a combination of tag aliases,
  get_maintainer.pl output, "Series-cc", "Patch-cc", etc patman shows
  that the email address would be CC-ed multiple times.

Patman currently does try to send duplicate emails like the --dry-run
output shows, but "git send-email" intelligently removes duplicate
addresses so this patch shouldn't change the non-dry-run functionality.

Change patman's output and email addressing to line up with the
"git send-email" logic.  This trims down patman's dry-run output and
prevents confusion about what patman will do when emails are actually
sent.

Signed-off-by: Peter Tyser 
Acked-by: Simon Glass 
Tested-by: Simon Glass

buildman: Allow specifying a range of commits to build

2015-01-15T05:16:53+00:00

Adjust the -b flag to permit a range expression as well as a branch.

Signed-off-by: Simon Glass 
Suggested-by: Daniel Schwierzeck 
Tested-by: Daniel Schwierzeck

buildman: Try to guess the upstream commit

2015-01-15T05:16:52+00:00

Buildman normally obtains the upstream commit by asking git. Provided that
the branch was created with 'git checkout -b  ' then
this normally works.

When there is no upstream, we can try to guess one, by looking up through
the commits until we find a branch. Add a function to try this and print
a warning if buildman ends up relying on it.

Also update the documentation to match.

Signed-off-by: Simon Glass 
Suggested-by: Wolfgang Denk

patman: RunPipe() should not pipe stdout/stderr unless asked

2014-09-09T22:38:24+00:00

RunPipe() currently pipes the output of stdout and stderr to a pty, but
this is not the intended behaviour. Fix it.

Signed-off-by: Simon Glass