Commit Graph

3580 Commits

Author SHA1 Message Date
Jun Wu
2247a2f8df test-cstore: run native Python tests directly
Previously the test sets up `LD_LIBRARY_PATH` and `PYTHONPATH`, then runs
Python tests.

Within Python code, setting `sys.path` would achieve the same effect of
setting `PYTHONPATH`. For `LD_LIBRARY_PATH`, it's necessary for C libraries.
But the only C library that cstore depends on is `lz4`, which is supposed to
use the system version. There is no C library provided by this repo -
features like sha1 are compiled in `cstore.so`.

Therefore it's unnecessary to have a separate `.t` file wrapping `.py`
tests. Let's just use `.py` tests directly.

Test Plan:
`./script/unit.py`

Make a temporary change to `cdatapack.c` so it fails unconditionally in
open_datapack. Build the repo in different ways: `make local` and
`python2 setup.py build_clib build_ext`. Then run the test by using
`$HG_CREW/tests/run-tests.py -l test-remotefilelog-datapack.py` without the
`hg-dev` environment and make sure it fails with the expected exception.

Differential Revision: https://phab.mercurial-scm.org/D1429
2017-11-16 10:56:44 -08:00
Durham Goode
6d828d5621 lint: fix lint errors 2017-11-16 10:08:05 -08:00
Durham Goode
cd569729a1 tests: fix too many files error in datapack store
If the os limited a given process to a <200 files open, this test would fail.
Let's change the cache size to be smaller to avoid this.

Also, it turns out the cache size and number of packs created doesn't actually
seem to affect this test. I changed the numbers in a few ways and the test never
failed.

Differential Revision: https://phab.mercurial-scm.org/D1435
2017-11-16 10:04:36 -08:00
Wojciech Lis
e6e8b252f8 Using workers in lfs prefetch
Added workers in lfs.
I had to remove the fine progress tracking because between processes in *nix and threads in windows (diffs will appear soon) the tracking of 1MB progress is quite tricky.
With our network tracking progress per file is way enough to see things moving.

This change gives close to 50% speedup on hg sparse --enable-profile when prefetch is run. My current understanding is that prefetch is ran when profile is enabled for the first time.

Test Plan:
Enable profile:
time hg sprase --enable-profile SparseProfiles/TestProfile.sparse
The profile contains 42k files including 9GB of lfs files
On my machine the time improves by 47% while still being dominated by lfs
download time

# Tip: In Git and Mercurial, use a branch like "T123" to automatically associate
# changes with the corresponding task.

Differential Revision: https://phab.mercurial-scm.org/D1424
2017-11-16 06:43:14 -08:00
Phil Cohen
0cb66efe79 repack: sort orphan nodes by size
Add `repack.chainorphansbysize` (default True).

When enabled, we take all orphaned nodes (nodes that are not part of a chain),
and put them into a new chain at the end, so we can get some minimal
compression out of them. Right now, they default to each being stored as
fulltexts, which is wasteful.

We sort the orphan chain by size, descending, to make the largest version
quickest to access, on the assumption that it is probably the newest. (This is
what Git does for its packed data, and it is a decent fallback if ancestry is
not available)

Example chain output, before:
```
A->B C D->E->F G H
```

After:
```
A->B D->E->F G->C->H
(assuming len(G)>=C=>H)
```

