diff --git a/Makefile b/Makefile index 49e9436..21150a5 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ all : $(lw_source_tarball) clean : - rm -rf *~ public_key.asc $(ff_source_dir) $(lw_source_dir) $(lw_source_tarball) $(lw_source_tarball).sha256sum + rm -rf *~ public_key.asc $(ff_source_dir) $(lw_source_dir) $(lw_source_tarball) $(lw_source_tarball).sha256sum firefox-$(version) veryclean : clean rm -f $(ff_source_tarball) $(ff_source_tarball).asc diff --git a/README.md.in b/README.md.in index 9d83201..0fcd3fe 100644 --- a/README.md.in +++ b/README.md.in @@ -107,7 +107,8 @@ Now change the source tree the way you want, keeping in mind to `git add` new fi cd firefox- git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD > ../my-patch-name.patch ``` -This ID is the standard ID of any empty git repository. You can now also delete the temporary firefox souce tree. +This ID is the hash value of the first commit, which is called `initial`. dont forget to commit +changes before doing this diff, or the patch will be incomplete. ### How to create a patch for problems in Mozilla's [Bugzilla](https://bugzilla.mozilla.org/). diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch index 289af12..d213d70 100644 --- a/patches/bootstrap-without-vcs.patch +++ b/patches/bootstrap-without-vcs.patch @@ -1,10 +1,10 @@ +diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py +index 0c5ecbf..d9a6d9d 100644 --- a/python/mozboot/mozboot/bootstrap.py +++ b/python/mozboot/mozboot/bootstrap.py -@@ -548,11 +548,9 @@ def current_firefox_checkout(env, hg: Optional[Path] = None): - - if not len(path.parents): +@@ -550,10 +550,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None): break -+ path = path.parent + path = path.parent - raise UserError( - "Could not identify the root directory of your checkout! " @@ -14,6 +14,8 @@ def update_git_tools(git: Optional[Path], root_state_dir: Path): +diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py +index dd31f53..6f0087a 100644 --- a/python/mozversioncontrol/mozversioncontrol/__init__.py +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py @@ -684,6 +684,29 @@ class GitRepository(Repository): @@ -64,6 +66,8 @@ else: raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor) +diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +index 016578b..7525139 100644 --- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py @@ -168,6 +168,43 @@ class GitRepository(Repository): diff --git a/patches/context-menu.patch b/patches/context-menu.patch index 5685f96..da19aa6 100644 --- a/patches/context-menu.patch +++ b/patches/context-menu.patch @@ -1,12 +1,8 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc +index 39a139f..c565bce 100644 --- a/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc -@@ -102,19 +102,16 @@ - oncommand="gContextMenu.openLinkInPrivateWindow();"/> - - +@@ -100,9 +100,6 @@ @@ -16,17 +12,7 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro - - - #endif +@@ -256,9 +253,6 @@ @@ -36,8 +22,3 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro -