At present patman sets the python path on startup so that it can access
the libraries it needs. If we convert to use absolute imports this is not
necessary.

Move patman to use absolute imports. This requires changes in tools which
use the patman libraries (which is most of them).
Signed-off-by: NSimon Glass <sjg@chromium.org>

s/Subprocress/Subprocess/
s/easiler/easier/
s/repositiory/repository/
s/rangem/range/
s/Retruns/Returns/
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
Reviewed-by: NSimon Glass <sjg@chromium.org>

Use the new functions in the tools module to handle conversion.
Signed-off-by: NSimon Glass <sjg@chromium.org>

Create helper functions in the tools module to deal with the differences
between unicode in Python 2 (where we use the 'unicode' type) and Python 3
(where we use the 'str' type).
Signed-off-by: NSimon Glass <sjg@chromium.org>

Update all print statements to be functions, as required by Python 3.
Signed-off-by: NSimon Glass <sjg@chromium.org>

At present this function uses lists and strings. This does not work so
well with Python 3, and testing against '' does not work for a bytearray.
Update the code to fix these issues.
Signed-off-by: NSimon Glass <sjg@chromium.org>

Some environments require providing the '--smtp-server' argument to
'git send-email'. Add support for this.
Signed-off-by: NSimon Glass <sjg@chromium.org>

When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from.  So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry.  Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.

In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.

This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents.  There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: NTom Rini <trini@konsulko.com>

This is not a good variable name in Python because 'str' is a type. It
shows up highlighted in some editors. Rename it.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Tested-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Don't mess with the email address when outputting them. Just make sure
they are encoded with utf-8.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Tested-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Syntax for exception handling is a little more strict in python 3.x.
Convert all uses to a form accepted by both python 2.x & python 3.x.
Signed-off-by: NPaul Burton <paul.burton@imgtec.com>
Acked-by: NSimon Glass <sjg@chromium.org>

In python 3.x, print must be used as a function call. Convert all print
statements to the function call style, importing from __future__ where
we print with no trailing newline or print to a file object.
Signed-off-by: NPaul Burton <paul.burton@imgtec.com>
Acked-by: NSimon Glass <sjg@chromium.org>

It is more useful to have this method raise an error when something goes
wrong. Make this the default and adjust the few callers that don't want to
use it this way.
Signed-off-by: NSimon Glass <sjg@chromium.org>

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: NSimon Glass <sjg@chromium.org>
Reviewed-by: NJoe Hershberger <joe.hershberger@ni.com>

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: NMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Acked-by: NSimon Glass <sjg@chromium.org>

This reverts commit 19b4a336.

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: NMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: NSimon Glass <sjg@chromium.org>

This allows Patman to generate smaller patches for file removal.
Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Acked-by: NHeiko Schocher <hs@denx.de>

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: NJosh Wu <josh.wu@atmel.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Tested-by: NSimon Glass <sjg@chromium.org>

This causes an error when trying to build a local branch which has a local
branch as its upstream.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Reported-by: NMasahiro Yamada <yamada.m@jp.panasonic.com>

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: NPeter Tyser <ptyser@xes-inc.com>
Acked-by: NSimon Glass <sjg@chromium.org>
Tested-by: NSimon Glass <sjg@chromium.org>

Adjust the -b flag to permit a range expression as well as a branch.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Suggested-by: NDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Tested-by: NDaniel Schwierzeck <daniel.schwierzeck@gmail.com>

Buildman normally obtains the upstream commit by asking git. Provided that
the branch was created with 'git checkout -b <branch> <some_upstream>' 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: NSimon Glass <sjg@chromium.org>
Suggested-by: NWolfgang Denk <wd@denx.de>

RunPipe() currently pipes the output of stdout and stderr to a pty, but
this is not the intended behaviour. Fix it.
Signed-off-by: NSimon Glass <sjg@chromium.org>

A missing 'global' declaration means that this feature does not currently
work. Fix it.
Signed-off-by: NSimon Glass <sjg@chromium.org>

In a headless environment the pager can apparently hang. We don't want a
pager anyway so let's request that none be used.
Reported-by: NTom Rini <trini@ti.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

It seems that this is no longer needed, since checkpatch.pl will catch
whitespace problems in patches. Also the option is not widely used, so
it seems safe to just remove it.
Suggested-by: NMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

It seems that doctest behaves differently now, and some of the unit tests
do not run. Adjust the tests to work correctly.

 ./tools/patman/patman --test
<unittest.result.TestResult run=10 errors=0 failures=0>
Signed-off-by: NSimon Glass <sjg@chromium.org>

This option is currently not supported, but needs to be, for buildman to
operate as expected.
Reported-by: NYork Sun <yorksun@freescale.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

Older versions of git (e.g. Ubuntu 10.04) do not support this flag. By
default they do not decorate. So only enable this flag when supported.
Suggested-by: NTom Rini <trini@ti.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

Move the code that builds a 'git log' command into a function so we can more
easily adjust it.
Signed-off-by: NSimon Glass <sjg@chromium.org>

If Series-to tag is missing, Patman exits with a message
"No recipient".

This is just annoying for those who had already added
sendemail.to configuration.

I guess many developers have

  [sendemail]
          to = u-boot@lists.denx.de

in their .git/config because the 'To: u-boot@lists.denx.de' field
should always be added when sending patches.

That seems more reasonable rather than adding
'Series-to: u-boot@lists.denx.de' to every patch series.

Patman should exit only when both Series-to tag and sendemail.to
configuration are mising.
Signed-off-by: NMasahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: NSimon Glass <sjg@chromium.org>

When patman applies the patches it checks out a new branch, uses 'git am'
to apply the patches one by one, and then tries to go back to the old
branch. If you try this when the branch is 'undefined', this doesn't work
as patman cannot restore the correct branch after applying the patches.
It seems that 'undefined' is created by git and is persistent after it is
created, so that you can end up on quite an old branch.

Add a check for the 'undefined' branch to avoid this.
Reported-by: NMasahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: NSimon Glass <sjg@chromium.org>

This sort of failure is rare, but the code to deal with it is wrong.
Fix it.
Signed-off-by: NSimon Glass <sjg@chromium.org>

Signed-off-by: NWolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: NTom Rini <trini@ti.com>

Rather than a backtrace, produce a nice error message when an invalid
branch is provided to buildman.
Signed-off-by: NSimon Glass <sjg@chromium.org>

The git config parameter log.decorate is quite useful when working with git.
Patman, however can not handle the decorated output when parsing the commit.
To prevent this use the '--no-decorate' switch for git-log.
Signed-off-by: NAndreas Bießmann <andreas.devel@googlemail.com>
Acked-by: NSimon Glass <sjg@chromium.org>

Often it happens that patches include tags which don't have aliases. It
is annoying that patman fails in this case, and provides no option to
continue other than adding empty tags to the .patman file.

Correct this by adding a '-t' option to ignore tags that don't exist.
Print a warning instead.

Since running the tests is not a common operation, move this to --test
instead, to reserve -t for this new option.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NDoug Anderson <dianders@chromium.org>

Some versions of git don't seem to prompt you for the message ID that
your series is in reply to.  Allow specifying this from the command
line.
Signed-off-by: NDoug Anderson <dianders@chromium.org>
Acked-by: NSimon Glass <sjg@chromium.org>

Add methods to find out the commits in a branch, clone a repo and
fetch from a repo.
Signed-off-by: NSimon Glass <sjg@chromium.org>

Make raise_on_error a parameter so that we can control which commands
raise and which do not. If we get an error reading the alias file, just
continue.
Signed-off-by: NSimon Glass <sjg@chromium.org>