Summary:
The config to write local packs has an issue with reading data from
currently pending mutable packs. Let's add a test demonstrating this, and in the
next diff we'll fix it.
Reviewed By: quark-zju
Differential Revision: D12959501
fbshipit-source-id: 5bcb278ccb977cea83e8cd594a404816d4f8f1fa
Summary: Jellyfish uses `hg debugcrdump` to get commit data, including binary files. Now we want in jf to be able avoid dumping binary files, so I added `--nobinary` option to crdump
Reviewed By: quark-zju
Differential Revision: D12981968
fbshipit-source-id: 669ef4cf8f6225b911f5085c1a47fb7242f259bf
Summary:
`@@ -1,1 +-1,0 @@` is not a valid patch hunk header.
Change it to `@@ -1,1 +0,0 @@`.
This is a backport of my upstream patch https://phab.mercurial-scm.org/D3737
Reviewed By: singhsrb
Differential Revision: D12970975
fbshipit-source-id: eb769e93076efc932a8c4be7387ba21933aae331
Summary: Updated the global help summaries that are displayed for each command when you run 'hg help' and fixed corresponding tests
Reviewed By: markbt, kulshrax
Differential Revision: D12832280
fbshipit-source-id: 950dad1c805feab573d7d0182da523ae12299d3b
Summary:
Our `rename` is not atomic:
```
def rename(src, dst):
"""Rename file src to dst, replacing dst if it exists"""
try:
os.rename(src, dst)
except OSError as e:
if e.errno != errno.EEXIST:
raise
unlink(dst)
# What if the process is interrupted here?
os.rename(src, dst)
```
However, the `MoveFileEx` Windows API provides a way to to
replace the existing file, thus eliminating the need to do `unlink`.
Unfortunately, it only works for files, not for dirs, therefore
we're introducing a new file-specific rename function.
Differential Revision: D12940555
fbshipit-source-id: a6749a9b16a285788de0f5c06d51a15c919166ce
Summary:
If the commits being pushrebased don't actually need to be rebased, pushrebase
will accept them like a normal push. In this case we shouldn't prevent them
from be changed to public commits on the client.
Track this by detecting whether we receive a changegroup part from the server.
If we do, only the commits that are marked as replaced with obsmarkers (if
enabled) can be marked as public.
Reviewed By: quark-zju
Differential Revision: D12944851
fbshipit-source-id: 44f8fc17b36397d949cba5d3e787fad813bab4ea
Summary:
When pushrebase is enabled, pushing a commit that doesn't result in any
rebasing action acts like a normal push (the commit is not modifed and a new
hash is not returned), however the phase update doesn't apply, so the commit
remains draft.
Reviewed By: quark-zju
Differential Revision: D12944850
fbshipit-source-id: 2145d9b7eebc27bfdff34544e73802c13f30dbd2
Summary:
D12888964 added the capability for `svnrev` revsets to be
interoperable with the `globalrev` revsets. This commit adds the tests for it.
Reviewed By: quark-zju
Differential Revision: D12888960
fbshipit-source-id: 07b12632d534a329c32179e978b058b1e427e688
Summary:
The capturing UI is not required as we can use the much cleaner
`ui.pushbuffer`/`ui.popbuffer` for the intended purpose.
Reviewed By: quark-zju
Differential Revision: D12906912
fbshipit-source-id: ae93e6417135ca23b28a11af63745464344fa3cf
Summary:
This method always prints the graph for the commits in the repository.
This commit adds supports for specifying any revset as input for the log and
also, makes printing the graph optional.
Reviewed By: quark-zju
Differential Revision: D12888965
fbshipit-source-id: 794606fa17f9836fd73675d36d11220b11994f41
Summary: The `svnrev` is more useful than the `rev` in this context.
Reviewed By: quark-zju
Differential Revision: D12888963
fbshipit-source-id: a902c57ecc3bc3eca9da77ab6e14ef58512d5ad8
Summary:
This is required for testing `globalrevs` integration with
`hgsubversion`. In particular, we will test out whether we can resolve
`r<svnrev>/r<globalrev>` correctly later. Seems like this configuration should
be on during all the tests because it is the configuration we use in
production. Therefore, this commit in resolves revset string with prefix `r`
for all the `hgsubversion` tests.
Reviewed By: quark-zju
Differential Revision: D12888961
fbshipit-source-id: af9b2e1aea9771f42fe1fb2d3f9a759a926b1ce3
Summary:
We need a configuration option for specifying the starting revision
beyond which we will consider the global revisions associated with the commit
valid for the following reasons:
- It lets us have the flexibility to support `globalrevs` from a commit of our
choice.
- We need this configuration to decide when we should fallback to looking at
the `svnrev` instead of the `globalrev`.
Reviewed By: quark-zju
Differential Revision: D12888966
fbshipit-source-id: 46d6314886ed5074edb537ba340d5606ec354619
Summary:
It turns out data packs contain the exact mercurial file blob,
including the rename metadata header. This is different from how loose files work, which
contain the non-headered text and instead store the rename in the history at the
end of the file.
Ideally we'd change datapacks to not store the metadata version of the file, but
unfortunately this is how it has always been, so instead we must change the
commit-straight-to-pack code to write the headered blob.
Differential Revision: D12936247
fbshipit-source-id: 3f909d2964d7f7200ac0e31e47bd195b0c9b03e5
Summary: Not all of the repos are remotefilellog, so I moved some invocagions of the content store to shallowrepo and added requirements check where the transaction is processsed in localrepo
Reviewed By: quark-zju
Differential Revision: D12881916
fbshipit-source-id: 1119debd1e3d42cdf9513a6cae4bad4c000cc046
Summary:
Based on discussions about the best approach for solving the amend message
problem, back out the template previously added. We will use a different
approach.
Reviewed By: mitrandir77, liubov-dmitrieva
Differential Revision: D12921753
fbshipit-source-id: ca760ffe14bfe473b7526a1b84a8cfc6b0257bf2
Summary:
It turns out tracking ignored files does have an impact on status performance.
Filtering out the ignored directories is not that fast, and ignored files can
be scattered everywhere (like ".pyc", ".iml" files) that makes them harder to
be filtered out efficiently.
Add code paths to migrate between "ignored tracked" and "ignore untracked".
Store the metadata in treestate.
Reviewed By: phillco
Differential Revision: D12916021
fbshipit-source-id: e02d0c6f3b1a036f70703c11f35381c594e2f8e5
Summary: This is to replace `debugstate -v`. The latter does ont list untracked files.
Reviewed By: DurhamG
Differential Revision: D12906649
fbshipit-source-id: b84f41dfadff4932c0ddd48480a4aa03db88cab0
Summary: We'd like to identify which of the three underlying conditions cases this exception.
Reviewed By: quark-zju
Differential Revision: D12870572
fbshipit-source-id: 45724ad6bb3582c04a6ea3c0b7a748bf72219b93
Summary:
This test is broken after D12849852 because the grep outputs the files
in different order during multiple test runs. Let's fix it by sorting the
output from the command.
Reviewed By: phillco
Differential Revision: D12869810
fbshipit-source-id: 49073e83e926e94db5f0bd290d74845ebfde0bb6
Summary: This is nicer for the user and makes the test not be flakey.
Reviewed By: quark-zju
Differential Revision: D12860852
fbshipit-source-id: 6ccb0ca679dc25a80730e83a26a39dd3becb5c8f
Summary: This fixes the "hg prev" targetting the first commit in the repo. The problem was the rev `0` which casted to false in all the checks.
Reviewed By: phillco
Differential Revision: D12840237
fbshipit-source-id: 594a2725fa125ee713f347379c875ec54b80a53d
Summary:
This brings the config closer to what we use and uncovers some problems with
disallowemptyupdate itself.
Reviewed By: phillco
Differential Revision: D12840239
fbshipit-source-id: 77740b79114c7d901b0181e0e425aea4e9c7c570
Summary:
a couple of problems:
* The recent move from tweakdefaults also broke `bin` symbol, rendering
this feature completely broken for non svn backed repos
* The `bgr` tool knows about fewer corpuses than we do, so go directly
to the underlying C++ client binary
* Add configuration options for that binary
Reviewed By: phillco, farnz
Differential Revision: D12849852
fbshipit-source-id: 154d4822d097602505349d3f67b45f19c17a7bf8
Summary:
The recent changes to the progress engine to work around locking bugs removed
the `clear` step of `progress.suspend`. This leads to garbled output when
a progress bar is ongoing. Restore it by adding a new lock method to the
engine.
Also add a `--with-output` option to `hg debugprogress` to test this.
Reviewed By: mitrandir77
Differential Revision: D12838415
fbshipit-source-id: 83ed516b528d0b0bbe37945141d50b50da00ac8e
Summary:
We need a way for mergedrivers to be able to read ancestor data (to properly detect a backwards merge, such as during `hg backout`).
Passing it directly is tricky since passing a new kwarg to functions without `**args` raises a `TypeError`. We'd have to update the hook framework to catch this `TypeError` and re-run the hook without the kwarg, which would be hard to do cleanly.
Rather, we can just add this as a transient property on `mergestate`, which seems like an appropriate place for it. Any callers trying to read this when it hasn't been set will get an exception. But there aren't any other users of this field since it hasn't existed before.
Reviewed By: quark-zju
Differential Revision: D12827614
fbshipit-source-id: 48dc84f1e60232625c8f2a73e81b5bc223c22bb3
Summary:
The "fsmonitor returned" file list was made short by D9997658. Do the same
thing for notefiles.
Reviewed By: phillco
Differential Revision: D10865333
fbshipit-source-id: ff31cde04210363e6af04e5578543f1b16310b11
Summary:
If a "normal" file is clean, drop the "NEED_CHECK" bit.
Not very sure how NEED_CHECK can be set for the entire working copy while
`_poststatusfixup` does get executed. But it happened. Fix it by explicitly
removing NEED_CHECK from clean files.
Reviewed By: markbt
Differential Revision: D10865256
fbshipit-source-id: aafd3195a8acf39178bbc2d5f919345a7320f2b7
Summary:
If the NEED_CHECK bit was set accidentally (reason yet to know), there is no
way to recover automatically by running "hg status" without touching the files.
Add a test to show that.
Reviewed By: markbt
Differential Revision: D10865255
fbshipit-source-id: 60b6914a9cd778e60815f83ba98c29c9c5f88b34
Summary:
This test still fails on OSX because the messages with prefix
`remote:` are missing. It doesn't seem like we need those messages for the
actual testing. Therefore, adding the `-q` option to the affected commands to
remove the `remote:` messages for all the platforms.
Reviewed By: quark-zju
Differential Revision: D12829679
fbshipit-source-id: e53dca96b5511049ef240ed671705987cdd9eab1
Summary:
When syncing a commit cloud repo, if the user has put a bookmark on a public
commit that we don't have locally, also pull that public commit into the repo
so that we can put the bookmark on it.
Reviewed By: quark-zju
Differential Revision: D12815471
fbshipit-source-id: 080038e4e239170cad994ff4ab9326d787d1c0fa
Summary:
If you put a bookmarks on a public commit that one of your other synced
repos doesn't have, it will delete the bookmark when it syncs. This deletion
is then propagated to all your other synced repos. This appears to the user
like the bookmark just vanishing.
Reviewed By: quark-zju
Differential Revision: D12815470
fbshipit-source-id: 802f85433b9ad15db3fb9e82e1222224eff4ca88
Summary:
Introduce a new template config option `amend.messagetemplate`, which, when
set, is applied to the commit message when amend is run with the `-m` option.
The template is provided with the old message, as `oldmessage` as well as the
message provided on the amend command line, as `message`. This can be
configured so that the amend message only overrides part of the old message.
Reviewed By: quark-zju
Differential Revision: D10857454
fbshipit-source-id: 6eb6f33624fae32fc7a344769e39f5c7a78a3604
Summary:
The `truncate` tool isn't availble on OSX, so include our own in the test
suite.
Reviewed By: DurhamG
Differential Revision: D12815613
fbshipit-source-id: 510b2936f07c5193671baaeaec6620872c3ec982
Summary:
Add label annotations to the blame template indicating how old the line is
(bucketed into various ranges). Define colors for these labels so that recent
lines are white, and older lines fade through yellow to black.
Reviewed By: phillco
Differential Revision: D10869068
fbshipit-source-id: 2b99c84c115c3f9e408468f52b5754ff820fcec5
Summary:
Make the space for Phabricator diff numbers larger, and right-justify the
output. This makes it look better.
Reviewed By: phillco
Differential Revision: D10868646
fbshipit-source-id: 7cf50677560a15ef77cc3681063e902d8d9e7a18
Summary:
This makes tests closer to production setup and removes a bunch of "saved
backup bundle to ..." messages.
With D9236657, this should not hurt server-side performance.
Unfortunately a lot tests cannot be migrated easily, mostly because revision
numbers are used. They are left with a TODO.
Reviewed By: DurhamG
Differential Revision: D9237694
fbshipit-source-id: c993fce18f07aba09f6d70964e248af8d501575a
Summary:
The test infra does not handle "skip" state gracefully and treats skips as
"failure". That generated scary reports like hundreds of tests are failing.
Stop reporting skips to fix it.
An enivronment variable is added to get the old behavior.
Reviewed By: singhsrb
Differential Revision: D12808196
fbshipit-source-id: 2356a1d6fdfe1d2991d28368787c7d2b7b525b6b
Summary:
With the obsmarker copying feature, rebasing revs containing obsolete
relationship would result in the markers being copied correctly.
Reviewed By: phillco
Differential Revision: D7121486
fbshipit-source-id: a666ad65c2eccbfd26db813d4f792c66489ead8c
Summary:
If a corrupt pack file is encountered while marking the ledger for repack,
handle the failure.
Don't immediately delete the pack files. Keep them around as we may be able
to repack some of the non-corrupt contents (particularly when the file has
been truncated).
Once repack has completed, revisit the corrupt packs that we found. For shared
packs, delete them. For local packs, rename them. They are the only source of
the data, and we may be able to recover more data manually.
Reviewed By: DurhamG
Differential Revision: D10527544
fbshipit-source-id: f228fb4de3ff016a1c9035823bfa1d6b7767cdcb
Summary:
The incremental repack implementation omits repacking local data - it was
recently added for full repack, but not incremental repack. Add it to
incremental repack.
We also don't run `_deletebigpacks` for non-shared data, as that data is
only stored locally.
Reviewed By: DurhamG
Differential Revision: D10525957
fbshipit-source-id: 012d7e8d455ac607773fc7013dcc4df0881665e8
Summary:
Loose files don't contain the original filename inside them, but rather the
directory name is based on the sha1 hash of the filename. This means that
given a remotefilelog data file, we can't find out the name of the file that
it contains.
Repack needs to know this (plus it's also useful for debug purposes), so add
an additional file in the directory, `filename`, which contains the original
filename of all the data files in the directory.
It follows that `sha1(read(filename)) == basename(dirname(filename))`
Reviewed By: DurhamG
Differential Revision: D10516851
fbshipit-source-id: aeeb1a116e0d50a134c274c3bb31c7c26aa8015c
Summary: D10435279 somehow landed with a green test run, but I suspect it broke this.
Reviewed By: DurhamG, quark-zju
Differential Revision: D10863085
fbshipit-source-id: 3f4e95c7838c39f5801430356b72901d70086173
Summary:
tweakdefaults renamed core hg's `grep` to `histgrep`, and added a `hg grep` that behaves more like `git grep`, searching the working copy. This diff folds those changes into core.
The config changes from
```
[tweakdefaults]
allowfullrepohistgrep = False
```
to
```
[histgrep]
allowfullrepogrep = False
```
Reviewed By: quark-zju
Differential Revision: D10435279
fbshipit-source-id: ad3d1da5824511a612111715e46119d70066050f
Summary:
One thing that makes dealing with merge conflicts difficult at Facebook is that it can be tough to know *why* you have merge conflicts.
Because rebase processes one commit at a time, it's clear which of *your* commits is the problem, but finding the "other" commit is surprisingly hard. Often we rebase onto `master`, and in a monorepo, `master` is often a random commit that has no relationship to your code at all.
This diff attempts to improve the situation a bit by listing all of the commits between the common ancestor and the destination commit that modified the file. The user can then identify which are likely culprits:
```
warning: 2 conflicts while merging b! (edit, then use 'hg resolve --mark')
3 commits might've introduced this conflict:
- [0942ca9aff3d] random commit 1
- [3ebd0a462491] foo bar biz
- [3e5843b4b236] blah blah blah
```
When the destination is public, this approach requires one loose file download (~0.5s?) per conflicted file (this pulls in the full filectx history DAG, so further downloads aren't needed), which is likely acceptable as it only runs on conflicts, and provides value to the user. But it's also configurable for users performing massive codemods.
I'll add metrics to gather the average number if matched commits and the time taken to generate.
This doesn't put this information into the conflict markers, so a lot of people (Nuclide users or the default `editmerge` users) won't see it. We need to think creatively about how to expose it to them.
The ideal solution would tell you which commits edited the actual conflicted section(s), not just those that touched the file.
This requires fast remotefilelog downloads (cc @[100000771202578:Arun] :)). Once we have those, we can construct a local `linelog` of the commits involved, and used this to identify precisely which commits edited the conflicted sections of the file.
Reviewed By: quark-zju
Differential Revision: D9816270
fbshipit-source-id: 04e08dea7a9429eaeab0d40310cd34355104bb74
Summary:
Normally pushbackup should not take the repo lock. To debug when this does
occur in the background, add a debugstacktrace for lock aquisition when
infinitepushbackup.bgdebuglocks is set.
Reviewed By: quark-zju
Differential Revision: D10508808
fbshipit-source-id: 3cb2c155bac88751122111d91bdc1f51b381f7ff
Summary:
The [bug 29988](https://bugs.python.org/issue29988) is, when Ctrl+C (or other
signal) interrupts a program between certain Python bytecode instructions,
`__exit__` might be skipped incorrectly.
A single signal can only skip a single `__exit__`. Therefore it can be
worked around by using a list of `with`s, like:
with c, c, c, c, c:
....
Make `c.__enter__` and `__exit__` do the real `__enter__` and `__exit__` at
most once. To use the bug to skip all 5 `__exit__`s, 5 signals need to be
delivered at 5 tiny windows, which is unlikely to happen practically. Besides,
we can increase the count of `c`s to become more confident.
Note this has to be implemented natively since pure Python code cannot
have a reliable way to record whether `__exit__` was called or not:
self._obj.__exit__(...)
# Insert SIGINT here
self._exit_called = True
The inner object has to be native too to make `__exit__` atomic. Currently,
it's restricted to only the `Condition` object.
Reviewed By: markbt
Differential Revision: D10850510
fbshipit-source-id: 5c523a7bce568509641f8870d7ea381c0a99975c
Summary:
The Rust implemenation has a smaller chance to have deadlock issues when
interruptted.
Reviewed By: markbt
Differential Revision: D10843400
fbshipit-source-id: af5614b9992577bde74cf54c5760d15d050aafbf
Summary:
Python 2's `threading.Condition` and `threading.RLock` implementation are in
pure Python. Part of `RLock.acquire` looks like (simplified):
def acquire(self, blocking=1):
me = _get_ident()
if self.__owner == me:
self.__count = self.__count + 1
return 1
rc = self.__block.acquire(blocking)
########## Here #########
if rc:
self.__owner = me
self.__count = 1
return rc
If an interruption (ex. SIGTERM) happens at "HERE". The lock would be in an
inconsistent state. And if some `finally` block, or `__exit__` in a context
manager tries to release the lock, it could deadlock.
Similar problems also apply to `release`, `_acquire_restore`, and
`_release_save`. Basically, `self.__owner`, `self.__count` and `self.__block`
(i.e. the real lock) cannot be guaranteed in a consistent state in pure Python
world, because interruption can happen before any Python bytecode instruction
(but not inside a single Python bytecode instruction).
Therefore the interruption-safe implementation cannot be done in pure Python.
Use Rust to rescue.
The added test `streetest-condint.py` has a high chance to reproduce the
deadlock issue with Python 2.
Python 3 has a native RLock implementation, which makes things better. The
"Condition" implementation is not native and I haven't checked whether it
is sound or not.
Unfortunately, as part of testing, I hit https://bugs.python.org/issue29988 and
confirmed from the Rust world. That is, `__exit__` is not guarnateed called (!!)
That means native implementations still have a chance to be wrong, and there is
no easy way to fix it. `streetest-condint.py` was then updated to expose the
issue more easily.
The implementation is better than Python 2 stdlib, though.
Reviewed By: markbt
Differential Revision: D10517920
fbshipit-source-id: 394c9050c512ce2a0f9743c28ccfafe0f560141a
Summary:
Adds the `grep.biggrepcorpus` option that links the repo to the appropriate
biggrep corpus to each of the repo specific configs that we maintain.
This allows us to know when a repo can be used with biggrep.
Use this option to automatically enable the use of biggrep when in an eden repo.
Reviewed By: quark-zju
Differential Revision: D10434568
fbshipit-source-id: a2c77d8c58b611f818d08725a6298dec1263bb8a
Summary: I don't see the point of this message, since resetting an unmarked head is perfectly fine. Nuke.
Reviewed By: markbt
Differential Revision: D10510231
fbshipit-source-id: ad0c389ddd5bc40f9d6648c7c52968c4abd91d38
Summary:
This changes the git-mapfile to be append only. It then makes gitlookup
find hashes by scanning from the end of the mapfile backwards. Since most
lookups are for recent commits, this should greatly speed up hg->git hash
lookups and remove the need to sort the mapfile before writing.
Reviewed By: singhsrb
Differential Revision: D10521208
fbshipit-source-id: 7073d3f4796674416ae05e0ac9f36035ca0835db
Summary: I think D10446929 might've broken this by changing the pull string such that there was no German translation for it.
Reviewed By: quark-zju
Differential Revision: D10520682
fbshipit-source-id: a39b5911295ee0d1f5eee3b307930cffa87c3562
Summary: Updated help text for hg pull and hg rebase
Reviewed By: markbt
Differential Revision: D10446929
fbshipit-source-id: a81e186398cda02f58df95e6f2613b3f7457d9ed
Summary: Its functionality was folded into core a while ago, so we can just call `log -G`.
Reviewed By: quark-zju, singhsrb
Differential Revision: D10509538
fbshipit-source-id: 5c16ff708072e9bebabaf3b8e1474091dfb35216
Summary:
When you get an error, let's print the number of conflicts in each file. This will give the user some sense of how much work they have to do.
The code change is entirely in `filemerge.py`, and `tests/test-merge-conflict-count.t` adds a new test.
Reviewed By: quark-zju
Differential Revision: D9815243
fbshipit-source-id: 1b73a1db293902ac7242997a7d6ae09478344068
Summary:
Remove extensions that are not used in prodution. These extensions are also
unlikely to be used in the future.
Reviewed By: ikostia
Differential Revision: D10473370
fbshipit-source-id: a936e30acd3ec4370434c583447942c6ee8d9b13
Summary:
Since we can now skip a large ignored directory efficiently, just track the
ignored files in treestate. This fixes the "unignore" correctness issue that
has been there for years.
It also makes it easier to implement a faster version of "status -i" or "purge
--all". But that needs some extra changes.
It looks fine for fbsource sparse profiles. But we don't control all the
possible sparse configs out there. It's possible for certain users to have
sparse configs that cannot be optimized efficiently and their hg performance
will degrade. To reduce risk, a config option is added so we can slowroll the
feature and collect feedback.
Reviewed By: DurhamG
Differential Revision: D10352851
fbshipit-source-id: fbcb8445d87a50826852b832bbb0559ab199192f
Summary:
Previously, git-getmeta would have to scan through the entire git map
file, which was extremely expensive. Let's shift this cost to write time by
sorting the map file before writing, then using bisect to lookup nodes.
A while ago we switch hggit to only serialize the mapfile every 100 commits or
so, so the additional time here shouldn't be excessive.
Reviewed By: quark-zju
Differential Revision: D10470293
fbshipit-source-id: 47e23d251adde5456e7b593bfcc5976259a497f2
Summary:
Replace `sparse delete` (which deletes an include or exclude rule) with commands
that better describe what they do.
Also update `include` and `exclude` to additionally remove the rule from the
opposite set. It makes no sense for a file to be both included and excluded.
Reviewed By: phillco
Differential Revision: D10446704
fbshipit-source-id: 8966f7d0e54b1aae737fa0bae9cf35ed7ce88696
Summary:
Add a new sparse show command, which shows the current sparse configuration.
Use common templating, including colors, between sparse show and sparse list.
Reviewed By: phillco
Differential Revision: D10446705
fbshipit-source-id: acb539f80f625945716758c785703b46a81aa6f1
Summary:
Allow commands that have subcommands to categorize the subcommands. These
categories appear in the help for the top-level command.
Reviewed By: phillco
Differential Revision: D10446708
fbshipit-source-id: a7f2a9bc79c2a2c4df90517a5e6c9a4b78b31a72
Summary:
All ssh stderr are prefixed by "remote:", which could be confusing because the
message can also be some errors from the local ssh program. Treat "ssh:" as a
special case and do not prefix it with "remote:".
Reviewed By: markbt
Differential Revision: D10437082
fbshipit-source-id: 37935bd7276969ef17fa5028b02d01e3c9d0bf30
Summary:
On OSX the path to the hgrc can be so long it word wraps. Let's update
the test to accomodate the extra line.
Reviewed By: quark-zju
Differential Revision: D10453508
fbshipit-source-id: 5ba9db86f8475ab31ddb4b0e32da4feeeb8b5ce8
Summary: Signifying the change of perftweaks from an extension to a config grouping.
Reviewed By: quark-zju
Differential Revision: D10416857
fbshipit-source-id: b233a353c7da1d211ad0a7e53b942244863a83b3
Summary: Config-gate it so we don't have it popping up in tests everywhere.
Reviewed By: quark-zju
Differential Revision: D10432784
fbshipit-source-id: 531007432d67fef6ff504e319e43fb596d6a0d27
Summary:
Per D8985248, this code isn't necessary anymore under clindex. clindex is out everywhere now, so let's nuke it.
Shortens this file by 30%!
Reviewed By: quark-zju
Differential Revision: D10414815
fbshipit-source-id: 795c625afd128d94f09d0f7c1b294a7f7d8eea14
Summary: tweakdefaults was overriding two configs to reconcile core/fb behavior. Let's just fold it in to the default.
Reviewed By: quark-zju
Differential Revision: D10432786
fbshipit-source-id: 2f56baa2d11d7814bffc489e56cb155548d1fc97
Summary:
Manifestlog needs to use `00manifesttree.i` for filecache if treeonly is turned
on.
Teach `filecache` to also cache non-existed files and add `00manifesttree.i`
to `repo.manifestlog` check list.
Assuming inode cannot be 0, `cacheable` is a constant `True`. Drop code
dealing with `cacheable = False` accordingly.
Reviewed By: DurhamG
Differential Revision: D10417795
fbshipit-source-id: c8aedd36dc39592c86847bf4327ed9c46736bab0
Summary:
Aliases can be additionally configured with documentation by adding an entry of
the form:
```
[alias]
aliasname:doc = help text
```
The help text for the alias will be displayed if the user runs `hg help
aliasname`, and in the list of commands when the user runs `hg help commands`.
Reviewed By: phillco
Differential Revision: D10428399
fbshipit-source-id: 14338902fce6efab4c8d3b2541cdcf5b15385784
Summary:
Reorganise the top-level help commands to more useful categories, allowing them
to be listed in a custom order.
Reviewed By: phillco
Differential Revision: D10423184
fbshipit-source-id: 17f02ae201493397a448d108e781eca28a7b1d44
Summary: After D10407265 this is no longer needed.
Reviewed By: quark-zju
Differential Revision: D10407826
fbshipit-source-id: 5291981637d940a6d19cda1b814b81b745d9ca92
Summary:
This message as a warning is not actionable. wez, philco, markbt and
mitrandir77 seem to agree that this is a good approach.
Note that this message is still printed in debug mode.
Reviewed By: farnz
Differential Revision: D10336756
fbshipit-source-id: ea55d298569787d2e19eb1ffcfe6ff75935fb650
Summary: As a signal that sparse is cleaned up.
Reviewed By: phillco
Differential Revision: D10335537
fbshipit-source-id: 773a12a00cfe040f08871bf14423faa5eae9bdad
Summary: No point in tweaking it externally if we can just add relevant stuff.
Reviewed By: phillco
Differential Revision: D10335080
fbshipit-source-id: 47c009bf820f8f41f586b714181e82bea88dfa49
Summary:
Note that this is more aggressive than the tweakdefaults version; it doesn't allow named branches to be created or listed at all with the config set. As we want to delete named branches entirely, this seems reasonable.
I ported the `--new` flag, but made it optional, to make it easier to support both the core and tweakdefaults callers.
Saurabh Singh and I chatted with the releng team (Craig).
**tldr:** we can remove named branches from the UI but should keep the innards for now
Today the releng team doesn't make any branches (#continuous), but in the near-term future, they might either:
- create remote bookmarks in hg (similar to fbsource)
- create branches in SVN (which are then synced as hg branches by hgsubversion)
- We'll leave all the hgsubversion code to do this alone, just remove user-facing entry points
- They'll also need to be able to query for a commit's branch (`hg log -T '{branch}'` will still work)
- Once www is on hg, this possibility goes away and we can kill named branches for good
Reviewed By: ikostia
Differential Revision: D10401485
fbshipit-source-id: 6f2f3ae28af249bae1fdf782eb14fe7bfc472bb7
Summary:
Alas, it has to be config-gated for now, because a number of core tests depended on the empty-destination update behavior (which is sophisticated).
I'll send a followup diff to remove them.
Reviewed By: kulshrax
Differential Revision: D10376546
fbshipit-source-id: 2ac79e03a91551f96cf8e743c0ee9719557c4fbe
Summary:
The new hg absorb UX still prompts if there is nothing to be absorbed.
Instead, detect this condition and just exit with a message.
Reviewed By: ikostia
Differential Revision: D10382216
fbshipit-source-id: 5cd1aa9de457cc3475bcda064e8761b3ddf1ad40
Summary:
This greatly simplifies the implementation, too.
*updatetotally() change:*
`hg up` now passes a brev of `None` if the `--inactive` flag was passed. This avoids activating the bookmark if one was passed. However, it still needs to deactivate the active bookmark, if there was one. After looking at the existing code, I think it was just wrong.
The rest of this is just cleanup.
Reviewed By: markbt
Differential Revision: D10376544
fbshipit-source-id: e5ad8aa01acab906db4d3fc09c6450e3c48b59fb
Summary: Make a few help messages clearer.
Reviewed By: phillco
Differential Revision: D10356915
fbshipit-source-id: 277d4cecbd17b647d6dd01209ff6f93a926d37d4
Summary:
Replace the default help for Mercurial with a curated list of interesting
commands, categorized by their use case.
Reviewed By: phillco
Differential Revision: D10356916
fbshipit-source-id: 65e578a4bfde7b0ad04e7107f4e77d8ea882d78a
Summary: NB: `hg tags` still prints out all tags, just with a warning first. Maybe we could disable that entirely too while we're here.
Reviewed By: ikostia
Differential Revision: D10314175
fbshipit-source-id: 603a4dc46e05337189934803a18eef1188a02272
Summary:
It turns out core already implemented this, so let's just use their version.
Switch the facebook.rc config to it.
Reviewed By: ikostia
Differential Revision: D10306234
fbshipit-source-id: b0ee5e865ec4e0d8412dbd310a7e5017399b48c9
Summary:
Let's start moving tweakdefaults things into core.
Since we set the config in our rc files, I've renamed it.
Reviewed By: ikostia
Differential Revision: D10306236
fbshipit-source-id: 9a6b3bf7e22d8faf7b53446021660bb0923cf666
Summary: This tests works with `run-tests.py` but fails with buck.
Reviewed By: mitrandir77
Differential Revision: D10378486
fbshipit-source-id: 7112560a2d6b05b0a39f3df423ccac52bdc5202c
Summary:
Update hg absorb to use the templater and display the first line of the
description of the affected commits.
Also change the default behaviour to display the changes and prompt the user to
confirm that absorb is going to do what they want. Use the new `-a` option to
get the old behaviour.
Reviewed By: quark-zju
Differential Revision: D10366510
fbshipit-source-id: 23df2e5ab2d21a0805a16e7118686a29634d2918
Summary:
There are some code paths (ex. "purge --all") that sets watchman clock to None
unexpectedly. That makes the next command slow. Bypass it by detecting the case
and avoid setting clock to None.
Reviewed By: DurhamG
Differential Revision: D10188143
fbshipit-source-id: 4c35dfcee658ca2075d686da7d886e4b3a352b5a
Summary:
With treestate, watchman clock is not expected to be reset. But `purge --all`
bypasses some fsmonitor code paths and manages to reset the clock. Add a test
to show that.
Reviewed By: DurhamG
Differential Revision: D10188142
fbshipit-source-id: 4524979fb96d41fab881b7ee44ad9fa854081b26
Summary:
This extension exposes only the `record` command which can be easily
moved to core. This commit achieves the same.
Reviewed By: ikostia
Differential Revision: D10360759
fbshipit-source-id: 25f0c46aa3fa9b19ab8ba03a6b4e8598bc003c7a
Summary:
dirstate.untrack is used in two cases. Let's move the case where the
file is known to be actually deleted from disk to its own function. This allows
the treestate implementation to actually remove the entry from the structure,
which solves some case sensitivity issues.
Reviewed By: quark-zju
Differential Revision: D10317737
fbshipit-source-id: 09bc35d01cf5e52fdcbf45ea39c5d2f85fa39949
Summary:
There's a treestate bug on case insensitive filesystems where updating
across a case rename can cause junk to show up in hg status. A future diff fixes
this, but let's add a test first.
Reviewed By: ikostia
Differential Revision: D10317739
fbshipit-source-id: c1aa274cb55dd64cdb54ceadbd3c306151bd84d6
Summary:
dirstate.drop() is used in two different situations. 1. To make a
tracked file become untracked, and 2. To remove a file from the dirstate
entirely. In the treestate case, this difference matters, so let's split drop
into two functions, one to mark something as untracked, and the other to remove
it entirely.
In this first patch we just rename drop to untrack. The next patch will
introduce the new delete function.
Reviewed By: ikostia
Differential Revision: D10317738
fbshipit-source-id: 85950ab1b1a10cd481edcfbba6da445b3dbf6397
Summary:
The extension only offers one command i.e. `show` which can move into
core.
Reviewed By: ikostia
Differential Revision: D10302192
fbshipit-source-id: 9473ec8c80e52506e1b7de62b2c90a51c29419c1
Summary:
The functionality we care about is provided by the `fbshow` extension.
Therefore, lets replace the `show` extension with the `fbshow` extension.
Reviewed By: ikostia
Differential Revision: D10302193
fbshipit-source-id: e6d137f52427d5e6f124714d06b5b55ef0db7c3c
Summary:
This commit just removes the `show` extension.
This commit was split out of D10302193 to address the review comment in that
diff.
Reviewed By: ikostia
Differential Revision: D10359525
fbshipit-source-id: b77a08a7efbaa56eb5a4ceb2dbb3fecaba35f58b
Summary: Traditional shelve did not require `obsstore` to be enabled, which means that `saved bundle` messages were printed a lot. This change fixes all tests that expect these messages.
Reviewed By: singhsrb
Differential Revision: D10261258
fbshipit-source-id: 2b4b10ee94ae9b5723cb69fc8f7c29bc65613774
Summary:
The bug:
This happens because `repo['']` resolves to a `wctx`. This might be undesirable
in its own right, but before we fix that, we can work it around here.
Reviewed By: singhsrb
Differential Revision: D10261261
fbshipit-source-id: 8cb0e96762ffba24030f9e6bae8b0d0c108e3938
Summary: This is a first step towards making `obshelve` a real `shelve`.
Reviewed By: singhsrb
Differential Revision: D10261262
fbshipit-source-id: 7dccfbd7958cdf674c33c8ead73dcd279cebade6
Summary:
The functionality we care about is provided by the `fbamend`
extension. Therefore, lets replace the `amend` extension with the `fbamend`
extension.
Reviewed By: farnz
Differential Revision: D10320739
fbshipit-source-id: 5700d39f488777fcc4033f60ce0a51cda15ef2ad
Summary:
The logic we care about has been moved to core so we can delete the
`inhibit` extension.
Reviewed By: markbt
Differential Revision: D10276448
fbshipit-source-id: 44cabe5d561344cf8f196127ce52491e4654b598
Summary:
Treestate is missing its pathcomplete fastpath. This makes tab completion for
filenames slow on large repositories.
The Rust implementation already supported the feature, it just needs to be
called from the debugpathcomplete commands.
Reviewed By: quark-zju
Differential Revision: D10259633
fbshipit-source-id: f918d55c5bcd21805615710c0eb6302f8ea4b15c
Summary:
Parts of the treedirstate implementation were left in the extension. Since
treestate is now in core, and the two are intertwined, treedirstate should be
in core, too.
In doing so:
- Change the garbage collection behaviour to match that of treestate.
- Use the treestate config options for configuring repacking and garbage
collection.
- Make more of the code common.
Reviewed By: quark-zju
Differential Revision: D10258265
fbshipit-source-id: 89e82bc7662a3d1251fa9886751897cfc46cd66a
Summary: D10244968 changed the parser output but missed this test case.
Reviewed By: quark-zju, singhsrb
Differential Revision: D10261202
fbshipit-source-id: f3b6a4429b792e413f285fb33dfd6b64934ec477
Summary:
On the server, once we enter treeonly mode we still want to be able to
strip trees from the revlog.
Reviewed By: quark-zju
Differential Revision: D10248895
fbshipit-source-id: 15faec870370d4c28f6a83058eb1bf19cb414d29
Summary:
There's a bug where strip in a treeonly server will not strip the tree
revlogs. Let's add a test so a later fix can show the impact.
Reviewed By: quark-zju
Differential Revision: D10248897
fbshipit-source-id: f45e5abc59eeb9398ba17dd927a5f8eb50bc51af
Summary:
As we transition to treeonly, let's be sure every push contains a
manifest for every commit. To do so, let's add a hook that checks this.
Reviewed By: quark-zju
Differential Revision: D10244912
fbshipit-source-id: 6c2023b1cba5663ed386888a2007a005bc02f688
Summary:
There's an issue now where if a client is treeonly but does not have
sendtrees enabled, it could push commits to the server without manifest data.
Let's add a test for this.
The next commit will introduce a hook to catch this case.
Reviewed By: quark-zju
Differential Revision: D10244913
fbshipit-source-id: 2d6c3081c7190831e0368b0dab472d14e893471f
Summary: pest was upgraded by me to version 2.x which introduced the concept of End Of Input in the parsin rules. Modify the test case to be aware of this.
Reviewed By: singhsrb
Differential Revision: D10255598
fbshipit-source-id: 31ecf56f5cf75a16c799a93aefe7df9a3837b902
Summary: Create pack files instead of loose files for local data. Now this feature is under the config flag.
Reviewed By: DurhamG
Differential Revision: D9700992
fbshipit-source-id: b1ee897ac6fd2fe208f54f999b230353aebaca5b
Summary:
The age extension provides a couple of revsets relating to commit ages. Move
these to core.
Differential Revision: D10239000
fbshipit-source-id: 6ebf3aa263b72e4bbbe25bd516f77b17145e6e7f
Summary:
Currently `hg bisect` asks to run test on all commits it picked as a result of bisection, even if the changes between last checked nodes and chosen one relate to the files, which are not in the sparse profile.
And so it updates to the one of such commits, shows that "0 files were updated" and asks to run tests.
In this diff I check next potential node (result of bisecting) if there are changes between last good commit/last bad commit and the node. And go further to the next bisection iteration if the node can be skipped (nothing was changed since last good commit in sparse profile's files, so we can assume that the node is good as well).
If there are changes on both sides: between bad and the node, good and the node, I ask to run tests.
Reviewed By: markbt
Differential Revision: D9629683
fbshipit-source-id: f8c5d82f7b44ac14a9190c846ee65d635e447af1
Summary:
Verify SHA256 before writing content to the local blob store. This avoids
issues when the remote store does not response with the correct content.
Differential Revision: D10212567
fbshipit-source-id: 5683058670487df53fb14653d83c27da11367e76
Summary:
Move the `predecessors` and `successors` revsets to core, and unify the
variants as a single revset.
Before:
* `predecessors` (provided by fbamend) only returned the immediate
predecessors.
* `successors` (provided by core) returned the given commit and all eventual
successors.
* `allpredecessors` and `allsuccessors` (provided by fbamend) returned all
eventual predecessors and successors, not including the original commit.
Now all these revsets work like the old core `successors`, and additionally
have `depth` and `startdepth` parameters which can be used to customize the
behaviour. This makes them analogous to `ancestors` and `descendants`.
To maintain compatibility with existing users of `allpredecessors` and
`allsuccessors`, these revsets default to a start depth of 1, so they
do not include the original commits.
Reviewed By: quark-zju
Differential Revision: D10028043
fbshipit-source-id: e006700ccf430b7c5d6bd9588253872bce9a18ed
Summary:
Previously the manifestrevlogstore kept a copy of the changelog, the
store, and the svfs from the initial repo object. It's possible that these will
change or be replaced over time, so it's not safe to cache them. Instead let's
just fetch them again each time we need it.
Reviewed By: quark-zju
Differential Revision: D10156425
fbshipit-source-id: ac1e310b51be0377ba9bea75aa1806d256cc5b87
Summary:
This flow has a bug, so let's introduce a test to expose the break. The
next diff will fix the bug.
Reviewed By: quark-zju, singhsrb
Differential Revision: D10156424
fbshipit-source-id: 51d1d8da6728ee930dc1440cd3e685d7c5b5df2a
Summary:
At the moment they are not recorded because setrecordingparams may not be set
before hooks are called.
Also hooks weren't recorded because pushrebasereplacements weren't correctly
set and KeyError was thrown. This diff fixes it
Reviewed By: quark-zju
Differential Revision: D10147933
fbshipit-source-id: ef33d3e4efa7f3c42e7fcc22ee5f6e54068bf1dc
Summary:
Let's log reponame as well so that we can tell requests to different repos
apart.
I named config value `common.reponame` so that we can start using it in different extensions that also need reponame (for example, hgsql and infinitepush)
Reviewed By: farnz
Differential Revision: D10127734
fbshipit-source-id: 031c7393dfce43bf47474ac0878c1e68ddabec50
Summary:
It's useful to know because we can track down slow requests and potentially fix
them on the client.
Reviewed By: farnz
Differential Revision: D10127735
fbshipit-source-id: d21088b50065f322b0c312f048f5828b3d96f99f
Summary:
Add the `sparse switchprofile` command, which lets users specify a set of
sparse profiles they would like to switch to. This is equivalent to `hg sparse
reset` followed by `hg sparse enableprofile`, but in a single step.
Reviewed By: farnz
Differential Revision: D10141938
fbshipit-source-id: 5a1e547d21e3246237fffb17f3b512da18fac804
Summary: Reformat all opted-in python code with version `18.9b0` of Black.
Reviewed By: ambv
Differential Revision: D10126605
fbshipit-source-id: 82af0d645dd411ce8ae6b8d239e151b3730cd789
Summary:
In D10023543 stackpush was added, and conflict check can happen earlier. In
that case failed pushrebase wasn't recorded. This diff fixes it.
Reviewed By: quark-zju
Differential Revision: D10119679
fbshipit-source-id: ef12e00a43375151f81a95eec2d9f02db0a9b12b
Summary: When stripping rev x, revlog revisions with linkrev >= x should be deleted.
Reviewed By: phillco
Differential Revision: D10108592
fbshipit-source-id: 2f9f5663327c4494bd7e836ab24ffc7e507530f4
Summary:
* Rename takelock to dbwritable
The word "lock" is unclear what lock (local or SQL) it is. Make it clear it's
all about database writes.
* Rename waitforlock to enforcepullfromdb
Again, unclear what lock it is. It's also unclear what it does. Rename to
"enforce pull from db" to make it obvious.
* Rename syncdb to pullfromdb
"sync" is unclear about what direction to sync. Use "pullfromdb" to make it
clear. The hook name is unchanged for compatibility.
Reviewed By: phillco
Differential Revision: D10108594
fbshipit-source-id: fff405e2df9e926f5db436ef74cb5a9aacaebdb4
Summary:
Delay updating the working copy until after the transaction that created the
obsshelve commit has completed. This means we won't update away from the
user's changes until after their work is safe, so if the update is interrupted
for any reason, the user will be able up do a clean update and then unshelve to
get their work back.
Reviewed By: liubov-dmitrieva
Differential Revision: D10102089
fbshipit-source-id: 5709d3915a6c458ba7cfb37ba5e0be5c6e8fcbb2
Summary:
If the `update` step is interrupted, then the transaction that created the
obsshelve commit is rolled back, but the update can't be rolled back, so the
files that have been shelved are lost.
Reviewed By: liubov-dmitrieva
Differential Revision: D10102088
fbshipit-source-id: f5bcac5c92069cc6ff3d1d9b7fb7ee507003d8eb
Summary:
This is for sandcastle and other automated tools.
They will not need to run extra commands like hg log after amend to learn new
hash.
Reviewed By: markbt
Differential Revision: D10101887
fbshipit-source-id: 7c9931776a03f4335bdfe0a19e7d569e3dc4c4ba
Summary:
In the hgsubversion tests, a develwarn from another component (which doesn't
have a `config` key) crashes with a `KeyError`. Change to `get` so that
it doesn't crash.
Reviewed By: quark-zju
Differential Revision: D9699155
fbshipit-source-id: c360d5fb5ab7daf7f609d41e0ddfb7456b022666
Summary:
These are no longer necessary. Callers should use the sharedvfs to access the
shared repo's .hg directory.
Reviewed By: quark-zju
Differential Revision: D9699163
fbshipit-source-id: 9b9cd584d721c174a7eab06f6abcedc3a943233b
Summary:
Update hgsubversion to consistently use repo.sharedvfs, rather than using the
vfs of the srcrepo.
Reviewed By: quark-zju
Differential Revision: D9699165
fbshipit-source-id: 1f4dacdd23ebc3baaa0d09b65e45d4ceeb067559
Summary: Update references in core mercurial to use repo.localvfs instead of repo.vfs.
Reviewed By: quark-zju
Differential Revision: D9699162
fbshipit-source-id: 0401677d2b0a1340e66cffb7ee907a0d93aa6717
Summary:
Update bookmarks to work correctly when shared. Rather than copying the
bookmarks file over after transaction handling, update the file in both
locations when bookmarks are shared.
Reviewed By: quark-zju
Differential Revision: D9699158
fbshipit-source-id: 2f75aaac364ffe02e59441ac0f39fb7d8e5d5d2e
Summary:
Add `HG_SHAREDPENDING` which contains the path to the shared primary repository,
similar to how `HG_PENDING` contains the path to the local repository.
Repositories that are not shared check whether either of these refer to the
local repository path. Repositories that are shared check whether the pending
directory matches their own path, or the shared-pending directory matches their
shared path, via the new `trysharedpending` function.
This fixes the asymmetry in shared repos where pending changes made in a shared
repo were not visible in the primary repo, even though they were visible the
other way around.
Reviewed By: quark-zju
Differential Revision: D9699164
fbshipit-source-id: 31bc5fb2df6e9b9468b6ef39aabf877045c2a011
Summary:
Split the `repo.vfs` object into two. When a repo is not shared, these are
both the `.hg` directory of the repo. When it is shared:
* `repo.localvfs` represents the `.hg` directory of the local repository.
* `repo.sharedvfs` represents the `.hg` directory of the shared primary
repository.
The old `vfs` is an alias for `localvfs`. In the future, access through
this name will be deprecated to force callers to think whether they want
the local or shared hg directory.
Reviewed By: quark-zju
Differential Revision: D9699160
fbshipit-source-id: 6600df855c59b6df13e919399192789a873231c6
Summary:
Previously, statprof uses a naive `time.sleep`, which cannot be interruptted
easily (considering Windows compatibility). Change it to `threading.Event.wait`
so it can end early without waiting for the full cycle of the sampling period.
Reviewed By: wez, kulshrax
Differential Revision: D10067234
fbshipit-source-id: 24e5fc0ab05491cb3e7ff34024402842ac3d7d44
Summary:
This gives us more information about how large the hgsql operation is.
As we're here, move `sqlwriteunlock` to an earlier place so the logging is outside
the sql lock. Also document `unbundle` a bit so it's clear `repo.transaction()` only
takes sql lock in `unbundle` context.
Reviewed By: phillco
Differential Revision: D10056307
fbshipit-source-id: 5d3361b4044e6fcf01e60409ef1ecb34da34ccac
Summary:
RocksDB and InnoDB are highly compatibile. There is no need to test RocksDB
engine for every hgsql related tests. Only use rocksdb for 2 of the tests.
Reviewed By: phillco
Differential Revision: D10055068
fbshipit-source-id: f9b7ef546fe7d457b0390e49014ebbe56d3c12c1
Summary:
Our hypothesis is that if the prepushrebase hooks take a significant amount of time, the repo state will get out date, causing hgsql to degrade under load.
This uses the previous test to simulate new commits coming in to the database while a single server is busy running prepushrebase hooks. The new code causes a second sync to occur just after running the hooks.
Reviewed By: quark-zju
Differential Revision: D9999683
fbshipit-source-id: 43d2390b476d090a66353555247c9a623386e75a
Summary:
This test case is a bit simpler given the problem -- there's no need for the holding push hook.
Instead, you just need a server that's missing a public commit. (Simulate an `hg strip` on one of the servers. `hg strip` isn't allowed, so create another repo with the extra public commit instead.)
Reviewed By: quark-zju
Differential Revision: D10043378
fbshipit-source-id: 532d8a2791abe5aaa6b6932747c7e0145202e8fe
Summary:
The fast path avoids recreating the bundlerepo in the critical section, which
is like a reliable 0.8s win.
See the docstring in stackpush.py for details. It does not replace all use cases
that the old code path supports. So the old path is preserved.
Since it's a drop-in replacement, make it the default.
Reviewed By: phillco
Differential Revision: D10023543
fbshipit-source-id: eaceb9ae5067ab9040aa10cc65170ae54abd3331
Summary:
The next patch will change pushrebase code path so it does not have to go
through pushrebase._commit. Change globalrevs to wrap the lower-level
repo.commitctx to make sure commits have global revs assigned. Pushrebase
and hgsubversion wrappers are removed accordingly.
This also affects "hg commit" running in the server-side repo. Therefore
the test is changed to keep the change minimal.
It's also incorrect to reset the next revision counter at `repo.invalidate`.
It should only be reset at transaction abort. The original concern was
to get an up-to-date view of the revision number. Doing it in `repo.invalidate`
is risky. Enforce hgsql lock when reading the number to make it safer.
As we're here, change the transaction code so it does not wrap `_abort`
unnecessarily for nested transactions.
Reviewed By: singhsrb
Differential Revision: D10023541
fbshipit-source-id: 82d4b57dc2eafa8bc3cdf553e891db6e8c5ff741
Summary:
Inside the critical section, "needsync" runs twice and each time it scans
O(bookmarks + heads), which could be slow.
If the repo is actually up-to-date, there could be a faster path for testing -
just hashing all bookmarks and tip. Note: "heads" is skipped to save some time.
Since commits are append-only, "heads" change implies "tip" movement. So
checking "tip" is enough.
As we're here, fix the empty repo case so syncing is skipped for an empty repo.
Since this is a drop-in replacement for `needsync()[0]`, turn it on by default.
Reviewed By: phillco
Differential Revision: D10022866
fbshipit-source-id: f9e304865db3575515d66444762f21071d5665a3
Summary:
When entering the critical section (creating a transaction), hgsql might wait
for SQL lock for a long time (minutes). And it currently does nothing during
that wait time. If the lock was acquired after a long time, the work of
catching up with what the database already has might be too much. That is a
waste within the precious hgsql lock held critical section.
Instead of waiting for the lock for N seconds and doing nothing, wait for k
(k < N) seconds and also try to sync with SQL periodically. This makes the
repo closer to what the database has and can reduce work needed to pull from
the database in the critical section.
This adds CPU pressure to the MySQL tier. I added a config option to control
it. Worse case, we can change `hgsql.syncinterval` to make the sync less
frequent.
As we're here, try document the configs.
Reviewed By: phillco
Differential Revision: D10002578
fbshipit-source-id: bd72d8225c919aa2bc62743de1e1d3f27cba606a
Summary: We want to add a test for this case before fixing it.
Reviewed By: quark-zju
Differential Revision: D10034448
fbshipit-source-id: 9244c57311d71a0bf1d75643caa31960a2f3519f
Summary: We need an in-depth test that tests both pushrebase and hgsql and shows how often we are reading uncached manifests. This is such a test.
Reviewed By: quark-zju
Differential Revision: D10023492
fbshipit-source-id: cf9e76e505c3bc478a7fc13d8d1adf1adeb6c1e4
Summary:
This allows versions that don't know about storerequirements still access newly
created repos with this version. We will turn this on at a later date.
Reviewed By: singhsrb
Differential Revision: D10033964
fbshipit-source-id: e1065e05c33544d0287eda5eb852baff07c13147
Summary:
I want to centralize knowledge about specific sqllocks so I can change the
locking mechanism in the next commits of this stack
Reviewed By: quark-zju
Differential Revision: D9993477
fbshipit-source-id: 9398476b0ba8c3175ce84a7e0a809bbb8e60b7df
Summary:
With hgsql.verbose turned on, print useful messages like how many commits the
server is syncing, how long the lock was held or waited, to stderr so they are
visible to the client. This is useful for the client to understand why the
server "hangs" for a couple of seconds, and is useful in tests.
As we're here, drop no-flake8 comment.
Enable the flag for the hgsql-sync test to verify it.
Reviewed By: phillco
Differential Revision: D10019937
fbshipit-source-id: 8d304ce5208dbc5b92ed20f69daba02e9040c73f
Summary:
Sometimes watchman can return a very long list of files. That would make
blackbox rotate too frequently. Truncate that list.
Reviewed By: phillco
Differential Revision: D9997658
fbshipit-source-id: 1314b7c299a5f50ed344e0b85befd4c0525b1da7
Summary:
Previously, the `[profiling]` config section defines the profiler. Now it can be
defined by other sections, `[profiling:1]`, `[profiling:2]`, etc. Those sections
are sorted by name, and the first one with `enabled = true` is effective.
This makes it possible to specify secondary profiling configs, like having a
low-overhead profiler to be always enabled and logged if the command exceeds
certain threshold:
[profiling:background]
enabled = 1
freq = 1
minelapsed = 30
output = blackbox
type = stat
The config will only be used when the primary profiling (`--profile`, or
`profiling.enabled`) is disabled.
Reviewed By: markbt
Differential Revision: D9828548
fbshipit-source-id: 301a2b049d569d6fc065d05ab5b02e85b4ea8cc5
Summary:
Make "profiling" a variable. No logic change.
The next patch changes the config section name dynamically.
Reviewed By: markbt
Differential Revision: D9828551
fbshipit-source-id: b6b76012462f2dc1a76cd162381d949a94dc498b
Summary:
This config allows us to only log the profiling result if it exceeds a given
threshold. It's helpful for always enabling profiling and only log meaningful
data.
Reviewed By: markbt
Differential Revision: D9828549
fbshipit-source-id: f7e8f7e1e1f834d980519c2a639f3c7fd02f7f42
Summary:
In pushrebase code path, `_getmanifest` needs to be used to obtain the manifest
correctly for pushes from treeonly repos. The merge commit code path missed this
change. Fix it.
Besides, the rename checking code patch can also hit flat manifest errors via
repo.commitctx -> ... -> fctx._copied -> ctx.filenode -> ctx._fileinfo. Patch
that path too.
Reviewed By: phillco
Differential Revision: D9977904
fbshipit-source-id: 8c51aa9cc6bd85b0147d88c61a5af074e36cdb61
Summary: Part of tech debt week; let's make it so any time we reject an update due to conflicts, we print what the conflicts are.
Reviewed By: quark-zju
Differential Revision: D9784659
fbshipit-source-id: 1ee232b728bb602dbeaa4d2ecbc11016edd48dce
Summary:
This commit adds a way to run the `globalrevs` extension only in read
only mode. This is useful in cases where repository `x` pulls from repository
`y`, both the repositories have `globalrevs` and `hgsql` enabled, we only
want to embed `globalrevs` in the commits for repository `y`, and we want to be
able to read the `globalrevs` in repository `x`.
Reviewed By: phillco, quark-zju
Differential Revision: D9978146
fbshipit-source-id: b9530e8e9cfadc28e2cd30e51649cee9e6e144bf
Summary:
The long filename encoding method introduced in D8527475 is insufficient for
files that have very long names that include some underscores.
For these files, we encode the underscores as `:`. This character is valid for
filenames on Linux, but won't work on Windows.
Reviewed By: mitrandir77
Differential Revision: D9967059
fbshipit-source-id: 67ea662f48f9fcc40e00b36c86697f3be6aac978
Summary:
Create Python bindings so that the BookmarkStore can be interacted with
from Python.
Reviewed By: quark-zju
Differential Revision: D9768565
fbshipit-source-id: 00d75b5250d8bc7dbeddd90d80ff4a23c60d00f9
Summary:
When syncing with the commit cloud, if we have commits that are hidden locally,
but visible in the cloud workspace, and no local obsmarkers waiting to be
synced, revive the cloud-visble commits.
This prevents two repos from oscillating between two views when they have
a conflicting set of obsolescence information that has not been cloud shared.
Reviewed By: liubov-dmitrieva
Differential Revision: D9845984
fbshipit-source-id: 2f44ff8dbc636e2afa56d5efbb3ea5114472c41c
Summary:
If two repositories have conflicting obsmarker information that has not been
shared through commit cloud, then they can enter a state where they fight over
the visibility of the commit, and the cloud workspace oscillates between two
views. This adds a test to demonstrate this occurring.
Reviewed By: quark-zju
Differential Revision: D9845983
fbshipit-source-id: d5c74bed25da5721f273e53df10bf7b88efe2850
Summary:
In the current implementation, the `globalrevs` extension complains if
the `hgsql` extension is enabled but bypassed. This creates issues in cases
where the `hgsql` extension is bypassed intentionally as in D5012225. This
commit changes the logic in `globalrevs` extension to not wrap any extensions
if the `hgsql` extension is bypassed intentionally instead of raising an
exception.
Reviewed By: quark-zju
Differential Revision: D9883231
fbshipit-source-id: c57eaad4f661b69752a6457e6ecdd43f377285c1
Summary:
Remove newdoc from test-check-code - it's a Sphinx project, so MiniRST
checks don't apply. Also remove the unused imports from the Sphinx config
file.
Reviewed By: farnz
Differential Revision: D9851834
fbshipit-source-id: c17e83fd96d39423eeedfb8a6cfae382f88c4d5f
Summary:
Add the `storerequirements` feature to the repo. This means the store may have
a `requires` file, and clients must check it for any store features that they
may be missing. This allows new requirements to be added that affect the store
when the repo is shared. Currently there are no store features.
This commit adds support for the feature, and only new repos have the
requirement added. A future commit will optimistically upgrade repos to
include the requirement.
Reviewed By: quark-zju
Differential Revision: D9699156
fbshipit-source-id: 95c1ab6973d44c02abc69b78a15311fe6a8696fd
Summary:
The share extension doesn't currently check the requirements of the shared
repo. This means the shared repo's requirements can't be used to stop older
versions of Mercurial modifying future store versions that they don't
understand.
Reviewed By: quark-zju
Differential Revision: D9699169
fbshipit-source-id: 5a3a6d3389ecd682168f2660b425f4d762771f99
Summary:
Buck test does not print outputs directly to the terminal. So it's better to
not limit the diff size.
Reviewed By: singhsrb
Differential Revision: D9842709
fbshipit-source-id: f17c7321d75761fdac21b9def52dec38f7e0b60c
Summary: See the command docstring for the use-case.
Reviewed By: phillco, strager, singhsrb
Differential Revision: D9836447
fbshipit-source-id: 22ff603ce3e0cd95ea4e400ed24a96c0ea636e6b
Summary: This would lead to less surprises than using the default priority.
Reviewed By: quark-zju
Differential Revision: D9818647
fbshipit-source-id: 59214eff84ea0b485ab8ff42b86df1c605a319f5
Summary:
This is unnecessary after the recent modifications in the namespace
code.
Reviewed By: quark-zju
Differential Revision: D9815973
fbshipit-source-id: d7c6b07226be35ebbbe5354d5c520c9807cc0aa6
Summary:
On POSIX, a lock is created in these steps:
1. Take the directory lock to make "test stale lock & unlink" atomic.
2. Test and remove stale lock.
3. Create a legacy symlink (placeholder) lock.
4. Create a temporary file, flock it.
5. Rename the temporary file to override the symlink lock.
Step 3 is to be compatible with legacy hg programs. However, the error handling
is not great - in case 4 or 5 errored out (ex. Ctrl+C), the symlink file is left
untouched. This diff removes it.
Reviewed By: ikostia
Differential Revision: D9770936
fbshipit-source-id: a004d6326381e304552088bcf322c052254321dd
Summary:
`treemanifest._generatepackstream` truncates the list of possible base
manifests to length 2, because `cstore.treemanifest.walksubdirtrees` can only
support two base trees to compare against. However, it does this too soon, we
can select a different 2 base manifests for each comparison out of the possible
pool.
Reviewed By: quark-zju
Differential Revision: D9788298
fbshipit-source-id: 4ba8753ccc34e09563bebdf90602211a999a02ea
Summary:
This test arranges it so that `treemanifest._generatepackstream` is called with
three possible base manifests, each of which is appropriate for a different
commit. Because this function truncates the list of candidate base manifests
too soon, we end up with too much data in the bundle.
Reviewed By: quark-zju
Differential Revision: D9788299
fbshipit-source-id: 2147a63108e11750083862abc73c386867549ba2
Summary: Otherwise `./entrypoint.py` will be executed as a shell script.
Reviewed By: singhsrb
Differential Revision: D9800130
fbshipit-source-id: 656fb37aae97f1d5757a3f5bba0af701abc84d03
Summary:
Broken by D7563731. Running `exec` in a test will replace the test process.
That means the tests are basically doing nothing. Wrap `exec` in a subshell to
fix it.
Reviewed By: singhsrb
Differential Revision: D9800124
fbshipit-source-id: d4f7f29502dcd2db542f5dd03827a06cc9abd783
Summary:
We need to look up commits in the repository based on the strictly
increasing global revision numbers. This commit adds the following way of doing
so:
- `m<number>`: `hg log -r m<number>` would match the commit having `number` as
the strictly increasing global revision number.
Reviewed By: quark-zju
Differential Revision: D9764819
fbshipit-source-id: b9d3a80852c7acebd0c939a4d4f43c3c9a6cb0ab
Summary:
This fix uses mercurial's encoding.tolocal on the Perforce changelist description
instead of trying to decode it as ascii and ignoring/throwing away non-ascii
characters.
Reviewed By: singhsrb
Differential Revision: D9777614
fbshipit-source-id: 713bd63831c965687b7328de06016b4f351b0469
Summary:
Migrate builtin namespace definition to use the registrar. So we can deprecate
`addnamespace`.
`after` is not expressive enough in certain cases, although it's easier to
understand. Add a `priority` parameter for more explicit ordering handling.
Reviewed By: singhsrb
Differential Revision: D9780363
fbshipit-source-id: 85b9cfb91a7c937eea95f2a279a43c11e561b5fc
Summary:
Be more permissive about spaces. Namely:
- Spaces after a section name like `[foo] ` are allowed.
- Spaces in config names are allowed.
- Spaces at trailing lines are ignored and no longer insert an `\n` to the previous config.
This makes it closer to the older config parser behavior. But it's still
different on some cases, like `[foo]]`, `[foo] # bar`, `[foo]]` still do not
parse.
Benchmark shows no obvious (within 10%) slowdown. So this is probably fine.
Reviewed By: strager
Differential Revision: D9620253
fbshipit-source-id: 8489ef8e83606d0557db56e8da0a017d55ff1514
Summary:
Previously, there is no easy API to add a namespace with desired order. There
is `extensions.afterloaded`, but that only works for `ui/extsetup`, not for
`reposetup`.
This diff add a namespace predicate so registering a namespace is similar to
registering a revset. It also provides an optional `after` parameter to define
the desired order, like:
from mercurial import registrar, namespaces
namespacepredicate = registrar.namespacepredicate()
namespacepredicate("svn", after=["remotenames"])
def svn(repo):
return namespaces.namespace("svn", ...)
Existing namespaces will be migrated by upcoming changes.
This is useful for things wanting to resolve custom names, like globalrevs and
commit cloud.
Reviewed By: singhsrb
Differential Revision: D9775703
fbshipit-source-id: f15827b042d605b9cebc1ee1af6479903f47ee9c
Summary:
The Python hook got "kwargs" without "HG_" prefix. Add an explicit test for it.
Also remove unnecessary configs and change the shell to bash, since we don't
run tests using vanilla "sh".
check-code is updated so it no longer complains about the use of `bash`.
Reviewed By: markbt
Differential Revision: D9561962
fbshipit-source-id: 76a190dde1b0aeb0032a65c173ce6368a28e8cf6
Summary:
We need to look up commits in the repository based on the strictly
increasing global revision numbers. This commit adds two ways of doing so:
- `globalrev(number)` revset: `hg log -r 'globalrev(number)'` would match the
commit having `number` as the strictly increasing global revision number.
- `m<number>` stringset: `hg log -r m<number>` would also match the commit
having `number` as the strictly increasing global revision number.
Reviewed By: quark-zju
Differential Revision: D9756146
fbshipit-source-id: db9ecf8f8244634d71957ddb645dfda675cab662
Summary: It's still been failing and we probably don't need to worry about maxrss failing any time soon.
Reviewed By: singhsrb
Differential Revision: D9671400
fbshipit-source-id: e847a240285c2aa2fa15d49ec4fb010483278e9d
Summary:
this is usefull when a user have a lot of other users commits in the default workspace
the set of commits includes all the stacks where at least one commit is user's own
the option is for the default workspace only, it doesn't apply for other workspaces a user may collaborate in
the idea is that the client code will never offer other user's commits to sync, so cloud sync will perfectly work with some extra commit might present on any machine.
this allow users to continue have other users commits in their workspace for review or other purposes even if it is very very large, but provides reliable backup and sync solution for user's own work.
the option works for all commands `hg cloud join` `hg cloud rejoin` `hg cloud sync` and `hg cloud recover`
Reviewed By: simpkins
Differential Revision: D9645571
fbshipit-source-id: 9adb68568083c87c22bb86c19fb7a5bb0f639265
Summary: This test fails from time to time. Let's widen the upper bound for maxrss a bit. If it continues to fail we can just delete the test.
Reviewed By: quark-zju
Differential Revision: D9659411
fbshipit-source-id: ef65d96919ddc809a29c5cd811dfa0bec780e722
Summary:
This test has been flaking out and breaking the build when the shelve was made >1s ago.
cc @[1266426728:Kostia Balytskyi]
Reviewed By: singhsrb
Differential Revision: D9645529
fbshipit-source-id: 575cb4272710d60c27e61aa519da32f4d2291eff
Summary:
Before this commit, `treemanifest` registered a post-transaction hook to
prefetch data for the parents of new commits. Shelve produces a hidden
commit, so this logic failed, since it used a filtered repo instance.
Let change it to use unfiltered repo and remove all of the hidden commits
from the revset to avoid surprises.
Reviewed By: markbt
Differential Revision: D9613454
fbshipit-source-id: 5caddd2948e5d2e982462bebdb950b359995baa1
Summary:
Previously, we would show root-relative paths. Now we show cwd-relative
paths unless the --root-relative flag is passed.
Reviewed By: phillco, farnz
Differential Revision: D9607987
fbshipit-source-id: 6c24c05317c165f88d2a83d6921d1520044a9b6e
Summary:
When I first rolled this feature out, many people liked it but enough
people complained that it would prompt after EVERY file when sometimes they
wanted to always continue (although they were fine with the initial prompt).
This adds the new "always" option to the prompt.
Reviewed By: quark-zju
Differential Revision: D9607680
fbshipit-source-id: 76989b346ed9dd88048a37bcad6dcddd8325f314
Summary:
test-lfs-test-server.t is failing because of spurious output from Bash:
```
======================================================================
FAIL: test_lfs_test_server_t (scm.hg.tests.unittestify.hgtests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/data/users/strager/fbsource/fbcode/buck-out/dev/gen/scm/hg/tests/hg_run_tests#binary,link-tree/scm/hg/tests/unittestify.py", line 96, in runsingletest
raise self.failureException(err + out)
AssertionError:
--- test-lfs-test-server.t
+++ test-lfs-test-server.t.err
@@ -158,6 +158,7 @@
(Restart the server in a different location so it no longer has the content)
$ $PYTHON $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
+ $TESTTMP.sh: line 116: 2128544 Terminated lfs-test-server &>lfs-server.log
$ rm $DAEMON_PIDS
$ mkdir $TESTTMP/lfs-server2
$ cd $TESTTMP/lfs-server2
@@ -187,3 +188,4 @@
Clean up:
$ $PYTHON $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
+ $TESTTMP.sh: line 140: 2130121 Terminated lfs-test-server &>lfs-server.log (wd: ~/lfs-server2)
ERROR: test-lfs-test-server.t output changed
!
Failed test-lfs-test-server.t: output changed
```
If this this test wasn't broken, it would have caught a bug introduced by D9478744 (fixed by D9619464). Fix the failures to make the test pass again.
Reviewed By: quark-zju
Differential Revision: D9619647
fbshipit-source-id: 989db431a28ab2d491ced70dc9113998b0ddb5f5
Summary:
Previously, revset like
('or',
('list',
('string', '00ff93e1af4dc4ce7effb69afd0b91551cf1fe72'),
('func', ('symbol', 'smartlog'), None)))
won't be processed because len(tree) == 2. Change the logic to recursively
enter the tree. I think this is a regression since [revset: remove order information from tree](mercurial-scm.org/repo/hg/rev/1b28525e66982a50c33a7163228afdc785e8ca58).
Reviewed By: ryanmce
Differential Revision: D9615771
fbshipit-source-id: ea3c11b291743ade32357652f3c6790d65b83e5d
Summary: Seems like a sensible thing to do
Reviewed By: lukaspiatkowski
Differential Revision: D9613215
fbshipit-source-id: ed7bfa436edcaa988e77c568a3a5c74bacff63a8
Summary:
It was trying to add a recording for non-pushrebase pushes. It did not result
in failure, but it did result in an annoying warning.
Reviewed By: farnz
Differential Revision: D9570530
fbshipit-source-id: de999a60c146cc49a1a5fd057b6037cf9f73e367
Summary:
In revset AST, there are 2 types - string and symbol.
We had users hitting filtered node error by using revset like:
'only('\''83f5'\'','\''a9ee'\'')'
The extra quoting made the commit hashes "string" instead of "symbol",
and directaccess didn't handle them.
As we're here, also clean up the comments to make it easier to understand.
Reviewed By: singhsrb
Differential Revision: D9564685
fbshipit-source-id: 567e3a1d0b88c3aab269a537f2db6671c4dda95d
Summary:
Write a test that hangs forever, like:
$ hg init
$ hg serve -p 0
`run-tests.py --timeout 3` cannot handle it (on both Windows and Linux). It
only tries to kill the bash process, and the `hg serve` process stays running.
For some reason, existing tests are more likely hang on Windows. Therefore we
need a way to reliably kill processes and their descendants. Windows provides
Job Object [1] which reliably solves the problem.
On POSIX, process group is used. It's less reliable because processes can
escape from the group by using setpgid, etc. But it's already better than
before.
[1]: https://docs.microsoft.com/en-us/windows/desktop/procthread/job-objects#managing-processes-in-jobs
Reviewed By: phillco
Differential Revision: D9516042
fbshipit-source-id: 970fce7ba24d0e9bafd66438354de2e6df761edf
Summary:
Similar to buck. Show progress for running tests.
This also improves Ctrl+C handling. It's now more
responsive since we no longer wait for the entire
output.
Reviewed By: phillco
Differential Revision: D9516040
fbshipit-source-id: 98b29228177510855e29da341198697da940884c
Summary:
`.t` tests are stateful. This means if some early parts do not execute
as the test expect, the the remaining parts can break in funny ways,
and generate lots of uninteresting output.
Limit the length of the diff output so the "likely" boring parts won't show
up by default. The change can be overridden by `--maxdifflines`.
Reviewed By: phillco
Differential Revision: D9516041
fbshipit-source-id: 6c998cdc73ae4a45e2f4167c22c04df51392da29
Summary:
MSYS provides binaries that tests need so we no longer
depend on system binaries, which might be broken.
MSYS can provide `make.exe` to make `make local` working,
so we don't depend on other things to provide `make`.
As we're here, change `run-tests.py` to use the right Python
interpreter and escape Windows paths.
Reviewed By: phillco
Differential Revision: D9505926
fbshipit-source-id: f17e77dfc599069d4fe849057b7a198758c2dd42
Summary:
The goal is to improve backup experience, make repo after recovery to behave as it was for the most popular commands.
This is only if backup is backed by cloud sync because we have more meta information in the repo.
the commands:
`hg diff --since-last-submit`
`hg log -r 'lastsubmitted(.)'`
`hg unamend`
for example, are not working for fresh repos that are recloned because the repo will only contains the latests snapshot of commits and also all obsmarker history but not obsoleted commits.
those are popular commands, so let's make them work.
the standard error there is 'unknown revision' and it is very confusing for users
there is no reason not to pull a remote obsoleted revision into the repo if needed, and there is no reason to ask user to do that manually.
the obstore is still lazy loaded, so shouldn't be perf problems
this diff supports good range of commands, so should make experience for our backup use case users significantly better.
pulling the hidden revisions is also relatively fast and doesn't affect commit cloud state of the repo in any way
Reviewed By: quark-zju
Differential Revision: D9437518
fbshipit-source-id: 01065c642aa9a194f2d321f03c1bd747f57c74b1
Summary:
Switch `ui.load` and `ui.readconfig` to use the Rust config parser.
`ui` now no longer depends on `config.config` or `rcutil`.
Pest's error messages are fancier, thus most test changes.
For the fbsource repo, debugshell shows the new code is 10+x faster:
On laptop:
Before:
In [1]: %timeit m.ui.ui.load()
10 loops, best of 3: 27.8 ms per loop
After:
In [1]: %timeit m.ui.ui.load()
100 loops, best of 3: 1.85 ms per loop
On devserver:
Before:
In [1]: %timeit m.ui.ui.load()
100 loops, best of 3: 16.8 ms per loop
After:
In [1]: %timeit m.ui.ui.load()
1000 loops, best of 3: 1.28 ms per loop
Since `ui._rcfg` is no longer copy-on-write, there is concern about `ui.copy()`
performance. It is faster too (on devserver):
Before:
In [1]: %timeit ui.copy()
1000 loops, best of 3: 198 µs per loop
After:
In [1]: %timeit ui.copy()
10000 loops, best of 3: 157 µs per loop
The old `ui.py` was copied to `legacyui.py` and can replace the new `ui.py` if
a config file exists on the system. This provides a way to switch back to the
old config parser in case of emergency.
Reviewed By: mitrandir77
Differential Revision: D8887375
fbshipit-source-id: 2951ca622c77bf41187ad5c5cab3445cda0dc519
Summary:
I noticed `hg summary` takes 32 seconds running in my local repo. Profiling
shows 30 seconds spent on `changelog.findmissing`. We don't use branches and
heavily patched other places to get rid of branch heads logic. So let's remove
them from `hg summary` too.
Reviewed By: phillco
Differential Revision: D9477205
fbshipit-source-id: 17b07190b6dcc96bc3a5f3c2b5ff4aa1366f4904
Summary:
This test fails on `OSX` with the following error:
```
$ find $TESTTMP/remote | grep '/../' | sort
+ $TESTTMP/remote
+ $TESTTMP/remote/96
$TESTTMP/remote/96/85eb765661ea3b95f31e1bb3c3b5501d0c2acdf353feeaa4d8fe32f95f77fb
+ $TESTTMP/remote/ab
$TESTTMP/remote/ab/861dc170dc2e43224e45278d3d31a675b9ebc34c9b0f48c066ca1eeaed8ee6
```
This commit addresses that issue by only checking for the important paths.
Reviewed By: quark-zju
Differential Revision: D9491589
fbshipit-source-id: 42941b9a7b8ca0f9ac6df1ef85598e78d14e1355
Summary:
We'd like to enable `lfs.url` on hg servers to make blob verification work
without downloading actual blobs. Previously, the LFS local blob store is
always backed by the local filesystem. D6699099 added a simple in-memory store
for another purpose. That in-memory local store fits the
"avoid downloading to disk" purpose. So let's add a config option to use it.
Reviewed By: zhh95
Differential Revision: D9478744
fbshipit-source-id: 69b04cd719cedb77f01b90b4666676c8f38584a1
Summary:
The verification also runs client-side and that can cause issues with complex
treemanifest setups.
Therefore turn the verification off by default. It would be enabled on the
server-side.
Reviewed By: phillco
Differential Revision: D9478745
fbshipit-source-id: 299b9180c661023d8e2358eedeae7b5c7d36ab79
Summary: This would help people unblock themselves.
Reviewed By: markbt
Differential Revision: D9443602
fbshipit-source-id: f05e2b2390a88a9280149d2164c2d7ab71c29600
Summary:
Recently there are a trend of questions about repo being locked. People usually
don't have enough debugging skills to find out what's going on. So let's add a
debug command to help them.
The implementation uses `osqueryi`, which perfectly solves the cross-platform
process handling headache. Note the well-known `psutil` Python library does not
seem to provide parent process information on Windows.
The `_rapply` function was backported from upstream mercurial.
Reviewed By: markbt
Differential Revision: D9443601
fbshipit-source-id: d26b3adfde1045ebd5bca1c6b1c93f0db147f9b0
Summary:
If a user uses `hg undo` to undo a `commit` or `amend` operation, this discards
the changes. If they wanted to keep them in the working copy, they should have
used `hg uncommit` or `hg unamend`.
Provide a hint telling the user how to get back their changes, and letting them
know that `hg uncommit` and `hg unamend` exist.
Reviewed By: quark-zju
Differential Revision: D9346061
fbshipit-source-id: 300b1ac851a12ccf2432ba2c11fceac619667701
Summary:
The warning was removed by D9436487. This diff should fold into that change.
Unfortunately buck test didn't run with run-tests.py changes. So lets fix it.
Reviewed By: singhsrb
Differential Revision: D9444368
fbshipit-source-id: 8e27ae14d56e559fc063d5500ebb789c4fe26545
Summary:
D9328199 made them skip eden mounts. This diff expands the whitelist to other
common filesystems.
Reviewed By: wez
Differential Revision: D9416599
fbshipit-source-id: 5f1dddf5a181833a2fa6e0954c2579bb5adcd170
Summary:
Previously, the alias resolution is affected by the alias definition order. So
things like:
[alias]
myglog = log -G
myvlog = myglog -v
works. But
[alias]
myvlog = myglog -v
myglog = log -G
doesn't. D8767902 changed ordering semantics and broke some people's aliases,
because if both `myvlog` and `myglog` are defined in system hgrc, their order
cannot be changed from a user hgrc.
Instead of having subtle behavior here depending on the order. Let's just do
not rely on the order. This diff makes it so, by resolving aliases using latest
(alias-if-possible) definitions, with only one special case: "foo = foo ..."
uses the original non-alias "foo" command.
The "alias ... shadows command ..." debug message was removed as it's
no longer accurate.
Reviewed By: simpkins
Differential Revision: D9417710
fbshipit-source-id: f4228eba3c8c728163a54bcf053c379fa86bd123
Summary:
this is an option to take into consideration only specified heads that run cloud sync
this is helpful to debug issues with individual stacks on push part of cloud sync
Reviewed By: quark-zju
Differential Revision: D9349821
fbshipit-source-id: c5220be3b30cfc300bf62bdcfc472368ce74104e
Summary:
Generally, it seems the `mercurial/entrypoint.py` approach might need some
more thinking, but in this particular case I'd prefer to just fix the tests.
Here's what's going wrong:
- D9407009 intoduced a logic to expect `mercurial/entrypoint.py` to always
exist under the `hg` installation on a *run-tests* level
- `run-tests.py test-run-tests.t` however runs `run-tests.py` (yo dawg), while
`hg` is a symlink to `$(which true)`
- while the `mercurial/entrypoint.py` script cannot be found by the test
suite in this case, it's not important becuase no real Mercurial is run.
Therefore, I propose to change `SystemExit` to `log`. On one hand, the absense
of `mercurial/entrypoint.py` is a big deal, so we should know about it. On the
other, this case can run completely without it. In the dominant majority of the
other test cases, we'll learn about the absense of `mercurial/entrypoint.py`
by means of the failing Mercurial call.
Generally, this migth require some more thought, but for now let's fix tests.
Reviewed By: lukaspiatkowski
Differential Revision: D9421433
fbshipit-source-id: e39628015ff96f27368b99ec1f99145c0cb1ae7b
Summary: It makes no sense for newly committed commits to be obsoleted.
Reviewed By: DurhamG
Differential Revision: D9236660
fbshipit-source-id: 95e4076bb9acde67aaab95f25a6de27d761cd960
Summary:
Similar to rebase, do not use unsafe strip for histedit.
This makes `histedit --abort` safer, faster, undo-able, and also solves
potential crashes using real strip with clindex.
Note `test-histedit-obsolete.t` shows a case that is suboptimal. It'll be fixed
by the next commit.
Reviewed By: phillco
Differential Revision: D9236662
fbshipit-source-id: e436b0aa9b4a1b155dcfb111c5618371b68232eb
Summary:
The run-tests script symlinks hg to a place and sets `PATH` so `hg` can be
called from anywhere without requiring the local shell settings, including
"dummy-ssh" server side.
The Rust `hgmain` uses
`env::current_exe().parent().join("mercurial/entrypoint.py")` to locate
the `entrypoint.py` file. However, `env::current_exe()` does not follow
symlink on OSX, unlike Linux. Therefore the entrypoint.py cannot be located on
OSX.
`hgmain` also reads `HGPYENTRYPOINT`. So let's set it explicitly from
run-tests.py.
Reviewed By: singhsrb
Differential Revision: D9407009
fbshipit-source-id: db9a55e11b424625a6ab58afdbebf0944c7012f5
Summary:
per @[1070541862:quark]'s suggestion, I attempt to add a verification hook that checks LFS blobs were uploaded before push.
The code execution path looks like this:
`command.py: push()` -->
`exchange.py: push()` -->
......
`exchange.py: _pushbundle2()`
`exchange.py: _pushcheckoutgoing()`
......
And I insert the hook in `exchange.py: _pushcheckoutgoing()`
Reviewed By: quark-zju
Differential Revision: D9212199
fbshipit-source-id: 98e016da81f9df85731771b7d486d03848624bcb
Summary:
As requested by https://fburl.com/qw620t12.
Didn't add another option to make the message configurable as it'll eventually
be removed.
Reviewed By: singhsrb
Differential Revision: D9405366
fbshipit-source-id: 1aef69b4d01be976c3c4465cd542642e586599ca
Summary:
This change fixes two problems in pushrebase recording, that will be used to test mononoke pushrebase:
- record correct `repo_id`, it used to be always 0
- `ontorev` truncation, as we store rev as hex string we need 40 bytes instead of 20
Reviewed By: ikostia
Differential Revision: D9398009
fbshipit-source-id: 91add2d75fbb9acf32b99dc952c467d44c2ccbc9
Summary: Packing loose files for local data into `.hg/store/packs`. Existing pack files for local data can also be repacked.
Reviewed By: DurhamG
Differential Revision: D9181106
fbshipit-source-id: 4d044e97178b4263b87404357445b43eb99017b3
Summary:
The real strip was used on purpose [1] as a workaround of the old obsstore
design where commits cannot be revived.
Since reviving commits is now possible. Let's avoid dangerous strip here.
This makes `rebase --abort` safer, faster, undo-able, and also solves an
issue where clindex crashes with real strip reported by @[839419353:jeroenv] at
https://fburl.com/uqfglmu5.
[1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/095572.html
Reviewed By: DurhamG
Differential Revision: D9236658
fbshipit-source-id: 9ae7089a8991d8d21ddc5e107c15b8374c7d7339
Summary: No longer need to check inhibit.
Reviewed By: DurhamG
Differential Revision: D9236656
fbshipit-source-id: d05ec2ed2b2314ef7608c54df4f1653ca8b1b53d
Summary:
Reviving commits is an essential feature. So move it to core.
Most test changes are caused by the auto-date-bump behavior, which is needed to
revive commits automatically.
Note the existing code is not fully ready for the change. For example,
`precursors.get(node)`, `successors.get(node)` do not filter out markers that
are suppressed. For example, some code paths treat node as obsoleted if
`precursors.get(node)` is non-empty. That's no longer true. markbt's
planned visibility change might clean up this area a bit.
Regarding on tests, most changes are because of the "auto bump date" feature.
The graphlog change in `test-obsmarker-template.t` is because it creates a
cycle, which behaves differently in the new code. Half of obsmarker exchange
tests break. Given the fact that we do not use and will probably rewrite the
exchange algorithm, related tests are deleted, including
`test-obsolete-distributed.t`.
Reviewed By: DurhamG
Differential Revision: D9236661
fbshipit-source-id: 85b983f8bd46dece908c05f56bea2abbc8ffbaf6
Summary:
The old code was counting on `dirstate.rebuild` to setparent. However, that
could be too late.
Namely, the sparse extension would expect dirstate p1 to be available to load
the correct sparse profile. So let's set dirstate parent early before calling
dirstate rebuild.
Reviewed By: DurhamG
Differential Revision: D9375196
fbshipit-source-id: baed4a5ab329344ff3bb0b323046b05aece65f53
Summary:
The dirstate file consists parents and other metadata. Other metadata might
fail to load but p1 might still be readable. Let's bypass metadata reading logic
and read p1 directly, so we won't get a "null" rev in case only metadata (or
related treestate) gets corrupted.
Reviewed By: DurhamG
Differential Revision: D9375197
fbshipit-source-id: f44d622440125f373ebe09cd0032f05c69417aec
Summary:
With treedirstate and treestate, dirstate becomes harder to recover. The test
demonstrates related problems.
Reviewed By: DurhamG
Differential Revision: D9375195
fbshipit-source-id: a42ea84e810fe6cd9db8412c2a75fffbebdb6dc7
Summary:
We want to have two possible Python entry points for Mercurial:
- pure-python one (`hg/hg` script, the one which is renamed into `hg.real` during FB installation)
- the one to be called from a Rust binary
The reason we can't reuse the `hg/hg` to be called form the Rust binary is because this script will eventually not exist. We also need something in the known location, so we chose to put `entrypoint.py` into `mercurial/`.
This means that both the `hg` script and the `hg.rust` binary need to be able to find the `mercurial/` directory on the system. Traditionally, `hg` contained a `LIBDIR@` string, which was replaced with the parent directory of a `mercurial/` dir at install time. Thus we could install Mercurial in non-standard locations if we needed to. We keep this functionality for the `hg` script.
`mercurial/entrypoint.py` however knows that it lives under `mercurial/` and that `hgext/` and `hgdemandimport/` live alongside `mercurial/`. Thus, the parent dir of `mercurial/` is added as a first item of `sys,path` in `entrypoint.py`.
In case `entrypoint.py` is called from a Rust binary, Python import logic also adds the entire `mercurial/` dir to `sys.path`. This is not desired, since we use `absolute_import` and want to only be able to import things as `from mercurial import smth`. A good example is `json`: even with `absolute_import` enabled `import json` loads `mercurial/json.py` if hg is called as a Rust binary. Therefore, we explicitly remove `mercurial/` from `sys.path`.
Reviewed By: quark-zju
Differential Revision: D9336157
fbshipit-source-id: 22f69e7782d549915c91ef9a0ad0ed29f62a9304
Summary:
We already have the config set to make version one used in all our main
repositories, but it wasn't being used in all of our tests. Let's change
mutablehistorypack to default to creating version 1 historypacks now.
Reviewed By: quark-zju
Differential Revision: D9367017
fbshipit-source-id: 7d4055455cd8f8e6b2378c5f3a9993b2a40221a8