(I'm still adding a test case, but the code itself could be reviewed.)

Differential Revision: https://phab.mercurial-scm.org/D1272
2017-11-15 22:23:04 -08:00
Jun Wu
c59e252ac9 test-remotefilelog-datapack: print more debugging information
We got exception:

  unable to load pack ...: [Errno 24] Too many open files

on OS X machine where we think `ulimit -n` is big enough.

Let's add some debugging outputs so we can have more clues about it.

Note: the Python implementation of `mmap.mmap` actually keeps a fd open [1].
So the fix (65c38ccb9835) only reduces fd count from 2 * N to N, but does
not really solve the issue.

We might want to enforce the native code path to work around Python mmap
implementation.

[1]:  # Modules/mmapmodule.c
      m_obj->fd = dup(fd);
      if (m_obj->fd == -1) {
          Py_DECREF(m_obj);
          PyErr_SetFromErrno(mmap_module_error);
          return NULL;
      }

Differential Revision: https://phab.mercurial-scm.org/D1420
2017-11-15 11:14:25 -08:00
Phil Cohen
5740873245 rage: sort packs by size
This makes it easy to see if there are realy big packfiles.

Differential Revision: https://phab.mercurial-scm.org/D1422
2017-11-14 21:32:54 -08:00
Phil Cohen
d183f0fd68 tests: fix a laggart reference I missed 2017-11-14 19:02:51 -08:00
Phil Cohen
baa9059871 pushrebase: make conflict message a bit more helpful
A very minor change, but we should probably explain that local rebasing is
needed. (You might be forgiven for thinking that `pushrebase` would have
done that for you.)

Differential Revision: https://phab.mercurial-scm.org/D1352
2017-11-14 18:34:41 -08:00
Jeremy Fitzhardinge
d38c94c1d8 checkmessagehook: print more detail on what bad chars were found
Print which bad characters were found on what line, so that users can
fix the problem just from the hook message.

Differential Revision: https://phab.mercurial-scm.org/D1419
2017-11-14 16:52:45 -08:00
Durham Goode
2ee919bf0a treemanifest: support "{manifest % '{node}'}" template
When we changed the treemanifest {manifest} template output it broke the ability
to specifically ask for the node. This is important for tools migrating between
the old and new format. Let's add that back in.

Let's also make tweakdefaults change the '{manifest}' default template for all
repo's, not just tree repos.

Differential Revision: https://phab.mercurial-scm.org/D1418
2017-11-14 15:55:34 -08:00
Saurabh Singh
45048c9f5e remotefilelog-datapack: reenable the test failing continuous integration
Summary: The TODO has been addressed and this test should be able to run now.

Test Plan:
 - Checked that test host is capable of running the test now.
 - Ran all the tests.

Reviewers: #fbhgext, mitrandir

Reviewed By: #fbhgext, mitrandir

Differential Revision: https://phab.mercurial-scm.org/D1369
2017-11-14 10:06:34 -08:00
Durham Goode
a083494b5a infinitepush: respect treemanifest cansendtrees config
Treemanifest now has a unified spot to check if it can send trees. Infinitepush
needs to respect that, otherwise we're uploading trees to infinitepush that
might not be readable on other systems.
2017-11-13 11:22:57 -08:00
Jun Wu
090171ada4 vlqencoding: encodes integers to variable-length byte arrays
This is a common technique to store variable-length integers efficiently.
It's compatible with both Thrift and Protobuf [1].

It's intended to be used in:

  - On-disk file format to make the file compact and avoid issues like
    https://bz.mercurial-scm.org/5681 (Obsolete markers code crashes with
    metadata keys/values longer than 255 bytes).
  - Thrift layer.

[1]: https://developers.google.com/protocol-buffers/docs/encoding#varints

Test Plan:
```
cargo test
cargo clippy
```

Also ran a kcov coverage check and it says 100%.

```
cargo rustc --lib --profile test -- -Ccodegen-units=1 -Clink-dead-code -Zno-landing-pads
kcov --include-path $PWD/src --verify target/kcov ./target/debug/*-????????????????
```

Differential Revision: https://phab.mercurial-scm.org/D929
2017-11-10 12:12:04 -07:00
Jun Wu
962f35a673 test-check: backport py3 compat check from core hg
Hopefully this could prevent new files without `absolute_import` being
committed.

Differential Revision: https://phab.mercurial-scm.org/D553
2017-11-10 12:12:04 -07:00
Martijn Pieters
234ca8ad39 sparse: list available and active profiles
This lets you list your currently active profiles, as well as let you discover
new profiles, provided sparse.profile_directory is set.

Includes JSON output. Future revisions can build on this to provide richer
metadata (parsed from the profile files).

