Граф коммитов

69 Коммитов

Автор SHA1 Сообщение Дата
Gregory Szorc c550ec1795 Bug 1242678 - Disable mozext when running `hg` commands; r=dminor
We disable various extensions when running `hg` commands as part
of `mach mercurial-setup` because they can interfere with operations.
e.g. if the extension isn't compatible with your version of hg, you
will get an error.

For some reason "mozext" wasn't part of this list. Fix that.

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : de041f677d32cc619cf38841ec76aa1adcd2b483
2016-01-25 12:15:46 -08:00
Andrew Halberstadt d16732976a Bug 1234927 - Display fxheads in |hg wip| alias, r=gps
--HG--
extra : rebase_source : 24087d640aefb0f818b565e382b17613cfeb6edb
2015-12-23 15:38:08 -05:00
Gregory Szorc 29bbc52ac7 Bug 1235921 - Update modern Mercurial version to 3.5.2; r=me
3.5.2 is what is listed in `mach mercurial-setup`. These should match.
Add a comment to each file saying to change both.

--HG--
extra : commitid : FebjTovmqGk
extra : rebase_source : 50490c1896a4c402f27cf4154b155932614da558
extra : amend_source : 73ae0ddc9f2770351d2ee2aaf5121656fb7e5750
2015-12-31 16:01:48 -08:00
Gregory Szorc ee27b8ebce Bug 1225599 - Pull Mercurial repos with common 3rd party extensions disabled; r=dminor
Running old extensions with newer versions of Mercurial may crash `hg`
due to the old extension accessing something or doing something that has
been changed in the new release.

To minimize the risk of this happening, we disable common 3rd party
extensions when cloning or pulling as part of `mach mercurial-setup`. We
don't want to disable everything because some extensions (like
remotenames) provide features the user may want enabled as part of the
clone/update. This leaves the door open for more failures. Hopefully
this approach is sufficient. We can always revisit later.

--HG--
extra : rebase_source : 92e7d8fe227f29fc64c0f69021bd731ba762faf3
2015-12-15 10:47:33 -08:00
Gregory Szorc 9a8504bec6 Bug 1232747 - Check for ssl.SSLContext existence; r=dminor
ssl.SSLContext was added in 2.7.9. I thought it was present in earlier
versions and the extra cert foo was added in 2.7.9. Derp.

--HG--
extra : rebase_source : b7a0dd2b9181330a1f23696f46c79cc875927f66
2015-12-15 11:26:20 -08:00
Gregory Szorc 15df0b5e2b Bug 1231989 - Prompt to install hgwatchman extension; r=ahal
This can speed up performance significantly.

Only support OS X for now because on Linux we have to adjust inode
limits to support mozilla-central and I don't feel like scope bloating.

--HG--
extra : commitid : 6M3YsqJAdR8
extra : rebase_source : 042ede08de060ff16b9bb2a009727ac73b5f928f
extra : amend_source : 5c91544cf91b460d4c25ce8334759fcd56326942
extra : histedit_source : 8bdd4099ad9a1113734ecf0fc0ddaa9ec359dc56
2015-12-11 13:02:53 -05:00
Gregory Szorc c72b0e3879 Bug 1231192 - Only install host fingerprints if not running secure Python+hg; r=smacleod
See inline comment.

--HG--
extra : rebase_source : ea92193e33f35df71d3bc85edc2db4c86efa290c
2015-12-07 13:15:24 -08:00
Gregory Szorc 0fdce19cb8 Bug 1231192 - Offer to install `hg wip`; r=smacleod
--HG--
extra : rebase_source : 4fa02af4d0f723e1ffb1a5854c4bde1204bec5d7
2015-12-07 13:22:49 -08:00
Gregory Szorc 3ecb03a1a8 Bug 1231192 - Support clonebundles feature; r=smacleod
bundleclone is the Mozilla-specific precursor to the "clonebundles"
feature in Mercurial 3.6. Change the wizard to recognize when
clonebundles is available and to favor it. Activating clonebundles will
also disable bundleclone, as bundleclone is redundant with clonebundles.
(If both are enabled, bundleclone detects this and gets out of the way.)

--HG--
extra : rebase_source : 989a2ed683ca6a3cc31a3ef4e2803d0b8bf19f09
2015-12-07 13:03:17 -08:00
Gregory Szorc 985a496a77 Bug 1231192 - Bump some minimum Mercurial version; r=smacleod
We only support the last 4 releases of Mercurial. 3.6 is out, which
means we only support down to 3.3.

