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

scripts/combo-layer: handle diffs in commit messages

2012-03-23T12:07:25Z

A few recent commits in the OE-Core repository contain diffs in their commit messages, which totally confuses git-am when applying them to the combo repository during update. Add some code to detect and indent any diff text in the commit message so that this does not happen (and show a warning). Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: limit component repo dirty check

2012-03-23T12:07:15Z

If one or more components are specified for update, only check if their repository/repositories are dirty rather than checking all of the configured repositories. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: allow updating a specific component(s) only

2012-02-21T14:57:12Z

If you specify one or more components to update immediately following the "update" command, only these components will be updated as opposed to the default behaviour of updating all of them. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: avoid saving last revision if unchanged

2012-02-21T14:55:51Z

If we are running an update and the last revision hasn't changed since the last update, don't write to the configuration file. This avoids committing the config file with no changes other than spontaneous reordering of sections, which sometimes occurs due to the behaviour of the internal dictionary in Python's ConfigParser class. (This can be fixed properly but the fix is only easy in Python 2.7+ due to the availability there of the collections.OrderedDict class, and we currently want to be compatible with 2.6.x as well.) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: avoid error when config file is outside repo

2012-02-21T14:55:16Z

Avoid displaying the error from the "git status" command we use to check the status of the config file if the config file is outside of the repository (a situation that is already handled). Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: skip empty commits

2011-11-07T13:58:39Z

If a commit is empty (for example, commits brought over from svn where only properties were changed) then attempting to apply it with "git am" will result in the error "Patch format detection failed", so skip it instead. Signed-off-by: Paul Eggleton

scripts/combo-layer: improve some messages

2011-11-07T13:58:39Z

Fix some grammar. Signed-off-by: Paul Eggleton

scripts/combo-layer: auto-commit updated config file

2011-11-07T13:58:39Z

If the config file is tracked within the combo-layer repository and it is updated at the end of the "update" operation (because last_revision has been changed), then automatically commit the file. This ensures that multiple people can perform updates on different machines without the last revision information going missing. (If the file is outside the repository or is masked via .gitignore, this will do nothing.) Signed-off-by: Paul Eggleton

scripts/combo-layer: fix dirty repo check

2011-11-07T13:58:39Z

Fix the dirty repository check to detect any changes, including untracked files and uncommitted changes in the index. Signed-off-by: Paul Eggleton

scripts/combo-layer: make component repo branch configurable

2011-11-07T13:58:38Z

Add an optional per-component branch setting to allow specifying the branch instead of always using master. Signed-off-by: Paul Eggleton