Differential Revision: https://phab.mercurial-scm.org/D1250
2017-11-10 14:39:11 +00:00
Phil Cohen
defc5b9ca1 repack: add --packsonly option to repack
Occasionally, callers to `hg repack` prefer to skip loose objects and only
repack packfiles. This adds an option to do so.

Differential Revision: https://phab.mercurial-scm.org/D1228
2017-11-09 10:32:15 -08:00
Durham Goode
1c92cab224 treemanifest: improve server side incremental repack
Currently an incremental repack on the server will repack the entire pack files,
and the new parts of the revlogs. The pack files can be very large and can take
a long, long time to run. So let's use the normal incremental pack heuristics to
minimize how often we have to do full repacks.

Differential Revision: https://phab.mercurial-scm.org/D1350
2017-11-09 10:28:53 -08:00
Durham Goode
5553819f97 treemanifest: clean up some imports
The next patch will be adding to these lists, so it's cleaner to fix them up
separately.

Differential Revision: https://phab.mercurial-scm.org/D1349
2017-11-09 10:28:53 -08:00
Kyle Lippincott
707ab29ae4 fileserverclient: add newlines on log messages
This fixes blackbox.log to not have two messages on the same line. This might be
undesirable if there's some other system using ui.log and this was *expected* to
be creating a single line. In that case, this might instead be a feature request
for blackbox to not insert time/user/node/etc. if it's a consecutive log from
the same 'service'. Currently, the docstring for ui.log says "*msg should be a
newline-terminated format string to log", so this is bringing these uses in
line with that.

Sample blackbox.log without this fix:

2017/11/06 14:41:23 spectral @a659d684cdf40d442d38f1ea65ee618f8b21d4b6 (25545)> remote cache hit rate is 0 of 9 2017/11/06 14:41:23 spectral @a659d684cdf40d442d38f1ea65ee618f8b21d4b6 (25545)> Success2017/11/06 14:45:24 spectral @dcbd198c160cfc8fc6d4a877aa5ed9296f98ee3c (25545)> pythonhook-update: remotefilelog.wcpprefetch finished in 0.00 seconds
2017-11-09 10:16:44 -08:00
Durham Goode
3d4b814451 remotefilelog: fix fileserver metadata write store
We need to pass the metadata store in, but we were passing the content store.
This only worked because currently we never use the metadata store on the
fileserver client for writing.
2017-11-09 09:19:21 -08:00
Mateusz Kwapich
a07f54b7d2 remotefilelog: disable testPacksCache
Summary:
It's failing on our tests macs because they can't have that many files open at
the time

Test Plan: tested on my laptop, fingers crossed

Reviewers: #mercurial, ikostia

Reviewed By: ikostia

Subscribers: mjpieters, medson

Differential Revision: https://phabricator.intern.facebook.com/D6285344

Tasks: T23454758

Signature: 6285344:1510247301:f295431e05836921288c313034864c3ec616b8af
2017-11-09 09:08:45 -08:00
Thomas Jacob
a32f14a7e1 arcdiff: add CA path/timeout support to Phabricator conduit calls
Summary:
Fixing SSL verify bug

https://fb.facebook.com/groups/scm/permalink/1472198416163107/

Test Plan:
PYTHONPATH=/home/tja/local/facebook-hg-rpms/fb-hgext/ /home/tja/local/facebook-hg-rpms/hg-crew/hg diff --since-last-arc-diff
no longer fails with SSL error