--HG--
extra : rebase_source : 2b097b5cdbbe87efcf2676ac83b5539298604aac
2015-12-07 12:23:56 -08:00
Gregory Szorc 041af1aae1 Bug 1231192 - Mark Mercurial 3.5.2 as oldest non-legacy version; r=smacleod
Main reason for recommending 3.5 is bundle2. The protocol is faster and
we can do things like put extra data in the server exchange. It also
enables generaldelta to be exchanged without pain.

And of course there are tons of performance improvements and bug fixes.

--HG--
extra : rebase_source : 82e4e6416cb16d2d4b5c795cd567e766c3c8b7f7
2015-12-07 12:20:50 -08:00
Alex Jordan ca8be71591 Bug 1228580 - ./mach mercurial-setup should use ~ to set up extension paths, not my literal home directory. r=gps 2015-11-27 14:51:50 -08:00
Wes Kocher 2db3a9d1ce Bug 1218903 - Update bmo fingerprint. r=fubar, a=Tomcat
--HG--
extra : rebase_source : 111d7f0a25f4822c91a03163dcf13994a2f60559
2015-10-27 10:50:45 -07:00
Gregory Szorc f99d0b9b59 Bug 1200461 - Prompt for Bugzilla API Key instead of password; r=smacleod
All extensions in version-control-tools should support Bugzilla API Keys
now. MozReview requires them. We'll likely remove support for passwords
and cookie auth in the future. This commit transitions the Mercurial
setup wizard to API Keys exclusively.

DONTBUILD (NPOTB)

--HG--
extra : commitid : DM33vGsljQz
extra : rebase_source : 047cd10eb976719ce94478a9a08363dbcd86ae68
2015-09-15 15:57:40 -07:00
Gregory Szorc 7c77cbc5d3 Bug 1195445 - Update host key fingerprint for bugzilla.mozilla.org
The certificate was updated to a SHA-2 certificate.

DONTBUILD (NPOTB)

--HG--
extra : commitid : 11QMFkjpCTa
extra : rebase_source : b9e005c278ef223066a58d78029ccbb4a1c1c9e4
extra : amend_source : bb1bcd8003fa644ce4c8876ec2aa7ac20790ad9e
2015-09-01 17:52:46 -07:00
Xidorn Quan 5264de316d Bug 1200458 - Skip permission check for .hgrc on Windows in hgsetup wizard. r=gps DONTBUILD
--HG--
extra : source : 8fa50ca328f1204bf5f4a51cf3d74de3200c3c0f
2015-09-01 10:22:45 +10:00
Birunthan Mohanathas bc29413b87 Bug 1197527 - Consolidate obtaining hg path into mozversioncontrol.get_hg_path; r=gps
DONTBUILD

--HG--
extra : commitid : LsREOYJSAa7
extra : amend_source : 6f19087188d9c6c009a817c3499c7fd9165bfc6a
extra : histedit_source : 36aa6d1a3e78367d50a3e65ac6f61872b7a635d4
2015-08-24 14:37:42 -04:00
Birunthan Mohanathas 578bb09fd5 Bug 1197527 - Always clone version-control-tools in MercurialSetupWizard; r=gps
--HG--
extra : commitid : EFt8PQR3B2S
extra : histedit_source : 0bea4cef45799c3ce688f4f0caea966b237abcbc
2015-08-24 10:31:55 -07:00
Birunthan Mohanathas 467f93f8fd Bug 1197527 - Don't unnecessarily attempt to create extensions directory in MercurialUpdater; r=gps
--HG--
extra : commitid : 9RzrDPQc3oG
extra : histedit_source : 9b9c33161c67af1b7f577f2a8faeaf196e63f02b
2015-08-22 13:50:05 -07:00
Brian Smith af289e29eb Bug 1188931 - Fix hgsetup wizard. r=gps
--HG--
extra : rebase_source : cecc4d721d77467dfbe384a9bbd0fc6ace3ba6a3
2015-07-29 13:59:18 -04:00
Gregory Szorc b5154c4df4 Bug 1184229 - Detect multiple version-control-tools repos in Mercurial config; r=smacleod
Having multiple version-control-tools repositories references in your
hgrc could lead to one repository importing code from another, depending
on how sys.path modification works from version-control-tools
repositories. Detect it and issue a warning.

