Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use --default-prefix with update_patches (#28610)

Browse Source 
This change adds `--default-prefix` to make sure we get the same patch
format in any environment.
This commit is contained in:
cdesouza-chromium
2025-04-14 09:28:07 +01:00
committed by GitHub
parent 230aafc9ab
commit 7e05546e97
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/commands/lib/updatePatches.js
+1 -1
View File
@@ -38,7 +38,7 @@ async function writePatchFiles (modifiedPaths, gitRepoPath, patchDirPath) {
let writeOpsDoneCount = 0
let writePatchOps = modifiedPaths.map(async (old, i) => {
const singleDiffArgs = ['diff', '--src-prefix=a/', '--dst-prefix=b/', '--full-index', old]
const singleDiffArgs = ['diff', '--src-prefix=a/', '--dst-prefix=b/', '--default-prefix', '--full-index', old]
const patchContents = await util.runAsync('git', singleDiffArgs, { cwd: gitRepoPath, verbose: false })
const patchFilename = patchFilenames[i]
await fs.writeFile(path.join(patchDirPath, patchFilename), patchContents)
patches/tools-gritsettings-resource_ids.spec.patch
+4 -4
View File
@@ -1,7 +1,7 @@
diff --git i/tools/gritsettings/resource_ids.spec w/tools/gritsettings/resource_ids.spec
index 2cd6ca756a745..decd3cac99da6 100644
--- i/tools/gritsettings/resource_ids.spec
+++ w/tools/gritsettings/resource_ids.spec
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 2cd6ca756a745e1387469914eb3d649dff104ccb..decd3cac99da6366259c9e425ec55ec775590fe7 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -38,6 +38,9 @@
"chrome/app/chromium_strings.grd": {
"messages": [800],
patches/tools-polymer-css_to_wrapper.py.patch
+4 -4
View File
@@ -1,7 +1,7 @@
diff --git i/tools/polymer/css_to_wrapper.py w/tools/polymer/css_to_wrapper.py
index d76a3aa579e89..900ec9159da17 100644
--- i/tools/polymer/css_to_wrapper.py
+++ w/tools/polymer/css_to_wrapper.py
diff --git a/tools/polymer/css_to_wrapper.py b/tools/polymer/css_to_wrapper.py
index d76a3aa579e895ec9f237c76e022a3ebaafc02a3..900ec9159da17da16fd546116a96631333583bff 100644
--- a/tools/polymer/css_to_wrapper.py
+++ b/tools/polymer/css_to_wrapper.py
@@ -275,7 +275,7 @@ def main(argv):
content = ''