$ source hg-dev
$ cd fb-hgext/tests
(hg-dev) tja@devvm2620:tests  (6b76aa8)$ rt
.s.............................................................ss.s.....s.......s....ss..s..s......s.....s..ss...s........s.ss......s..s...................................s........................................................................
Skipped test-p4fastimport-gitfusion-race-condition.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-branch.t: missing feature: Perforce server and client
Skipped test-p4fastimport-blobcommit.t: missing feature: Perforce server and client
Skipped test-p4fastimport-blobcommit-lfs.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-incremental.t: missing feature: Perforce server and client
Skipped test-p4fastimport-limit.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-lfs.t: missing feature: Perforce server and client
Skipped test-lfs-test-server.t: missing lfs-test-server
Skipped test-p4fastimport-import-modes.t: missing feature: Perforce server and client
Skipped test-infinitepush-sql.t: missing getdb.sh
Skipped test-p4fastimport-criss-cross.t: missing feature: Perforce server and client
Skipped test-p4fastimport-transaction.t: missing feature: Perforce server and client
Skipped test-p4fastimport-case-insensitive-rename.t: missing feature: Perforce server and client
Skipped test-infinitepush-backup-sql.t: missing getdb.sh
Skipped test-p4fastimport-import-deletes.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-client-mapping.t: missing feature: Perforce server and client
Skipped test-p4fastimport-case-insensitivity.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-special-characters.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-parallel.t: missing feature: Perforce server and client
Skipped test-p4fastimport-import-badclient.t: missing feature: Perforce server and client
# Ran 223 tests, 21 skipped, 0 failed.

Reviewers: #mercurial, mitrandir

Reviewed By: mitrandir

Subscribers: mitrandir, mjpieters, awestern, medson, #sourcecontrol, samuelkelly

Differential Revision: https://phabricator.intern.facebook.com/D6272329

Signature: 6272329:1510245174:2969aa7ab17b45f6656e93301806c0a9b157db29
2017-11-09 08:43:57 -08:00
Saurabh Singh
c4ec4d2889 basepack: add a lru cache for the pack files
Summary:
To speed up pack lookups (especially when there are lots of packs), we
should maintain an lru ordering of the packs and perform searches in that
order, since it's likely the next entry we search for will be in the same pack
file as the last entry we searched for. This commit achieves the same.

Test Plan:
 - Ran all the tests.

 - Created ~2k pack files in a large repo.

  - Time taken without the cache:
    - `hg update b` while at a: ~18 minutes.
    - `hg update a` while at b: ~23 seconds.

  - Time taken with the cache:
    - `hg update b` while at a: ~14 seconds.
    - `hg update a` while at b: ~9 seconds.

Reviewers: #fbhgext, durham

Reviewed By: #fbhgext, durham

Subscribers: durham

Differential Revision: https://phab.mercurial-scm.org/D1208
2017-11-08 10:25:12 -08:00
Saurabh Singh
9063582c84 remotefilelog-datapack: refactor createPack method to include pack directory
Summary:
createPack had no option to specify the pack directory because of
which it can only create one pack in a directory. This restriction was in place
because we only test the datapack and not the datapackstore during these tests.
This commit makes the method more generic and includes the option to specify
the directory for creating the packs. This would allow for the datapackstore to
be tested while reusing most of the current logic.

Test Plan: Ran all the tests.

Reviewers: #fbhgext, durham

Reviewed By: #fbhgext, durham

Subscribers: durham

Differential Revision: https://phab.mercurial-scm.org/D1325
2017-11-08 10:25:12 -08:00
Sergey Nikolaienkov
d224a11248 tweakdefaults: provide advice abouthg uncommit
Advice using `hg uncommit` when a command to prune (like `hg strip`) but keeping the changes (with `--keep` option)

Test Plan:
Run `hg strip -k\--keep` a "'hg uncommit' provides a better UI for undoing commits while keeping the changes" should show up.
Run `hg strip` w/o `--keep` option,  "'hg hide' provides a better UI for hiding commits" should be shown