--HG--
extra : commitid : 2rfQARjGfu9
extra : rebase_source : 01d221cdc4b462cb52041d1d18f121e09b23125c
extra : amend_source : bac3fd876d6c8f0a3a94f4ae25950f5971dcb869
2015-07-27 13:44:39 -07:00
Gregory Szorc 93e629ca43 Bug 1185557 - Print relevant config options; r=smacleod
Users may want to know what the wizard is changing before they answer
prompts. Add the names of impacted config options to messages so people
can make more informed decisions.

--HG--
extra : commitid : 6p2kijj68zV
extra : rebase_source : 6468ab56fad7292ac9811c546882693aee8b5922
2015-07-21 10:11:09 -07:00
Gregory Szorc c0dc074f70 Bug 1185557 - Prompt about bzexport after reviewboard; r=smacleod
We want to encourage people to use reviewboard over bzexport.

--HG--
extra : commitid : 4SacVKrLjxU
extra : rebase_source : 8a466b026d273a10e09184a21d14870cfb89b959
2015-07-21 10:10:54 -07:00
Gregory Szorc e9eb7e6445 Bug 1185557 - Only prompt to install progress on Mercurial <3.5; r=smacleod
Progress is enabled by default in Mercurial 3.5. extensions.progress
no-ops. Don't prompt for it on newer Mercurial versions.

--HG--
extra : commitid : 5zyqyanQ64o
extra : rebase_source : 9fe52282b715949b8565683ffce9a7538325b3c6
2015-07-21 10:10:38 -07:00
Gregory Szorc af7dd87352 Bug 1185112 - Don't prompt for Bugzilla username/password if cookies defined; r=smacleod
Before, we prompted for Bugzila username/password if the hgrc contained
credentials in cookie form. Don't do that.

--HG--
extra : commitid : 1aGcwtZzsDM
extra : rebase_source : e7a1355f44b641337adb6cefd3c90ef1bf077fbd
2015-07-21 10:09:15 -07:00
Gregory Szorc 1d8ac6998b Bug 1185113 - Support setting more secure file permissions; r=smacleod
~/.hgrc files are likely created with the user's default umask, which
commonly gives default permissions of 644. If the hgrc config contains
sensitive information (such as Bugzilla credentials), these file
permissions could result in others stealing sensitive data.

Detect when the group and other file mode bits are set and prompt to
remove these permissions.

--HG--
extra : commitid : 6vVKQNd9yLi
extra : rebase_source : 860379bfbf8fdb4eef70b069e41a41239d93e40f
2015-07-21 10:08:24 -07:00
Gregory Szorc c0a5c25aeb Bug 1185113 - Clarify language around Bugzilla credentials; r=smacleod
Bugzilla credentials are optional. Make this more obvious by adding
"optional" to the prompt.

Bugzilla credentials are stored in plain text. Explicitly call this out
in the help text so users can make informed decisions about whether to
capture the credentials.

--HG--
extra : commitid : DjPaYeh7oTo
extra : rebase_source : 05439551c097af9407ba15a54ab558637af4658b
2015-07-21 10:08:02 -07:00
Gregory Szorc a6bb6ec5af Bug 1178955 - Print line number for parse errors; r=smacleod
It helps users debug problems.

--HG--
extra : commitid : IU6Cw35FEiM
extra : rebase_source : f6ab1ef356bb10b689f2fed034a9f2564ffe0fc3
extra : amend_source : ef52d60ca12796fcfe32392077a7606628a54d29
2015-07-17 10:29:22 -07:00
Gregory Szorc 402674db49 Bug 1178955 - Error when semicolon comments are seen; r=smacleod
configobj doesn't support semicolon comments. Why, I don't know, since
they are pretty common in ini files.

Do a static check for semicolon comments and print a more actionable
error message.

--HG--
extra : commitid : CULjsg4do9Z
extra : rebase_source : f135cc726462c73a8363ebb8c98092177cf7ffd3
extra : amend_source : 0b8c67d5b0be3bc07cf7ff4f136bb58d342368c4
2015-07-17 10:29:09 -07:00
Gregory Szorc 67d8bb157c Bug 1178955 - Print config path on failure; r=smacleod
Actionable error messages are useful.

