Skip to content

Improve importer.py #10505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 13, 2019
Merged

Improve importer.py #10505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
edcde5e
Reformat and Improve
Apr 28, 2019
d26bca7
Make sure the script is run from within mbed-os directory
Apr 28, 2019
e15068d
Refactor continuation logic
Apr 28, 2019
3273edb
Allow comments in commit SHA list
Apr 28, 2019
09af58f
Use regex to find cherry-pick message
orenc17 Apr 28, 2019
c0a1c45
Use custom agrparse.Action to handle input parameters
orenc17 Apr 28, 2019
8a2426d
Styling and annoyances
orenc17 Apr 28, 2019
6f19ba0
Proper documentation
orenc17 Apr 28, 2019
bd5d059
Set log level during argument parsing
orenc17 Apr 28, 2019
b24f42f
Move regex to the using function
Apr 29, 2019
ca5dff6
Extract import logic to a separate method
Apr 29, 2019
be8a1e8
Use argparse.FileType to parse config file
Apr 29, 2019
d1fa7bd
Use a directory context to simplify git commands
Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tools/importer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Note: Only files present in folder will be copied, directories inside the folder
`commit_sha` is list of commits present in mbed-os repo. These commits will be applied after copying files and folders listed above.Each commit in the commit_sha list is cherry-picked and applied with the -x option, which records the SHA of the source commit in the commit message.
Note: You must resolve any conflicts that arise during this cherry-pick process. Make sure that the "(cherry picked from commit ...)" statement is present in the commit message. Re-execute the python script to apply rest of the SHA commits.

```json
{
"files" : [
{
Expand All @@ -41,9 +42,10 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
],
"commit_sha" : [
"428acae1b2ac15c3ad523e8d40755a9301220822",
"d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9",
{"sha": "d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9", "msg": "Fix ..."}
]
}
```

### Input to importer.py
1. Repository: -r <repo_path> ( Example: CMSIS / Mbed-tls)
Expand All @@ -52,4 +54,3 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
For example the command below can be used to update CMSIS:
`python tools\importer\importer.py -c tools\importer\cmsis_importer.json -r <path to cmsis repo>`

Note: This script must be run from the mbed-os directory to work correctly.
Loading