Summary:
Previously it's `:. & follow(FILE)` and there is a Python loop iterating
`:.`. This patch makes it `follow(FILE) & :.`.
In the common case, `_logrevs` returns a large revset in desc order. So it
makes sense to put it at the right side of `&` operator. The only exception is
when `_logrevs` uses user-specified revset (`-r`), whose order needs to be
respected and size is unknown.
Test Plan:
Ran all tests.
Facebook:
This reduces `hg log FILE` from ~3 seconds to ~0.5 seconds.
```
# Before
% time hg log cmd_util.py --pager=off --config extensions.fastlog=! -T'{oneline}\n'
11e9d4 D5997870 mbolin Use --home-dir to compute the config dir, if specified. 2017-10-06
5041e2 D4888633 simpkins [eden] move eden/fs/cli to eden/cli 2017-04-14
7dc2bd D4760528 simpkins [eden] an "eden debug" CLI command and thrift APIs to support it 2017-04-03
hg log cmd_util.py --pager=off --config extensions.fastlog=! -T='{oneline}\n' 2.88s user 0.09s system 99% cpu 2.975 total
# After
% time hg log cmd_util.py --pager=off --config extensions.fastlog=! -T'{oneline}\n'
7dc2bd D4760528 simpkins [eden] an "eden debug" CLI command and thrift APIs to support it 2017-04-03
5041e2 D4888633 simpkins [eden] move eden/fs/cli to eden/cli 2017-04-14
11e9d4 D5997870 mbolin Use --home-dir to compute the config dir, if specified. 2017-10-06
hg log cmd_util.py --pager=off --config extensions.fastlog=! -T='{oneline}\n' 0.42s user 0.03s system 98% cpu 0.456 total
```
Fastlog is disabled since a network request makes the time less stable.
Logging a single file is answered locally by remotefilelog ancestor handling.
Reviewers: durham, #mercurial
Reviewed By: durham
Subscribers: durham
Differential Revision: https://phabricator.intern.facebook.com/D6735007
Signature: 6735007:1516163080:0d7ddae9f24933d795ba7aaa4461916c7fdd2309
Summary:
It's pretty handy. The implementation is simple and clean. So move it from
contrib and enable it by default. "import"s are adjusted to make the module
checker happy.
Security and UX wise, since we have `--debugger` already, adding another
REPL seems fine.
Test Plan: Ran all tests
Reviewers: phillco, #mercurial
Reviewed By: phillco
Differential Revision: https://phabricator.intern.facebook.com/D6741283
Signature: 6741283:1516225662:ddc19a663e7ecef2a1fdaa5041f308dc838a8471
Summary:
`lfs` is the better large file solution. `largefiles` is rarely used, and
its implementation is less clean. So let's remove it.
Test Plan:
Ran all tests. A subrepo test was removed instead of cleaned up since the
longer term plan is to also drop subrepo support.
Reviewers: phillco, #mercurial
Reviewed By: phillco
Differential Revision: https://phabricator.intern.facebook.com/D6740361
Signature: 6740361:1516225594:555e3803571ad05e0434021897a2823ac99347ae
Summary:
Since we moved some files, these failures changed.
Depends on D6719894
Test Plan: - ./run-tests, see passing
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719911
Summary:
This looks most like a dirty hack in this stack, especially the largest file.
Unfortunately, on my some number of runs it looked like the output is not really
consistent: some lines were `verifying ...` and some `cannot verify ...` inconsistently
over the runs.
Hovewer, given that the `hgsubversion` test suite simply did not care about what
tests printed, I think this is acceptable.
Depends on D6719894
Test Plan: - `./run-tests.py`, see tests passing
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719906
Summary:
Here we make imports in `hgsubversion` tests work again.
This consists of two main parts:
1. tests were importing each other as python modules. Now that they have `-` in
their names, it is impossible. However, we can utilize some tricks to work
around this (`imp.load_source`)
2. tests where doing some weird location assumptions, we clean that up
Depends on D6719890
Test Plan: - `./run-tests -l test-hgsubversion-*`, see non-import-exception failures
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719894
Summary:
This migration allows `./run-tests.py` to run `hgsubversion` tests. Since hgsubversion
tests are actually python unittests, we don't care about their output at all,
they fail differently. But the behavior of the test suite require us to match
whatever the tests prints. We do this later in the stack.
Depends on D6719886
Test Plan: - check that tests are runnable at least
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719890
Summary:
This is in line with our general spirit of renaming things into test-extname-smth.
Depends on D6719883
Test Plan: - test fixes and runs follow in the stack
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719886
Summary:
Move tests to where we are used to them.
Note that I don't move comprehensive tests to the `tests` directory, since
I think that having them not run when `./run-tests.py` is run without arguments
may be a useful thing. In general, we may adopt this concept for the core as well.
If we decide we do want to move them, it's very easy to do.
Depends on D6719879
Test Plan: - fixups and test runs follow in the stack
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719883
Summary:
Rename hgsubversion tests to match our tests name patterns.
Depends on D6719877
Test Plan: - just a rename, following diffs do fixups
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719879
Summary:
To incorporate hgsubversion tests into our test suite, we need to turn them into
silentrunner tests, which run python unittests, but do check for the output to match
some expected file. hgsubversion tests were not written with checking output in mind
(and even if they were, .t tests need globbing/regex support as well). So, this
simple support for (re) suffixes on .py.out files allow us to match unstable output.
Test Plan:
- perform some manual experiments
- following diffs in the stack make use of it
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6719877
There's no need to do this and not doing so speeds up IMM tremendously when the sparse profile had to be adjusted.
(This is the grafted version from the fb-hgext repo)
Test Plan:
I ran an IMM before and after this change. Both succeeded but the later version was
much faster.
Differential Revision: https://phab.mercurial-scm.org/D1805
Summary: This is a quick way to ensure that if IMM goes wrong in a way that isn't conflict related (e.g. an uncaught exception) we restart and log to scuba.
Test Plan: ./run-tests.py
Reviewers: durham, quark, #mercurial
Reviewed By: durham, quark
Differential Revision: https://phabricator.intern.facebook.com/D6734117
Signature: 6734117:1516152432:5620b12579d41dca2ea8f15b08a8007e2f6467fc
Summary:
This if statement is testing whether we ever set any data, not whether the data is truthy.
This can cause a bug where rebasing an empty file can cause IMM to fail and restart.
Test Plan: ./run-tests.py
Reviewers: durham, #mercurial
Reviewed By: durham
Differential Revision: https://phabricator.intern.facebook.com/D6687459
Signature: 6687459:1515535581:c2018237f3ca9daed6a0cb2f5a1475d1dc8e4865
Summary:
Before, we would raise whenever the `usemergedriver` condition was set when merging in-memory,
which equated to "any merge with (cd, dc, or m) actions in a repo with a mergedriver script".
This was done to be as conservative as possible.
However, a better solution is to run the preprocess() script and only raise if any files are
marked to actually be driver-resolved. That way we only restart the merge if we absolutely need
to.
Since some of our preprocess() scripts aren't ready yet, I also added
experimental.inmemory.nomergedriver in a previous change so we can deploy this in a build before the preprocess scripts are good to go.
Test Plan: ./run-tests.py
Reviewers: quark, #sourcecontrol
Reviewed By: quark
Subscribers: durham
Differential Revision: https://phabricator.intern.facebook.com/D6668426
Signature: 6668426:1515185050:a640208454caf053f8213b831d0f8e645ebe682c
Summary:
This gives us an easy way to ensure IMM is disabled automatically if the user configures a
mergedriver script.
Test Plan: run-tests.py
Reviewers: durham, #sourcecontrol
Reviewed By: durham
Subscribers: durham
Differential Revision: https://phabricator.intern.facebook.com/D6668421
Signature: 6668421:1515185587:a190311f1d57a9a604cb609a63ebc296dad11db3
If the user specifies a ui.origbackuppath, we used to always copy the file
there, but if the source file is in memory we must write it instead of copying.
Differential Revision: https://phab.mercurial-scm.org/D1806
Summary: Log whichever paths were driver-resolved but not in experimental.inmemorydisallowedpaths, so we can update experimental.inmemorydisallowedpaths and keep the experience of rebasing with IMM and
mergedriver a pleasant one.
Test Plan: .
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6656159
Summary: Fixing a bug that causes a fatal crash when a user attempts to delete a bookmark by inputting it's name twice, for example:
# hg bookmark --delete name name
Test Plan: The following test has been added in the test/test-bookmarks.t file
https://pxl.cl/bmTf
to test the new functionality:
~~~
kosullivan-mbp:hg-crew kosullivan$ hg diff tests/test-bookmarks.t
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -288,6 +288,10 @@
abort: bookmark 'A' does not exist
[255]
+ensure bookmark names are deduplicated before deleting
+ $ hg book delete-me
+ $ hg book -d delete-me delete-me
+
bookmark name with spaces should be stripped
$ hg bookmark ' x y '
~~~
Reviewers: rmcelroy,rafeca
Subscribers: suiting
Tags: python,bootcamp,source_control
Tasks: 22525999
Differential Revision: https://phabricator.intern.facebook.com/D6711774
Summary:
Our new build process is slow because of all the rust and everything. I've seen
test-hghave.t time out a couple of times already.
Test Plan:
- `./run-tests.py -l test-hghave.t` - pass
- `./run-tests.py test-hghave.t` - pass
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6726709
Summary:
The initial value of lastdestnode should be the commit onto which the rebase is
happening.
It should be updated whenever a new commit is added for which the p1 parent is
the old last dest node.
Test Plan: Run the new test, and show it now works.
Reviewers: durham, rmcelroy, #mercurial
Reviewed By: rmcelroy
Subscribers: mitrandir
Differential Revision: https://phabricator.intern.facebook.com/D6709108
Signature: 6709108:1515760332:32bef9892792c7c94117b8fe14364937d98ebbac
Summary:
If pushrebase is asked to rebase a commit where the p2-parent is the route to
the commit onto which the rebase is being made, then it is supposed to flip the
parents. This is what ensures that the changes from the server-only commits
are not lost.
This doesn't work. In this test, the "other" file, created on the server, is
lost in the final merged commit.
Test Plan: Added a test which demonstrates a failure.
Reviewers: quark, #mercurial
Reviewed By: quark
Subscribers: quark
Differential Revision: https://phabricator.intern.facebook.com/D6709096
Signature: 6709096:1515794007:0908765c24b18a7dcaf3672953e816095b0acf68
Summary:
This was leading to 'mercurial.error.ForeignImportError' while running
some tests like 'test-fb-hgext-phabstatus.t' during hgbuild. Thanks @quark for
the fix!
Test Plan:
```python setup.py install --user && cd ~/.local && find -type d -name 'phabricator'```
contains `hgext/extlib/phabricator`
Reviewers: quark, #mercurial, #sourcecontrol
Reviewed By: quark
Subscribers: quark, awestern
Differential Revision: https://phabricator.intern.facebook.com/D6716979
Signature: 6716979:1515801243:77b9681c15617c88a2b2b9e1f1e15ca19c3b0346
Summary:
Demonstrate the full power of this batte station with the first extension to be default-enabled, `githelp.py`. This also lets us write a test for `DEFAULT_EXTENSIONS`
(`test-extensions-default.t`)
All other test changes are actual fallout from enabling the githelp extension.
Test Plan: Added a test.
Differential Revision: https://phabricator.intern.facebook.com/D6717098
Summary:
Based on in-person discussion in the warroom, we think this is the right path forward to "upstream" certain extensions without actually folding them into the mercurial/ codebase.
Enabling extensions by default achieves most of our goals (testing _everything_ in tests, reducing configuration permutations) without having to pay an up-front cost of fixing all the code today or accepting subpar code in mercurial/.
Test Plan: ./run-tests.py.
Reviewers: quark, #mercurial
Reviewed By: quark
Subscribers: quark
Differential Revision: https://phabricator.intern.facebook.com/D6716674
Signature: 6716674:1515803845:a209ec288341e4de8e79fd3759250e834a3573e3
Summary: Based on feedback to D6687860.
Test Plan: n/a
Reviewers: durham, #mercurial
Reviewed By: durham
Differential Revision: https://phabricator.intern.facebook.com/D6714211
Signature: 6714211:1515788399:386b8f7330f343349234d1f317e5ac0a594142cf
Summary: The text was wrong.
Test Plan: Make sure the new text match the function signature.
Reviewers: mitrandir, #mercurial
Reviewed By: mitrandir
Differential Revision: https://phabricator.intern.facebook.com/D6710509
Signature: 6710509:1515758961:65184b83ddda417c9125c675986093ef52660fbb
Summary:
These import statements are actually broken -- I don't know how they were working before. (Perhaps because `demandimport` tries a few different paths.)
But this makes them work without demandimport.
Test Plan: HGDEMANDIMPORT=disable ./hg st
Reviewers: quark, singhsrb, #mercurial
Reviewed By: singhsrb
Subscribers: quark
Differential Revision: https://phabricator.intern.facebook.com/D6713858
Signature: 6713858:1515787418:23a78b8a439e7d114ead81dc9a136478f98f7e50
Summary: Seems like an oversight
Test Plan: hg status
Reviewers: singhsrb, #mercurial
Reviewed By: singhsrb
Differential Revision: https://phabricator.intern.facebook.com/D6713825
Signature: 6713825:1515786595:2cd62e8f86bac3ab7d5dbf6e7bd59bca05ddc634
Summary:
The vendored crates currently untar to build/build. Now that the build script
chdirs to build/, there's no need to pass that to tarfile.extractall.
Test Plan: `make clean ; make local`
Reviewers: quark, #mercurial
Reviewed By: quark
Differential Revision: https://phabricator.intern.facebook.com/D6713510
Signature: 6713510:1515785178:042124a6592aa04ab1e6748596f6615cd61e8df3
Summary: When running hg ssl, if the .arcrc file is not proper JSON
(e.g., has a trailing comma), json.loads raises an exception that
was not being caught and lead to a stacktrace.
Test Plan: Locally run hg ssl with a bag .arcrc and the stack trace was gone.
Also write a test in test-fb-hgext-phabstatus.t
Reviewers: simonfar
Subscribers: luizmramos
Tasks: T24993088
Tags:
Summary: Switch from dewey to in-repo LFS utility.
Test Plan:
Run `make local` on my Arch Linux. Check `hg-vendored-crates.tar.gz` was
downloaded and stored in `build/`. Run `make local` again and make sure it
says:
hg-vendored-crates.tar.gz was already downloaded and up-to-date
Reviewers: mbthomas, #mercurial
Reviewed By: mbthomas
Differential Revision: https://phabricator.intern.facebook.com/D6706906
Signature: 6706906:1515723430:233ccbb47286dbc4e5d856ff4b20c848b281928c
Summary:
This allows the lfs module to be enabled via path like `lfs=.../hgext/lfs`.
It's used by the next patch.
In the future, we will likely just delete largefiles extension so the duplication
is temporary.
Test Plan: Ran all tests.
Reviewers: mbthomas, #mercurial
Reviewed By: mbthomas
Differential Revision: https://phabricator.intern.facebook.com/D6700815
Signature: 6700815:1515722229:a3a331ca8a73491070ffe6c6af1f9919e2cdbaab
Summary:
The 'svnadmin' version on the system can be different from the one
expected the tests which leads to issues. Using the same logic as in commit
'39750dc6a11476d1a967311bef21f205f306f67d'.
Test Plan: cd tests/hgsubversion && ./run.py test_svnwrap.py
Reviewers: durham, #mercurial, #sourcecontrol
Reviewed By: durham
Differential Revision: https://phabricator.intern.facebook.com/D6708715
Signature: 6708715:1515718219:178b69a72193057214586d1618c6dc8846bf2f52
Summary:
In three places hgsubversion was assigning a mutable object as a default parameter, a risky construct that was causing test-check-pylint.t to
fail. The pylint test is useful, so let's just fix these call sites.
Test Plan:
Run `test-check-pylint.t` before and after, see the following block disappear:
```
+ ************* Module hgext.hgsubversion.util
+ W:225, 0: Dangerous default value [] as argument (dangerous-default-value)
+ ************* Module hgext.hgsubversion.wrappers
+ W:405, 0: Dangerous default value [] as argument (dangerous-default-value)
+ ************* Module hgext.hgsubversion.svnrepo
+ W:115,12: Dangerous default value [] as argument (dangerous-default-value)
+ [4]
```
Reviewers: durham, quark, #sourcecontrol
Reviewed By: durham, quark
Differential Revision: https://phabricator.intern.facebook.com/D6701282
Signature: 6701282:1515649087:4edc2442bc3efea5d402d7a5ab6c552c7e43e61d
Summary: Some files had missing imports; fix them.
Test Plan: Test suite now has fewer failures.
Reviewers: singhsrb, #sourcecontrol
Reviewed By: singhsrb
Subscribers: singhsrb
Differential Revision: https://phabricator.intern.facebook.com/D6701257
Signature: 6701257:1515648742:cf402234bbe67b08138f942ead8240a596298b7e
Summary:
Moving stuff into fb/packaging broke a few tests since they're
trying to apply the Mercurial linters on scripts that don't conform.
Let's exclude these directorites for now.
Test Plan: This fixes a test.
Reviewers: #sourcecontrol
Differential Revision: https://phabricator.intern.facebook.com/D6701215
Summary: D6700784 encoded the the incorrect path. This commit addresses that.
Test Plan: Ran all the tests
Reviewers: singhsrb, #mercurial, #sourcecontrol
Reviewed By: singhsrb
Differential Revision: https://phabricator.intern.facebook.com/D6700869
Signature: 6700869:1515643366:9de76782a770b7ddc42b09bd06d07038f25c20b7
Summary:
D6700605 exposed new code to tests which resulted in some issues. This
commit addresses those test failures.
Test Plan: Ran all the tests.
Reviewers: phillco, #mercurial, #sourcecontrol
Reviewed By: phillco
Differential Revision: https://phabricator.intern.facebook.com/D6700784
Signature: 6700784:1515640770:034c3ccd602abc0b546d3936a31418803c17247b
Summary:
We'd like to have a lightweight, portable tool to upload and download certain
binaries without checking them in.
This diff makes LFS do that. It's intended to be used for Rust vendored assets,
Cython and other dependencies' tarballs, and a prebuilt Python using MSVC on
Windows.
Comparing with dewey, this would unblock our Windows build.
Test Plan: Added a test.
Reviewers: durham, #mercurial
Reviewed By: durham
Subscribers: durham
Differential Revision: https://phabricator.intern.facebook.com/D6699099
Signature: 6699099:1515633647:2fb90c8ecb4395b0b12e8e8baf1c5ee7fa4d84b0
Summary:
A remote blobstore should have nothing to do with a local repo. It only
cares about certain configs. Let's make it so.
This makes the next change cleaner.
Test Plan: Ran all tests.
Reviewers: phillco, #mercurial
Reviewed By: phillco
Differential Revision: https://phabricator.intern.facebook.com/D6698999
Signature: 6698999:1515630172:e759b5dabfe21f141e58e29c8b7cece576105be7
