-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix aggregated pull requests with multi project/working dirs (#386)
- Loading branch information
Showing
75 changed files
with
829 additions
and
365 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,5 @@ coverage | |
.idea | ||
.vscode | ||
*.iml | ||
.DS_Store | ||
.DS_Store | ||
commands/testdata/**/hooks/ |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
commands/testdata/createfixpullrequests/aggregate-multi-dir/.frogbot/frogbot-config.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
- params: | ||
git: | ||
branches: | ||
- main | ||
repoName: "aggregate-multi-dir" | ||
scan: | ||
projects: | ||
- workingDirs: | ||
- npm1 | ||
- npm2 |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/COMMIT_EDITMSG
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
fix tests |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/HEAD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ref: refs/heads/main |
7 changes: 7 additions & 0 deletions
7
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[core] | ||
repositoryformatversion = 0 | ||
filemode = true | ||
bare = false | ||
logallrefupdates = true | ||
ignorecase = true | ||
precomposeunicode = true |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/description
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Unnamed repository; edit this file 'description' to name the repository. |
Binary file added
BIN
+412 Bytes
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/index
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/info/exclude
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# git ls-files --others --exclude-from=.git/info/exclude | ||
# Lines that start with '#' are comments. | ||
# For a project mostly in C, the following would be a good set of | ||
# exclude patterns (uncomment them if you want to use them): | ||
# *.[oa] | ||
# *~ |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/logs/HEAD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
0000000000000000000000000000000000000000 20cfb0cbabf22f1c12d626eec6e6dd834f4e43d1 Omer Zidkoni <[email protected]> 1689852711 +0300 commit (initial): fix tests |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/logs/refs/heads/main
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
0000000000000000000000000000000000000000 20cfb0cbabf22f1c12d626eec6e6dd834f4e43d1 Omer Zidkoni <[email protected]> 1689852711 +0300 commit (initial): fix tests |
Binary file added
BIN
+57 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/19/01e308e74cb275753b496e24dc28ca3dc9dc15
Binary file not shown.
2 changes: 2 additions & 0 deletions
2
...fixpullrequests/aggregate-multi-dir/git/objects/20/cfb0cbabf22f1c12d626eec6e6dd834f4e43d1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
x��K | ||
1@]���4�tD��{w��Z�:���+�|/IkU��ig��y��.T��5P)���c��sF��ل�ޥåq�k�OyU8ʠ��Q��I� p^�er���5Î����Ҕ��M7� �7� |
Binary file added
BIN
+57 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/61/a70d8baf4dd63a6b1b01f87791cb73425caf55
Binary file not shown.
Binary file added
BIN
+127 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/9f/70c235abae1684cf8db2cadf2730087a1773cc
Binary file not shown.
Binary file added
BIN
+63 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/ac/2801a7e744aca172a5f4155f8f8670756f27e1
Binary file not shown.
Binary file added
BIN
+208 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/ae/099789389636d0d9196ce5cdb1de2dab9fbc91
Binary file not shown.
Binary file added
BIN
+103 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/b1/d50a083f2239a3ff3b3ed2d1bbaea16d17c1ee
Binary file not shown.
Binary file added
BIN
+63 Bytes
...fixpullrequests/aggregate-multi-dir/git/objects/be/180a62cd192cb4ef53647c6d907074d428d724
Binary file not shown.
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-dir/git/refs/heads/main
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
20cfb0cbabf22f1c12d626eec6e6dd834f4e43d1 |
16 changes: 16 additions & 0 deletions
16
commands/testdata/createfixpullrequests/aggregate-multi-dir/npm1/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"name": "aggregate", | ||
"version": "1.0.0", | ||
"description": "", | ||
"main": "index.js", | ||
"scripts": { | ||
"test": "echo \"Error: no tsest specified\" && exit 1" | ||
}, | ||
"author": "", | ||
"license": "ISC", | ||
"dependencies": { | ||
"uuid": "^9.0.0", | ||
"minimatch":"3.0.2", | ||
"mpath": "0.7.0" | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
commands/testdata/createfixpullrequests/aggregate-multi-dir/npm2/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"dependencies": { | ||
"minimist": "1.2.5" | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
commands/testdata/createfixpullrequests/aggregate-multi-project/.frogbot/frogbot-config.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
- params: | ||
git: | ||
branches: | ||
- main | ||
repoName: "aggregate-multi-dir" | ||
scan: | ||
projects: | ||
- workingDirs: | ||
- npm | ||
- workingDirs: | ||
- pip | ||
pipRequirementsFile: requirements.txt |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/COMMIT_EDITMSG
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
fix tests |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/HEAD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ref: refs/heads/main |
7 changes: 7 additions & 0 deletions
7
commands/testdata/createfixpullrequests/aggregate-multi-project/git/config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[core] | ||
repositoryformatversion = 0 | ||
filemode = true | ||
bare = false | ||
logallrefupdates = true | ||
ignorecase = true | ||
precomposeunicode = true |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/description
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Unnamed repository; edit this file 'description' to name the repository. |
Binary file added
BIN
+418 Bytes
commands/testdata/createfixpullrequests/aggregate-multi-project/git/index
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
commands/testdata/createfixpullrequests/aggregate-multi-project/git/info/exclude
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# git ls-files --others --exclude-from=.git/info/exclude | ||
# Lines that start with '#' are comments. | ||
# For a project mostly in C, the following would be a good set of | ||
# exclude patterns (uncomment them if you want to use them): | ||
# *.[oa] | ||
# *~ |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/logs/HEAD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
0000000000000000000000000000000000000000 db63220ddfc3c49fd55d611720d5423ac966a1d0 Omer Zidkoni <[email protected]> 1689852747 +0300 commit (initial): fix tests |
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/logs/refs/heads/main
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
0000000000000000000000000000000000000000 db63220ddfc3c49fd55d611720d5423ac966a1d0 Omer Zidkoni <[email protected]> 1689852747 +0300 commit (initial): fix tests |
Binary file added
BIN
+57 Bytes
...ullrequests/aggregate-multi-project/git/objects/19/01e308e74cb275753b496e24dc28ca3dc9dc15
Binary file not shown.
Binary file added
BIN
+63 Bytes
...ullrequests/aggregate-multi-project/git/objects/1d/ced3ffd48839041e403eb2548fcce4f8d24a86
Binary file not shown.
Binary file added
BIN
+61 Bytes
...ullrequests/aggregate-multi-project/git/objects/29/d343bde70ca929c71d042ab0564c89d4f1b88b
Binary file not shown.
2 changes: 2 additions & 0 deletions
2
...ullrequests/aggregate-multi-project/git/objects/65/c96377f2ad26e3ebe7179e95f73202e3ea7666
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
xK��OR02g(H�(HM.��5ѳ�3�*��*r����} | ||
K |
Binary file added
BIN
+208 Bytes
...ullrequests/aggregate-multi-project/git/objects/ae/099789389636d0d9196ce5cdb1de2dab9fbc91
Binary file not shown.
2 changes: 2 additions & 0 deletions
2
...ullrequests/aggregate-multi-project/git/objects/d9/a9828971df60b05f3f550b35c96c07991aef46
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...ullrequests/aggregate-multi-project/git/objects/db/63220ddfc3c49fd55d611720d5423ac966a1d0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
x��� | ||
!@;�sbt]G!�?��msƲp� ���������ZJ� w������ ��,�0ِ�>�ifb�V������H�k�W]3����Z�b-'��?�{�հ��G�o�R�@��o��G7� |
Binary file added
BIN
+104 Bytes
...ullrequests/aggregate-multi-project/git/objects/ee/6eb069e71d2a82dd7749fa7c8c935d7d014e2d
Binary file not shown.
1 change: 1 addition & 0 deletions
1
commands/testdata/createfixpullrequests/aggregate-multi-project/git/refs/heads/main
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
db63220ddfc3c49fd55d611720d5423ac966a1d0 |
16 changes: 16 additions & 0 deletions
16
commands/testdata/createfixpullrequests/aggregate-multi-project/npm/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"name": "aggregate", | ||
"version": "1.0.0", | ||
"description": "", | ||
"main": "index.js", | ||
"scripts": { | ||
"test": "echo \"Error: no tsest specified\" && exit 1" | ||
}, | ||
"author": "", | ||
"license": "ISC", | ||
"dependencies": { | ||
"uuid": "^9.0.0", | ||
"minimatch":"3.0.2", | ||
"mpath": "0.7.0" | ||
} | ||
} |
2 changes: 2 additions & 0 deletions
2
commands/testdata/createfixpullrequests/aggregate-multi-project/pip/requirements.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
pexpect==4.8.0 | ||
pyjwt==1.7.1 |
2 changes: 1 addition & 1 deletion
2
commands/testdata/createfixpullrequests/aggregate/git/COMMIT_EDITMSG
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
init commit | ||
fix tests |
Binary file modified
BIN
+0 Bytes
(100%)
commands/testdata/createfixpullrequests/aggregate/git/index
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
commands/testdata/createfixpullrequests/aggregate/git/logs/HEAD
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
0000000000000000000000000000000000000000 0b0bc897474ade0656ffb59bde78495cbb0215ed Omer Zidkoni <[email protected]> 1689690889 +0300 commit (initial): init commit | ||
0000000000000000000000000000000000000000 48181e917e611cb6c95db9119329859b7f39cc2a Omer Zidkoni <[email protected]> 1689861913 +0300 commit (initial): fix tests |
2 changes: 1 addition & 1 deletion
2
commands/testdata/createfixpullrequests/aggregate/git/logs/refs/heads/main
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
0000000000000000000000000000000000000000 0b0bc897474ade0656ffb59bde78495cbb0215ed Omer Zidkoni <[email protected]> 1689690889 +0300 commit (initial): init commit | ||
0000000000000000000000000000000000000000 48181e917e611cb6c95db9119329859b7f39cc2a Omer Zidkoni <[email protected]> 1689861913 +0300 commit (initial): fix tests |
Oops, something went wrong.