Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 06 Mar 2019 11:24:40 +0100] rev 41862
verify: make the `warn` method private
The method is for internal use only. Let us make that fact clearer.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 06 Mar 2019 11:23:05 +0100] rev 41861
verify: document the `warn` method
This is the first bit of an effort to document and augment the verify code.
Navaneeth Suresh <navaneeths1998@gmail.com> [Mon, 04 Mar 2019 20:18:13 +0530] rev 41860
uncommit: add flag --allow-dirty-working-copy
This adds a flag `--allow-dirty-working-copy` as an alias for
the experimental config option `experimental.uncommitondirtydir`.
Differential Revision: https://phab.mercurial-scm.org/D6069
Navaneeth Suresh <navaneeths1998@gmail.com> [Tue, 12 Feb 2019 00:17:42 +0530] rev 41859
uncommit: don't allow dirty working copy with PATH (
issue5977)
On a dirty PATH, uncommit was working without even setting the config
`experimental.uncommitondirtydir` to `True`. Ideally, it should abort
as it does for a dirty dir. This patch makes uncommit to require the
config option `experimental.uncommitondirtydir` on a dirty PATH.
Original patch to evolve extension authored by Dan Villiom Podlaski Christiansen:
https://bitbucket.org/octobus/evolve-devel/pull-requests/8/bug-5977-uncommit-dirtiness/diff
Differential Revision: https://phab.mercurial-scm.org/D5940
Augie Fackler <augie@google.com> [Tue, 05 Mar 2019 09:51:57 -0500] rev 41858
cleanup: remove two bogus test names from python3 list
I suspect one of these was a typo from the start, the other appears to
have become a .t test at some point.
Differential Revision: https://phab.mercurial-scm.org/D6076
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Mar 2019 15:46:54 +0100] rev 41857
revlog: preserve `_lazydelta` attribute in `revlog.clone`
The attribute was introduce in
688fc33e105d, Yuya Nishihara pointed out that
this preservation was missing. This changeset fixes the preservation and make
sure we set the attribute according the modes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Mar 2019 16:08:44 +0100] rev 41856
localrepo: explicit `_lock` arguments in `lock`
The argument for `_lock` are non-trivial, having them passed explicitly makes
thing clearer in my opinion. This is a Gratuitous change, I expect it will save
me (and others) time in the future.
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 17:22:03 -0800] rev 41855
inno: remove w9xpopen.exe
w9xpopen.exe is a utility program shipped with Python <3.4
(https://bugs.python.org/
issue14470 tracked its removal).
The program was used by subprocess to wrap invoked processes
on Windows 95 and 98 or when command.com was used in order to
work around a redirect bug.
The workaround is only used on ancient Windows versions -
versions that we shouldn't see in 2019.
While Python 2.7's subprocess module still references
w9xpopen.exe, not shipping it shouldn't matter unless we're
running an ancient version of Windows. Python will raise
an exception if w9xpopen.exe can't be found.
It's highly unlikely anyone is using current Mercurial releases
on these ancient Windows versions. So remove w9xpopen.exe
from the Inno installer.
.. bc::
The 32-bit Windows Inno installers no longer distribute
w9xpopen.exe. This should only impact people running
Mercurial on Windows 95, 98, or ME.
Differential Revision: https://phab.mercurial-scm.org/D6068
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 15:53:27 -0800] rev 41854
inno: stop shipping pywin32
Ancient versions of Mercurial relied on pywin32 and I suspect
that's why we have this dependency.
We also ship the "keyring" package, which has a dependency
on "pywin32-ctypes" (providing the "win32ctypes" package).
This is a stripped down version of pywin32 that doesn't have
as many dependencies.
Since we don't have a dependency on pywin32 and since pywin32
is a bit annoying to package, let's get rid of it.
With this change, py2exe no longers picks up DLL dependencies
on various UCRT DLLs (because we no longer have a .pyd file
beloning to pywin32 which was pulling them in). So, we were
able to remove code in support of the UCRT DLLs.
.. bc::
The Windows Inno installers no longer ship the pywin32 package.
This package was being bundled for historical reasons. Mercurial
stopped using pywin32 several years ago and the disappearance
of this package should not have any meaningful impact.
Differential Revision: https://phab.mercurial-scm.org/D6067
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 18:19:07 -0800] rev 41853
inno: script to automate building Inno installer
The official Inno installer build process is poorly documented.
And attempting to reproduce behavior of the installer uploaded
to www.mercurial-scm.org has revealed a number of unexpected
behaviors.
This commit attempts to improve the state of reproducibility
of the Inno installer by introducing a Python script to
largely automate the building of the installer.
The new script (which must be run from an environment with the
Visual C++ environment configured) takes care of producing an
Inno installer. When run from a fresh Mercurial source checkout
with all the proper system dependencies (the VC++ toolchain,
Windows 10 SDK, and Inno tools) installed, it "just works."
The script takes care of downloading all the Python
dependencies in a secure manner and manages the build
environment for you. You don't need any additional config
files: just launch the script, pointing it at an existing
Python and ISCC binary and it takes care of the rest.
The produced installer creates a Mercurial installation with
a handful of differences from the existing 4.9 installers
(produced by someone else):
* add_path.exe is missing (this was removed a few changesets ago)
* The set of api-ms-win-core-* DLLs is different (I suspect this
is due to me using a different UCRT / Windows version).
* kernelbase.dll and msasn1.dll are missing.
* There are a different set of .pyc files for dulwich,
keyring, and pygments due to us using the latest versions of
each.
* We include Tcl/Tk DLLs and .pyc files (I'm not sure why these
are missing from the existing installers).
* We include the urllib3 and win32ctypes packages (which are
dependencies of dulwich and pywin32, respectively). I'm not
sure why these aren't present in the existing installers.
* We include a different set of files for the distutils package.
I'm not sure why. But it should be harmless.
* We include the docutils package (it is getting picked up as
a dependency somehow). I think this is fine.
* We include a copy of argparse.pyc. I'm not sure why this was
missing from existing installers.
* We don't have a copy of sqlite3/dump.pyc. I'm not sure why. The
SQLite C extension code only imports this module when
conn.iterdump() is called. It should be safe to omit.
* We include files in the email.test and test packages. The set of
files is small and their presence should be harmless.
The new script and support code is written in Python 3 because
it is brand new and independent code and I don't believe new
Python projects should be using Python 2 in 2019 if they have
a choice about it.
The readme.txt file has been renamed to readme.rst and overhauled
to reflect the existence of build.py.
Differential Revision: https://phab.mercurial-scm.org/D6066
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 14:08:25 -0800] rev 41852
setup: exclude some internal UCRT files
When attempting to build the Inno installer locally, I was getting
several file not found errors when py2exe was crawling DLL
dependencies. The missing DLLs appear to be "internal" DLLs
used by the Universal C Runtime (UCRT). In many cases, the
missing DLLs don't appear to exist on my system at all!
Some of the DLLs have version numbers that appear to be N+1
of what the existing version number is. Maybe the "public" UCRT
DLLs are probing for version N+1 at load time and py2exe is
picking these up? Who knows.
This commit adds the non-public UCRT DLLs as found by
py2exe on my system to the excluded DLLs set. After this
change, I'm able to produce an Inno installer with an
appropriate set of DLLs.
Differential Revision: https://phab.mercurial-scm.org/D6065
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 15:46:26 -0800] rev 41851
setup: include additional packages in py2exe distribution
I'm attempting to reproduce the Inno installers on my local
machine. As part of auditing differences between installer output,
I noticed that the existing Inno installers include various 3rd
party packages.
There is no mention of this in the build instructions nor on
the wiki. This must be something that is done by the installer
producer.
This commit teaches setup.py to include these 3rd party packages
in py2exe's library. After this change, I am able to produce
Inno installers that have a nearly identical set of Python
modules.
It's worth noting that pywin32 is included even though it
probably shouldn't be. But including it is necessary in order
to achieve parity with existing Inno installers.
Differential Revision: https://phab.mercurial-scm.org/D6064
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 10:31:23 -0800] rev 41850
setup: define build_doc command
Currently, various processes for packaging Mercurial state to
manually invoke `make -C doc` in order to generate the documentation.
This Makefile merely invokes `gendoc.py` and `runrst` to produce
man pages and HTML pages.
Not all environments may have the ability to easily run
Makefiles. Windows is notably in this set.
This commit ports the man page and HTML generation logic from
doc/Makefile to setup.py. We introduce a new build_doc command
which generates documentation by calling gendoc.py and runrst.
The documentation can now be built via pure Python by running
`python setup.py build_doc`.
We don't implement dependency tracking because IMO it is more
effort than it is worth.
We could potentially remove the duplicated functionality in
doc/Makefile. But I'm not sure what all is depending on it. So
I plan to keep it around.
# no-check-commit because forced foo_bar function names
Differential Revision: https://phab.mercurial-scm.org/D6063
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 09:16:37 -0800] rev 41849
inno: remove references to pywin32
According to the commit message for
0c35bb01a1195, pywin32 was
removed in Mercurial 1.8!
Differential Revision: https://phab.mercurial-scm.org/D6062
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 09:10:52 -0800] rev 41848
inno: remove cacerts.pem from documentation
The inno distribution no longer includes cacert.pem as of
ca1ad8ef38be22 (April 2015). The docs were never updated.
Differential Revision: https://phab.mercurial-scm.org/D6061
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 28 Feb 2019 12:54:48 -0800] rev 41847
inno: replace add_path.exe with a Pascal script
While attempting to build the Inno installer, I was unable to
find a copy of add_path.exe from the source site previously
listed in the docs.
Some quick Googling revealed that achieving this functionality
in native Pascal scripts seems to be preferred these days.
This commit vendors "Modify Path" (fetched from
https://www.legroom.net/software/modpath) and plugs it into
our Inno config file per its instructions.
The existing Inno installer appears to only modify PATH for
the current user (as opposed to at the system level). I've
maintained this behavior with Modify Path. Although it would
be trivial to change or add checkboxes to control the behavior.
I'll leave this as a follow-up.
Differential Revision: https://phab.mercurial-scm.org/D6060
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 03 Mar 2019 18:22:49 -0800] rev 41846
inno: move inno installer files to contrib/packaging/inno
Let's isolate the inno installer files to their own directory
so the separation between things is clearer.
This required adjusting a few relative paths and references to
the old directory.
Differential Revision: https://phab.mercurial-scm.org/D6059
Pulkit Goyal <pulkit@yandex-team.ru> [Tue, 05 Mar 2019 04:34:45 +0530] rev 41845
py3: add a new passing test found by buildbot
Differential Revision: https://phab.mercurial-scm.org/D6073
Pulkit Goyal <pulkit@yandex-team.ru> [Tue, 05 Mar 2019 04:32:23 +0530] rev 41844
tests: make test-status.t compatible with test-check-module-imports.t
Otherwise the later fails on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D6072
Pulkit Goyal <pulkit@yandex-team.ru> [Tue, 05 Mar 2019 04:11:32 +0530] rev 41843
py3: convert KEY_PRESSED value to bytes in crecord.py
This was a str before.
Differential Revision: https://phab.mercurial-scm.org/D6071
Augie Fackler <augie@google.com> [Mon, 04 Mar 2019 18:11:50 -0500] rev 41842
hghave: skip emacs tests on 24.3 and earlier
Turns out with-eval-after-load is new in 24.4.
Differential Revision: https://phab.mercurial-scm.org/D6074
Pulkit Goyal <pulkit@yandex-team.ru> [Tue, 05 Mar 2019 03:33:41 +0530] rev 41841
py3: use bytes instead of str in isinstance()
We use bytes everywhere.
Differential Revision: https://phab.mercurial-scm.org/D6070
Joerg Sonnenberger <joerg@bec.de> [Tue, 12 Feb 2019 19:08:17 +0100] rev 41840
server: allow customizing the default repo filter
hgweb has the (undocument) configuration option web.view that allows
restricting visible revisions to immutable. This is useful for serving
the same storage as publishing and non-publishing repo. Add the new
server.view option to serve the same purpose by changing the default
behavior of `getdispatchrepo`. Drop the hard-coded 'served' filter in the
batch handler of v1 of the wire proto, this is a left-over from the days
before `getdispatchrepo` existed.
Differential Revision: https://phab.mercurial-scm.org/D5946
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 02 Mar 2019 05:24:35 +0530] rev 41839
py3: convert filtername to str if it's None
I have not called pycompat.bytestr() and rather converted the value there
because I am starting to get concerned about the function call overhead of all
this bytes to str or vice versa convert functions.
Differential Revision: https://phab.mercurial-scm.org/D6042
Martin von Zweigbergk <martinvonz@google.com> [Sat, 02 Mar 2019 13:28:17 -0800] rev 41838
walkfilerevs: rename filerevgen() to filerevs() since it's not a generator
Differential Revision: https://phab.mercurial-scm.org/D6053
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 13:15:53 -0800] rev 41837
global: use raw string for setlocale() argument
Otherwise Python 2 will coerce a unicode to str, which fails
on HGUNICODEPEDANTRY=1.
Differential Revision: https://phab.mercurial-scm.org/D6052
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 13:07:58 -0800] rev 41836
encoding: use raw strings for encoding arguments
This prevents the internals of Python from coercing a unicode to str
on Python 2 and makes tests run with HGUNICODEPEDANTRY=1 a lot
happier.
Differential Revision: https://phab.mercurial-scm.org/D6051
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 13:02:39 -0800] rev 41835
revsetlang: use sysbytes() instead of blind encode()
Otherwise we will call str.encode() on Python 2, which is wrong.
sysbytes() does encode('utf-8') on Python 3. But the source is
guaranteed ASCII, so it shouldn't matter.
With this change, `hg` now runs with `HGUNICODEPEDANTRY=1` set.
However, several tests are failing.
Differential Revision: https://phab.mercurial-scm.org/D6050
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 12:57:00 -0800] rev 41834
global: use raw strings for namedtuple()
Otherwise Python 2 will attempt to coerce unicode to str, which
we don't want.
Differential Revision: https://phab.mercurial-scm.org/D6049
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 12:55:29 -0800] rev 41833
attr: don't attempt to .encode() a str on Python 2
Otherwise it coerces automatically.
Differential Revision: https://phab.mercurial-scm.org/D6048
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 12:51:55 -0800] rev 41832
procutil: use a raw string for module name
Otherwise Python 2 will coerce unicode to str.
Differential Revision: https://phab.mercurial-scm.org/D6047
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 02 Mar 2019 12:51:04 -0800] rev 41831
global: use raw strings for __slots__
Otherwise Python 2 will coerce unicode to str at module load time.
We don't like automatic string coercions.
Differential Revision: https://phab.mercurial-scm.org/D6046
Martin von Zweigbergk <martinvonz@google.com> [Thu, 28 Feb 2019 07:45:51 -0800] rev 41830
absorb: run cleanupnodes() within transaction also when not using obsmarkers
scmutil.cleanupnodes() schedules stripping to be done after the
current transaction, so we can safely run it within the
transaction. This also means that the phase will be updated within the
transaction, which I believe means that the initial (possibly
incorrect) phase will not visible.
Differential Revision: https://phab.mercurial-scm.org/D6037
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 02 Mar 2019 05:23:15 +0530] rev 41829
py3: pass a str to getpass.getpass()
Otherwise I see `password: b''` on the prompt.
# skip-blame because just prefix
Differential Revision: https://phab.mercurial-scm.org/D6041
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 02 Mar 2019 05:12:45 +0530] rev 41828
py3: port things from chgserver.py
I have installed mercurial on my personal laptop using Python 3.7. I also have
hg aliased to chg. Before this commit, `hg version` didn't work. After this
patch, things are better and now chg works.
Differential Revision: https://phab.mercurial-scm.org/D6040
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 02 Mar 2019 05:01:00 +0530] rev 41827
py3: make sure return value of posix.groupname() is bytes
Differential Revision: https://phab.mercurial-scm.org/D6039
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:09 +0900] rev 41826
contrib: make check-code.py check code fragments embedded in test scripts
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:09 +0900] rev 41825
contrib: add line offset information to file check function of check-code.py
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
This information will be useful to show correct line number in an
actual file for errors detected in code fragments embedded in *.t test
scripts.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:09 +0900] rev 41824
contrib: change return value of file checking function of check-code.py
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
After this patch, caller of _checkfiledata() can count number of
errors in each code fragments of an actual file.
This will be useful to share --per-file limitation by all embedded
code fragments.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:09 +0900] rev 41823
contrib: factor out actual error check for file data of check-code.py
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
Newly added _checkfiledata() will be useful to apply checks on code
fragments embedded in *.t test scripts.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:09 +0900] rev 41822
contrib: refactor preparation logic for patterns of check-code.py
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
Before this patch, preparation logic in _preparepats() of
check-code.py is not reusable. It can handle only module global list
"checks".
This patch splits preparation logic into small internal functions, and
add the loop to invoke them, in order to increase reusability of the
logic.
"c[-2]" is equivalent to "c[3]" for "checks". This patch uses the
former, because it will be more reusable for subsequent patch than the
latter.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:53:05 +0900] rev 41821
contrib: split pypats list in check-code.py
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
Ideally, all patterns in "pypats" before this patch should be applied
on not only normal *.py files but also code fragments embedded in *.t
test scripts. But fixing test scripts for some patterns requires
many changes, and has less profit than effort.
Therefore, this patch splits pypats list into two below:
- commonpypats, which are applied on all (= including code fragments
embedded in *.t test scripts) *.py files
- pypats, which are applied only on normal *.py
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Mar 2019 02:51:52 +0900] rev 41820
tests: remove useless line wrapping in a code fragment embedded in test script
This is a part of preparation to apply checking with check-code.py on
code fragments embedded in *.t test scripts.
This revision avoids error of check-code.py below.
Use () to wrap long lines in Python, not \
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Feb 2019 12:40:18 +0100] rev 41819
storage: introduce a `revlog.reuse-external-delta` config
This option goes a bit further and provides a way to get the same behavior as the
`re-delta-all` optimisation from `hg debugupgraderepo`.
The effect of the option is a bit hard to test as we do not have multiple diff
algorithm at hand. However, we at least make sure the code path run.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Feb 2019 10:49:25 +0100] rev 41818
storage: introduce a `revlog.reuse-external-delta-parent` config
As pointed in
c59987ab96b4, we had no simple way to get a client to not blindly
reuse the delta parent from a bundle. Instead one had to rely on a side effect
of the deprecated `format.generaldelta` configuration.
We introduce an explicit `revlog.reuse-external-delta-parent` configuration
option (default to True) to control this behavior. If the option is not set,
`format.generaldelta` still control this behavior.
To test the new option, we convert a couple of place where `generaldelta` have
been used for its side effects.
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Mar 2019 09:41:17 +0900] rev 41817
merge with stable
Pulkit Goyal <pulkit@yandex-team.ru> [Thu, 28 Feb 2019 04:08:47 +0530] rev 41816
py3: convert return values of inspect.getabsfile() to bytes
It's weird that python docs for inspect does not mention getabsfile().
Differential Revision: https://phab.mercurial-scm.org/D6033
Pulkit Goyal <pulkit@yandex-team.ru> [Thu, 28 Feb 2019 03:51:06 +0530] rev 41815
py3: add two new passing tests found by buildbot
Differential Revision: https://phab.mercurial-scm.org/D6032
Pulkit Goyal <pulkit@yandex-team.ru> [Thu, 28 Feb 2019 03:48:07 +0530] rev 41814
py3: make contrib/debugshell.py work with Python 3
I changed default mercurial installation of my personal laptop to one installed
with python 3.7. debugshell is one of the extension which I have enabled and it
was failing. This patch makes debugshell works with Python 3.
I found that chg does not work with python 3.
Differential Revision: https://phab.mercurial-scm.org/D6031
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Feb 2019 16:34:58 -0800] rev 41813
absorb: let scmutil.cleanupnodes() take care of setting phase
Differential Revision: https://phab.mercurial-scm.org/D6036
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Feb 2019 16:33:15 -0800] rev 41812
absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled
A side-effect of this is the new warning in the test case, but the
warning is valid, so I don't think that's a problem.
Differential Revision: https://phab.mercurial-scm.org/D6035
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Feb 2019 16:15:10 -0800] rev 41811
absorb: use scmutil.cleanupnodes() so operation gets set
The operation is useful for e.g. `hg obslog` output.
Differential Revision: https://phab.mercurial-scm.org/D6034
Boris Feld <boris.feld@octobus.net> [Mon, 25 Feb 2019 09:02:29 +0100] rev 41810
test: follow-up on
1c4d6ab2ecb8, stabilize test-remotefilelog-bgprefetch.t
In
1c4d6ab2ecb8, I've added some sleeps after about half of the calls to `hg
debugwaitonrepack` but it seems the other calls are also flaky as catched by
our CI: https://ci.octobus.net/job/MercurialPy2/299/console. Add sleeps after
all calls in order to be safe.
Matt Harbison <matt_harbison@yahoo.com> [Mon, 25 Feb 2019 21:10:16 -0500] rev 41809
tests: add more wildcards to test-extdiff.t
This test has been flakey recently on Windows, but it appears to be the same
scenario as
88d4477ac4f6.
Pulkit Goyal <pulkit@yandex-team.ru> [Tue, 26 Feb 2019 17:26:33 +0300] rev 41808
branchmap: prevent reading the file twice through different iterators
Otherwise, test-static-http.t breaks.
Differential Revision: https://phab.mercurial-scm.org/D6028
Kyle Lippincott <spectral@google.com> [Mon, 25 Feb 2019 12:42:48 -0800] rev 41807
remotefilelog: fix format str, blobsize isn't always a #, can be "(missing)"
Differential Revision: https://phab.mercurial-scm.org/D6025
Kyle Lippincott <spectral@google.com> [Fri, 22 Feb 2019 19:24:01 -0800] rev 41806
remotefilelog: do not specify an explicit version for repack
Differential Revision: https://phab.mercurial-scm.org/D6024
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:55:20 +0100] rev 41805
test: generate the `test-sparse-revlog` artifact when slow-test is allowed
The `test-sparse-revlog.t` logic requires a large bundle to be generated. This
bundle can be reused from one run to the next but its initial generation is
slow. With this patch, if the bundle is missing and slow tests are permitted,
the bundle will be generated during the test run.
This should ensure that CI run this test.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:23 +0100] rev 41804
runtest: also update slow test timeout during `#if` clauses
For a `#if slow` test to be useful, we need the test timeout to be increased.
Without this, the slow section would likely be killed before it finish.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:08 +0100] rev 41803
runtest: move slow timeout process earlier in the `_hghave` method
Before this changesets, early returns might prevent this logic to apply. It
seem safer to run it sooner.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:34 +0100] rev 41802
runtest: extract the logic that update timeout for slow tests
We want to use the "slow" test logic not only for "#require" clauses but also in
"#if" clauses. For this to be useful we need the logic to bump the timeout in at
least two spots. The first step it to factor it out.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:40 +0100] rev 41801
tests: increase timeout for slow test
Test case `test-sparse-revlog.t` need some artifact (a bundle) build before it
can run. The artifact is expensive to build, but can be reused from one run to
the other. We are about to update that test to make the artifact building
automatic if `--allow-slow-tests` is passed. However, we need a bump the
timeout a bit to make sure the artifact building as time to finish.
We could maybe teach run-tests.py how to directly handle such artifacts.
However since there is only one of them for now, this seems premature.
There are also some room to speed up the bundle creation for
test-sparse-revlog.t
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 25 Feb 2019 18:51:08 -0800] rev 41800
merge with stable
Boris Feld <boris.feld@octobus.net> [Wed, 02 Jan 2019 03:07:52 +0100] rev 41799
rewriting: add an option for rewrite commands to use the archived phase
Using the archived phase for cleanup provide the same effect than stripping,
but in a faster, append-only way.
We keep the feature experimental for now until it gets a bit more testing.
Boris Feld <boris.feld@octobus.net> [Tue, 16 Oct 2018 15:48:00 +0200] rev 41798
strip: introduce a soft strip option
This is the first user-accessible way to use the archived phase introduced in
4.8. This implements a feature discussed during the Stockholm sprint, using
the archived phase for hiding changesets.
The archived phase behaves exactly as stripping: changesets are no longer
visible, but pulling/unbundling them will make then reappear. The only notable
difference is that unlike hard stripping, soft stripping does not affect
obsmarkers.
The next changeset will make use of the archived phase for history rewriting
command. However, having a way to manually trigger the feature first seems a
necessary step before exposing users to this phase; there is a way to
un-archived changesets (unbundling), so there must be a way to archive them
again.
Adding a flag to strip is a good way to provide access to the feature without
taking a too big risk on the final UI we want. The flag is experimental so it
won't be exposed by default.
Using the archived phase is faster and less traumatic for the repository than
actually stripping changesets.
Pulkit Goyal <pulkit@yandex-team.ru> [Mon, 25 Feb 2019 16:49:01 +0300] rev 41797
branchcache: move loading of branch names and nodes into it's own function
This will help me in implementing lazy loading of the branchcache in upcoming
patches.
Differential Revision: https://phab.mercurial-scm.org/D6023
Manuel Jacob <me@manueljacob.de> [Sat, 23 Feb 2019 21:13:27 +0100] rev 41796
rebase: add missing dashes in help text
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:46 +0100] rev 41795
test: stabilize bundle generation for test-sparse-revlog.t
To reduce the instability in the bundle binary content, we force it to contains
delta against p1 in all cases.
In the previous changeset, we already stabilized the processing of the bundle.
So we don't see any output change in the test itself.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:51 +0100] rev 41794
test: don't trust delta bases from the bundle in test-sparse-revlog.t
The point of the test is to check the strategy sparse-revlog uses to pick delta
base. If we trust the bases used in the bundle, we no longer fully test this
logic.
In order to force this computation we have to use the side effect of a legacy
format configuration `format.generaldelta`. The lack of a more official way to
do so will be fixed in a later changeset.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Feb 2019 19:56:57 +0100] rev 41793
test: update test-sparse-revlog.t output
This test is skipped unless a large artefact is pre-build. It seems like nobody
ran it in a while. Changeset
3764330f76a6 changed the expected output but
nobody noticed.
This changeset focus on the first and simpler step: putting the expected output
back to what one would get by running this test.
However this test changes highlight a couple of deeper issues:
1) Even if the revision content did not changed, a change in the delta
contained in the bundle affected the delta stored in the final revlog, changing
the test result. Since we are testing the delta computation strategy with
sparse, we should not blindly reuse the delta-base from the bundled delta.
2) A change in the format of the repository used to generate the bundle changed
the delta stored in the bundle. We should get a more stable output to avoid
future instabilities of this test.
3) The test is it not run by CI or developer.
We'll try to address all this issues in the coming changesets.
mitchell plamann <mplamann@janestreet.com> [Wed, 20 Feb 2019 15:02:59 -0500] rev 41792
bundle2: don't send "shared" requirement when cloning from a share
Differential Revision: https://phab.mercurial-scm.org/D5985
mitchell plamann <mplamann@janestreet.com> [Wed, 20 Feb 2019 14:57:00 -0500] rev 41791
tests: demonstrate failure when cloning from a share via bundle2
Differential Revision: https://phab.mercurial-scm.org/D5984
Navaneeth Suresh <navaneeths1998@gmail.com> [Fri, 22 Feb 2019 00:54:06 +0530] rev 41790
mq: disable qrecord during histedit (
issue5981)
qrecord during histedit may lead to deadlock-like situations. qpop will throw
an error on called during histedit even after qrecord-ing those changes. This
patch makes qrecord to abort on histedit.
Differential Revision: https://phab.mercurial-scm.org/D5997
Martin von Zweigbergk <martinvonz@google.com> [Wed, 20 Feb 2019 21:57:39 -0800] rev 41789
committablectx: move status-related methods closer together
The modified()/added()/removed()/deleted() clearly belong very close
to status(). I separated them in committablectx by the new
p[12]copies() methods. This brings the close again. Sorry about the
churn.
Differential Revision: https://phab.mercurial-scm.org/D5996
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 23:07:54 -0500] rev 41788
tests: add test for hg-test-mode emacs code
This is just coverage for the compilation-mode support, but that was
enough of a hassle that I wanted to have it covered somehow. Test
methodology is _extremely_ cargo-culted from the test for
compilation-mode in emacs, so I still have no idea what I'm doing.
Differential Revision: https://phab.mercurial-scm.org/D6003
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 23:06:18 -0500] rev 41787
hghave: add check for GNU emacs
Differential Revision: https://phab.mercurial-scm.org/D6002
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 20:12:39 -0500] rev 41786
contrib: also linkify tracebacks in compilation output when using hg-test-mode
Differential Revision: https://phab.mercurial-scm.org/D6001
Augie Fackler <augie@google.com> [Thu, 21 Feb 2019 19:59:00 -0500] rev 41785
contrib: add compilation-mode linking for our test output
These regular expressions will cause compilation-mode buffers in emacs
to link to source when there are check-code errors in the output of a
.t test.
In the true tradition of this file, I also have no idea what I'm doing.
Differential Revision: https://phab.mercurial-scm.org/D6000
Pulkit Goyal <pulkit@yandex-team.ru> [Fri, 22 Feb 2019 03:52:10 +0530] rev 41784
diff: make sure we output stat even when --git is not passed (
issue4037) (BC)
Before this patch, `hg diff --stat` will give an empty output. It will not show
the stat information. I debugged and found that the underlying code does not
return the diff header and due to that, other code paths fails to parse that as
a diff.
I looked into why we don't return diff headers in quiet mode and found the
behavior is from
8f8bb77d560e70bcc95577e4dfa877df18d876ab which does not have
any mention about why it is done. We also show the diff headers in git, so I
think it's fine showing diff header in normal diff in quiet mode.
Differential Revision: https://phab.mercurial-scm.org/D6007
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 23 Feb 2019 04:50:46 +0530] rev 41783
tests: add test to demonstrate
issue4037
`hg diff --stat -q --config diff.git=0` does not output anything whereas it
should print the stat. This is a quiet old bug dating to 2013 and looking at
code I think it exists it since 2005 or when --stat was introduced. The next
patch will fix the bug.
Differential Revision: https://phab.mercurial-scm.org/D6006
Martin von Zweigbergk <martinvonz@google.com> [Fri, 18 Jan 2019 11:07:46 -0800] rev 41782
grep: reuse getrenamedfn() from scmutil
My motivation is to reduce uses of filectx.renamed(). Reusing
scmutil.getrenamedfn() also means that we get some caching of copy
information per file and revision. I don't think that matters for `hg
grep` (I doubt it speeds up significantly, and I doubt it wastes
significant memory), but I'm not sure.
Differential Revision: https://phab.mercurial-scm.org/D6022
Martin von Zweigbergk <martinvonz@google.com> [Thu, 21 Feb 2019 10:54:29 -0800] rev 41781
templatekw: move getrenamedfn() to scmutil (API)
The function is already used by `hg log` (for following renames, not
for templates), so it seems it does not belong in templatekw.
Differential Revision: https://phab.mercurial-scm.org/D6021
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:32:07 -0800] rev 41780
mq: get copy source from context object instead of from filelog
This removes dependence on filelog.renamed().
Differential Revision: https://phab.mercurial-scm.org/D6020
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:30:49 -0800] rev 41779
mq: slightly modernize by using context object
Context objects have existed since mid-2006.
Differential Revision: https://phab.mercurial-scm.org/D6019
Martin von Zweigbergk <martinvonz@google.com> [Sat, 23 Feb 2019 09:15:36 -0800] rev 41778
absorb: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6018
Martin von Zweigbergk <martinvonz@google.com> [Mon, 11 Feb 2019 15:28:04 -0800] rev 41777
fix: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6017
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 22:07:35 -0700] rev 41776
memfilefromctx: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6016
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:32:27 -0800] rev 41775
largefiles: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6015
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:31:24 -0800] rev 41774
commit: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6014
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:31:00 -0800] rev 41773
tests: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6013
Martin von Zweigbergk <martinvonz@google.com> [Mon, 26 Mar 2018 10:41:42 -0700] rev 41772
templatekw: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6012
Martin von Zweigbergk <martinvonz@google.com> [Wed, 27 Dec 2017 22:27:05 -0800] rev 41771
convert: migrate to new method for getting copy source
Differential Revision: https://phab.mercurial-scm.org/D6011
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:30:31 -0700] rev 41770
context: move equivalent renamed() implementations to superclass
Now that renamed() in workingfilectx and in overlayfilectx are written
in terms of copysource(), they are functionally identical and can be
reused.
Differential Revision: https://phab.mercurial-scm.org/D6010
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:28:30 -0700] rev 41769
context: rewrite renamed() in terms of new copysource() where appropriate
It's only the filectx for committed files that have the copy source's
nodeid easily available; workingfilectx's and overlayfilectx's
renamed() simply find the nodeid by looking in the changeset's p1's
manifest.
Differential Revision: https://phab.mercurial-scm.org/D6009
Martin von Zweigbergk <martinvonz@google.com> [Sun, 25 Mar 2018 21:32:16 -0700] rev 41768
context: add specialized way of getting copy source file only
I'm working on support for storing copy metadata in the changeset
instead of the filelog. I don't intend to include the file nodeid
there, but most callers don't need that anyway. This patch introduces
a method similar to ctx.renamed(), but the new method returns only the
source filename, not the nodeid. Subsequent patches will move callers
over to this new method.
Differential Revision: https://phab.mercurial-scm.org/D6008
Martin von Zweigbergk <martinvonz@google.com> [Thu, 21 Feb 2019 21:27:42 -0800] rev 41767
changegroup: move non-pruning of non-ellipsis manifests to _prunemanifests()
Google has an extension that overrides _prunemanifests() and removes
nodes that we fetch using another mechanism. That broke when
_prunemanifests() no longer got called. It works again if we move the
check for "not self._ellipses" inside _prunemanifests().
Differential Revision: https://phab.mercurial-scm.org/D6004