--HG--
extra : commitid : CDhGEzOJpTk
extra : rebase_source : cb90b3c4c39cc502a4680c1b71fb69b316443688
extra : amend_source : 8f21e837c34138a807f6a8afeefa233e96c56880
2015-07-17 10:28:55 -07:00
Gregory Szorc ab35c26d9e Bug 1178955 - Refactor config path selection; r=smacleod
An upcoming commit will display the path of the config file in the error
message. In order to do this, the calling scope needs to know the path
to the config file.

--HG--
extra : commitid : 5CDrz1hQOOA
extra : rebase_source : 1c29359c9e98b15c99de9efb30add0b0a108aa59
extra : amend_source : 1aa2c504ce72fbdeae1da2f0a6f876e37c46f5f8
2015-07-17 10:28:29 -07:00
Gregory Szorc 9384a4421e Bug 1178955 - Don't pass config paths to updater; r=smacleod
They aren't needed.

--HG--
extra : commitid : 62sGc753PYY
extra : rebase_source : 8fc70f03909e693c20b756828045c4844b43325e
extra : amend_source : aa3e557c6e81824ed8788a8412f7ead09731f42d
2015-07-17 10:28:12 -07:00
Chris Manchester 486a47562c Bug 1162093 - Add "push-to-try" from version-control-tools to the mercurial setup wizard prompt.;r=gps
--HG--
extra : commitid : KlfgrTg1e8X
2015-06-02 20:41:29 -07:00
Gregory Szorc 06883e5900 Bug 1168466 - Prompt to install bundleclone extension; r=smacleod
We're about to deploy this to release automation. We might as well have
normal people start using it as well. We could perhaps even have the
extension print out information on how to resume interrupted downloads
someday, so it will pay to have this enabled so they can utilize that
feature some day in the future.

DONTBUILD (NPOTB)

--HG--
extra : commitid : CVW0xQNKjt3
extra : rebase_source : 8c5f609b036ac081c1af5f7428bb8d4a4c2ed476
extra : histedit_source : adb57e6fbb5f50af619fb98e1fbb17c815aca76e
2015-05-26 10:07:32 -07:00
Gregory Szorc 9bb66e65f0 Bug 1168466 - Bump minimum Mercurial version; r=smacleod
We dropped support for Mercurial 3.0 in version-control-tools. Bump
minimum versions in extensions to reflect this.

We highly recommend people run a modern Mercurial. Bump the minimum
non-legacy version to reflect that.

--HG--
extra : commitid : 8YtjoVnYauL
extra : rebase_source : 949c27a376226bbd32430047176012b51e891255
extra : histedit_source : aff04954269ed777c9b26ec3f1fda6526b1ae317
2015-05-26 10:00:52 -07:00
Ed Morley 7f51884ce9 Bug 1164812 - mach mercurial-setup: Always mark the v-c-t repo as needing update
Currently we only mark the version-control-tools repo as needing updating, if
we did not pass a path param to prompt_external_extension(). This is because if
no path is passed, the extension is used from the version-control-tools repo,
and so if _no_ path is passed, it's presumed the extension is external to the
repo. However this is not always the case - eg if we need to specify a specific
file for an extension (vs the entire directory), we have to do so be passing in
the path. We hit this case for reviewboard.

With this change, we always mark the version-control-tools repo as needing an
update, no matter where the extension was located.
2015-05-19 09:41:38 +01:00
Ed Morley 18e0893b16 Bug 978514 - mach mercurial-setup: Use mqext from the version-control-tools repo
mqext was moved into the version-control-tools repo some time ago, but mach
mercurial-setup was still pointing at the old repo location, which is no longer
being updated.
2015-05-19 09:41:38 +01:00
Gregory Szorc 4d9db7cba1 Bug 1164315 - Update key fingerprint for bitbucket.org; r=me
Value obtained from
https://blog.bitbucket.org/2015/05/06/bitbuckets-ssl-certificate-is-changing-for-sha-2/
and verified to work.

DONTBUILD (NPOTB)