Differential Revision: https://phab.mercurial-scm.org/D1335
2017-11-08 07:57:03 -08:00
Durham Goode
b13b24ccc1 perftweaks: fix hg book regression
When the dirstate got refactored, we lost the check that only logged the
dirstate size if the dictionary was already populated. This caused a regression
in hg bookmark times (since it normally doesn't populate the dirstate map).
2017-11-07 15:35:26 -08:00
Maxime Montinet
dba2c32225 infinitepush: add support for deleting scratch bookmarks from local
Summary:
Add support to hg book -d to delete scratch infinitepush bookmarks

Uses functions from remotenames to rewrite the remotenames cache omitting
the specified scratch bookmarks

Test Plan:
cd ~/facebook-hg-rpms/fb-hgext/tests
source ../../hg-dev
rt test-infinitepush-*.t --extra-config-opt=devel.all-warnings=False

Reviewers: #mercurial, cdown, stash, durham

Differential Revision: https://phabricator.intern.facebook.com/D6221853

Tasks: T22615396
2017-11-07 11:43:56 -08:00
Phil Cohen
37ed176ad7 debugdatapack: return 1 and warn if there are invalid entries
An invalid entry is any entry with a base not in the pack, or whose deltabases
form a cycle.

If there are any entries like that, the output will look like this:

```
(Root):
Node          Delta Base    Delta Length  Blob Size
665a7e7913af  e66038a2894e  61            2142
52bd634be310  000000000000  2142          2142
8b5847087ce0  000000000000  2142          2142
960f5acb3e99  edf2ffd7daab  162           2142
b7d7e5aa692e  8b5847087ce0  162           2142
cdcc4d74d667  960f5acb3e99  324           2142
Total:                      14652         48920     (70.0% smaller)
Bad entry: 960f5acb3e99 has an unknown deltabase (edf2ffd7daab)
Bad entry: b7d7e5aa692e has an unknown deltabase (edf2ffd7daab)
2 invalid entries
```

Differential Revision: https://phab.mercurial-scm.org/D1271
2017-11-07 11:23:29 -08:00
Durham Goode
c440ffa356 treemanifest: fix commit hooks for hybrid pushes
There is a bug in the upstream bundlerepo implementation that causes it to
infinite loop if the manifestlog isn't backed by a revlog. I've sent a fix
upstream, and this adds a test to cover that case.
2017-11-07 10:24:07 -08:00
Durham Goode
ee2c606728 treemanifest: support the {manifest} template
The core Mercurial manifest template prints the rev number and the short hash.
Since treemanifest doesn't have rev numbers, this has to change. Let's just have
it print the whole hash, since manifest hashes are usually only ever used by
automation which probably wants the whole hash anyway.

Differential Revision: https://phab.mercurial-scm.org/D1305
2017-11-07 09:06:24 -08:00
Durham Goode
579b7ba53d treemanifest: allow hybrid repos to make treeonly commits
If a hybrid repo pulls in a treeonly commit from a treeonly client, it
previously couldn't commit on top of it because it tried to read the flat
manifest. This patch makes it possible for the hybrid repo to make a treeonly
commit if it is committing on top of a treeonly commit (i.e. where the manifest
only exists in the tree store, not in the flat manifest revlog).

This makes it easier for multiple types of repositories to interact, and to flip
back and forth between treeonly and non-treeonly as we migrate.

Differential Revision: https://phab.mercurial-scm.org/D1304
2017-11-07 09:06:24 -08:00
Phil Cohen
7bc0614e4c repack: always use all history packs for ancestry data
When repacking data, we sort data nodes topologically by ancestry in order to
ensure the best (smallest) delta chain. Unfortunately the history we use to do
this will be whatever history packs the samre repack job chose for its history
repacking portion, which might be comically small and/or irrelevant.

To fix this, select all history packfiles, and pass them to the data packer as
`fullhistory`. Print a debug warning whenever any nodes are missing ancestry.

Differential Revision: https://phab.mercurial-scm.org/D1227
2017-11-06 19:17:56 -08:00
Phil Cohen
d4642ef2ca debugdatapack: suppport passing multiple files
Also print the name of the packfile being inspected, and \itweak newlines a bit.

This simplies debugging several packfiles in tests.

Differential Revision: https://phab.mercurial-scm.org/D1326
2017-11-06 19:09:15 -08:00
Phil Cohen
6a5d3a9d19 packs: improve packfile metrics
The previous solution was incomplete. This solution logs once per run, with two
separate metrics (filestore_ and treestore_), each logging the number of packs
and bytes. I also did some refactoring.

Differential Revision: https://phab.mercurial-scm.org/D1309
2017-11-06 18:13:55 -08:00
Durham Goode
5987282c25 treemanifest: test commit hooks with pushrebase 2017-11-06 17:26:08 -08:00
Phil Cohen
ef47b31d2f debugdatapack: print delta and blob size totals and compression %
Also print "(empty name)" if the filename is empty.

Differential Revision: https://phab.mercurial-scm.org/D1259
2017-11-05 21:45:40 -08:00
Phil Cohen
a8cfab1484 repack: add blob size to metadata if it's missing
When trees are fetched from the server as packs, metadata isn't included, as
it's not supported in the protocol. Fast size information is useful, since
we have access to the fulltext during a repack, add the metadatan then.

This will be needed for sized-based sorting of manifest entries.

Differential Revision: https://phab.mercurial-scm.org/D1255
2017-11-05 18:49:10 -08:00
Phil Cohen
53d2c02095 debugdatapack: add blob size
It's useful to know the size of the resultant object, not just the delta entry.

Differential Revision: https://phab.mercurial-scm.org/D1254
2017-11-05 18:45:21 -08:00
Durham Goode
d89d7b5249 tests: update with upstream obsmarker changes
Upstream has enabled the effect flag metadata by default. Add it to our test
output.
2017-11-03 12:40:04 -07:00
Mark Thomas
868ac70976 rage: add info useful for infinitepushbackup debug
Adds information that is useful for debugging infinitepush backup to the rage
output.  In particular:

- Full node hashes in the unfiltered smartlog, so that they can be looked up
  in infinitepush.

- The contents of infinitepushbackupstate.

- The last 100 lines of the infinitepush backup logs for this repo.

Differential Revision: https://phab.mercurial-scm.org/D1264
2017-11-03 09:34:36 -07:00
Durham Goode
8f4b8e3894 treemanifest: add sendtrees config back
It turns out we have some machines that don't have treemanifest enabled, so we
need to add back the config that prevents a client from sending trees.
2017-11-03 09:24:39 -07:00
Phil Cohen
1b759fa578 progressfile: fix last change 2017-11-02 19:27:20 -07:00
Phil Cohen
6c65d42bea progressfile: never wrap if progress.statefile isn't set or is empty
I wasn't 100% sure this is side effect-free if you enable the extension but
don't specify a progressfile, so let's be extra safe.

Differential Revision: https://phab.mercurial-scm.org/D1308
2017-11-02 19:24:10 -07:00
Pulkit Goyal
d3b6e1c63c fbhistedit: add support for json input to histedit
This patch adds support to histedit command to take input from json. The JSON
should be of following format:

{ "histedit": [
                {"action": "...", "node": "..."},
                {"action": "...", "command": "..."},
                {...}
              ]
}

For actions except "exec" and "execr", "node" is required and for "exec" and
"execr", "command" should be there.

The support is plugged in directly and is not hidden behind a config flag. After
this support, the parser which parses the commands file will assume that JSON is
given and will fallback to original parsing if it fails to convert the data in
the file to JSON.
In case where input is JSON but a key is missing, status message is shown and we
fallback to normal parsing.

Both small and large verbs are supported for the action part in JSON.

Differential Revision: https://phab.mercurial-scm.org/D1263
2017-11-03 05:30:12 +05:30
Pulkit Goyal
b00998e4c9 fbhistedit: clean up mess around importing
Differential Revision: https://phab.mercurial-scm.org/D1262
2017-11-03 05:30:12 +05:30
Pulkit Goyal
bb8189683d copytrace: register the config options
One config option is left as that will be dropped in an upcoming patch.

Differential Revision: https://phab.mercurial-scm.org/D1278
2017-11-02 17:00:12 -07:00
Pulkit Goyal
ca6eff4576 copytrace: make import follow the style of hg-core
Differential Revision: https://phab.mercurial-scm.org/D1277
2017-11-02 17:00:12 -07:00
Durham Goode
e4292521ee sparse: fix typo 2017-11-02 13:42:06 -07:00
Durham Goode
81329af9b4 sparse: prevent devel warning
It looks like the devel warning detection complains about reading
extensions.fbsparse with a default value. Let's just suppress it.

Differential Revision: https://phab.mercurial-scm.org/D1294
2017-11-02 13:39:45 -07:00