openembedded-core.git/scripts/combo-layer, branch krogoth

scripts, lib: Don't limit traceback lengths to arbitrary values

2016-03-31T12:18:12+00:00

There appears to have been a lot of copy and pasting of the code
which prints tracebacks upon failure and limits the stack trace to
5 entries. This obscures the real error and is very confusing to the user
it look me an age to work out why some tracebacks weren't useful.

This patch removes the limit, making tracebacks much more useful for
debugging.

[YOCTO #9230]

Signed-off-by: Richard Purdie

combo-layer: handle empty commits during "init --history"

2016-03-02T22:39:05+00:00

When importing the components during the "combo-layer init" with full
history and relocation into a destination directory, components with
empty commits were not handled because the "mv" command was invoked
with just one parameter.

Replacing that with a find/xargs pair avoids the problem and should
also fix the handling of filenames with special characters (in
particular spaces).

Signed-off-by: Patrick Ohly 
Signed-off-by: Ross Burton

combo-layer: Stop using filterdiff

2015-12-18T12:18:13+00:00

I ran into an issue where a patch just deleting a single file
within the repository (meta/recipes-devtools/m4/m4/make.patch)
would get skipped by combo-layer.

It turns out this has the patch header (commented to avoid breaking scripts):

: diff --git a/meta/recipes-devtools/m4/m4/make.patch b/meta/recipes-devtools/m4/m4/make.patch
: deleted file mode 100644
: index 79fb415..0000000
: --- a/meta/recipes-devtools/m4/m4/make.patch
: +++ /dev/null
: @@ -1,42 +0,0 @@

and this is classed as > 5 headers in filterdiff. When we piped the path
through filterdiff, the --- line disappears, then the second time we pass
through filterdiff, it shows no lines changed and the patch is assumed
to be empty and skipped.

Changing MAX_HEADERS in filterdiff is one way to fix this, another would
be to grep out "deleted file mode" lines. Instead, we can use new
git syntax to exclude files from the git format-patch instead and avoid
filterdiff entirely.

Signed-off-by: Richard Purdie

combo-layer: introduce ability to exclude component from mass update

2015-11-16T11:28:38+00:00

There is no ability at the moment for situations where users would like
to keep section in combo-layer.conf but don't update it, unless explicitly
specified.

Now, by adding "update = no" to desired section would exclude
that repository from "combo-layer update" command.

It is still possible to explicitly update it by "combo-layer update $section".

By default, all repositories are assumed as "update = yes"

Signed-off-by: Alexander D. Kanevskiy 
Signed-off-by: Ross Burton

combo-layer: fix action_pull for unknown branch

2015-08-09T07:12:42+00:00

When reconfiguring the branch to something not already fetched,
action_pull fails with
   error: pathspec '' did not match any file(s) known to git.

It is the "git checkout" which fails like that. To solve this,
try the faster "git checkout + git pull" first and only if that fails,
fall back to the slow "git fetch + git checkout".

In the conf.hard_reset case, do the checkout always after the git fetch.

Signed-off-by: Patrick Ohly 
Signed-off-by: Richard Purdie

combo-layer: enhance output in action_pull

2015-08-09T07:12:41+00:00

The git operations can fail, for example when the branch is unknown
or misconfigured.

Better move the info message and extend it such that it is printed
first and provides the necessary context, because otherwise the
CalledProcessError exception gets dumped without mentioning for which
component it occurred.

Signed-off-by: Patrick Ohly 
Signed-off-by: Richard Purdie

combo-layer: fix AttributeError traceback.

2015-07-31T11:04:18+00:00

Commit c908a423f85a84ddd8249abd00254f29d47df74b introduced a new
issue in combo-layer that leads to a traceback as
args.hard_reset is an unknown variable. This change defines an
appropriate destination for the command args parser and fixes the
reference.

Signed-off-by: Alexander Kanevskiy 
Signed-off-by: Richard Purdie

combo-layer: implement --hard-reset option

2015-07-16T14:08:41+00:00

This option causes combo-layer to do git fetch and hard reset instead of
git pull in the component repositories. This makes sure that the local
component repositories are always in sync with the remote - tolerating
force pushes and overriding any locally made changes.

Signed-off-by: Markus Lehtonen 
Signed-off-by: Ross Burton

combo-layer: only allow fast-forward when pulling

2015-07-16T14:08:40+00:00

Only allow fast-forward merges in the component repositories when doing
git-pull. This makes it possible to spot problems (i.e. rewriting of
history) in the component upstream . Also, this change prevents the
creation of local-only merge commits in the component repositories.
These merges cause "last_revision" field of the combo-layer config to
point to a git commit that is only present in the users local component
repository but nowhere in upstream.

Signed-off-by: Markus Lehtonen 
Signed-off-by: Ross Burton

combo-layer: modified to generate better commit messages.

2015-07-07T22:57:13+00:00

This patch includes support for a global section in combo-layer.conf
called [combo-layer-settings]. Supported in this section is key
"commit_msg"; its value is the template for the git commit message
that updates the last_revision. The template can include substitution
for the updated component list: ${components}. The substituted value
will either be a comma-separated list of components or "all components",
if combo-layer was invoked without component list argument.

If the key is not present, the old default value is used for the commit
message.

Configuration file example:

[combo-layer-settings]
commit_msg = pulled in the latest changes for ${components}.

Signed-off-by: Ismo Puustinen 
Signed-off-by: Ross Burton