--HG--
extra : commitid : AyMDr4OieQg
extra : amend_source : fba8a857e6f2a5044955d027620af36a847942d1
2015-05-12 20:21:47 -07:00
Gregory Szorc 744bbc11a4 Bug 1128586 - Prefer hg.exe over hg; r=RyanVM
This is needed for compatibility with an upcoming release of
MozillaBuild, which distributes Mercurial as a Python package, not as a
standalone Windows program. As a result, it introduces "hg" into $PATH,
which "which" will happily prefer as the "hg" binary. This upsets
subprocess. So, we explicitly prefer "hg.exe" over "hg".

We could accomplish the same thing by calling which.whichall() and
sorting results. But this is more code and IMO not worth the effort to
implement.

--HG--
extra : rebase_source : 750ba02c02fd4a9fab42ccf128eab4f5e7741564
extra : amend_source : 8fb84c0ed5cd14dd27ad6cd7b78fb2ac1ffc87a2
2015-04-27 10:43:49 -07:00
Stéphane SCHMIDELY f5adae293e Bug 1144629 - UnicodeDecodeError in ./mach mercurial-setup. r=gps, r=glandium 2015-03-25 12:25:49 +01:00
Dawid Pura 9725a0ec5a Bug 1077326 - Change mercurial-setup process by adding run test for each external extension before prompting about it. r=glandium 2014-11-25 10:53:00 +01:00
Andrew Halberstadt b458452297 Bug 1101773 - Add an --update-only option to |mach mercurial-setup| for updating extensions without running the wizard, r=gps
--HG--
extra : rebase_source : 93de55544f2f907255a286b1074ed201de62a46b
2014-11-19 15:01:04 -05:00
Andrew Halberstadt dcafcc6e89 Bug 1092149 - Use LooseVersion instead of StrictVersion in |mach mercurial-setup| so release candidates work, r=gps 2014-10-31 15:09:39 -04:00
Rémy Ferré 3c5d0d44f7 Bug 1058845 - Decode raw_input() as UTF-8; r=gps
DONTBUILD (NPOTB)

--HG--
extra : amend_source : cf4f5e29de43f714ae62f247227b17e65debc710
2014-10-24 15:27:40 -07:00
Alexis Metaireau 98029cd385 Bug 1071133 — Make sure mercurial-setup knows how to handle unicode characters. r=gps 2014-09-22 20:03:17 +02:00
Felix Baylac-Jacque d722dd07e7 Bug 1049893 - Allow mach mercurial-setup to work if no ~/.hgrc exists; r=gps
DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 8788d55cd5cfa5e64627d7951209c5f2c1222f0a
2014-08-07 00:19:06 +02:00
Patrick Cloke 114d16e26a Bug 1047592 - mercurial-setup should error when trying to read a config with %include. r=gps 2014-08-05 09:42:33 -04:00
Gregory Szorc 1e3f120dc8 Bug 1039894 - Add bzpost and firefoxtree to mach mercurial-setup; r=smacleod
bzpost is an efficiency win for everyone.

firefox tree is mostly useful for people doing head/bookmark-based
development.

Both extensions can yield massive productivity wins. They should be
advertised.

DONTBUILD (NPOTB) on a CLOSED TREE

--HG--
extra : rebase_source : ab72d3afd6ab244bfdbdb2dda5e0b45c9d8f782e
extra : amend_source : 91ec7523a4631c7519efd3b6cd425cff00bd0569
2014-07-16 19:18:49 -07:00
Chris Kitching c4f8d32e63 Bug 1039164: Prettier handling of invalid hgrc files by mach. r=gps 2014-07-17 01:21:06 +01:00
Gregory Szorc c5c6819b0f Bug 1033656 - Add reviewboard to mach mercurial-setup; version checking; r=smacleod
We want to make it turnkey for people to use reviewboard. So, we add
reviewboard and related functionality to |mach mercurial-setup|.

Since the reviewboard extension only works in Mercurial 3.0 and newer,
we add some version detection for the Mercurial version. This should
have been done months ago. We now have it.

I also took the opportunity to inform |mach bootstrap| that Mercurial
2.x is no longer modern.

I also updated the messaging around mq to encourage fewer new users to
use it. You may find this controversial. People can always ignore the
message.

Finally, I also added a histedit prompt to the mix, since a lot of
people don't know about that and many find it useful.

I could have broken this into multiple patches. Meh.

--HG--
extra : rebase_source : d33f8abcabb6ad6511c2f9e202283d43613fafc4
extra : amend_source : 3a56bc4d49ee6200cbdd0e87b4f28489518fee79
2014-07-02 14:05:42 -07:00