Boris Feld <boris.feld@octobus.net> [Mon, 16 Jul 2018 16:43:35 +0200] rev 38711
revset-benchmark: use a generic revset to test `heads(commonancestors())`
This allow to benchmark revset performance in other repositories than just
the mercurial one.
Boris Feld <boris.feld@octobus.net> [Mon, 16 Jul 2018 16:22:43 +0200] rev 38710
revlog: reintroduce `revlog.descendant` as deprecated
Reintroduce `revlog.descendant` to help extensions authors update their
extensions in order to use the new API.
Boris Feld <boris.feld@octobus.net> [Mon, 16 Jul 2018 16:21:12 +0200] rev 38709
context: reintroduce `ctx.descendant` as deprecated
Reintroduce `ctx.descendant` to help extensions authors update their
extensions in order to use the new API.
Yuya Nishihara <yuya@tcha.org> [Sun, 15 Jul 2018 18:32:17 +0900] rev 38708
obsolete: explode if metadata contains invalid UTF-8 sequence (API)
The current metadata API can be a source of bugs since it forces callers to
process encoding conversion by themselves. So let's make it reject bad data
as a last ditch. I assume there's no metadata field which is supposed to store
arbitrary BLOB like transplant_source.
Yuya Nishihara <yuya@tcha.org> [Sun, 15 Jul 2018 18:24:57 +0900] rev 38707
obsolete: store user name and note in UTF-8 (
issue5754) (BC)
Before, user names were stored in local encoding and transferred across
repositories, which made it impossible to restore non-ASCII user names on
different platforms. This patch fixes new markers to be encoded in UTF-8
and decoded back to local encoding when displaying. Existing markers are
unfixable so they may result in mojibake.
I don't like the API that requires metadata dict to be UTF-8 encoded, which
is a source of bugs, but there's no abstraction layer to process the encoding
thingy efficiently. So we apply the same rule as extras dict to obsstore
metadata.
Yuya Nishihara <yuya@tcha.org> [Sun, 15 Jul 2018 18:22:40 +0900] rev 38706
obsolete: clarify users in markerusers() never contain None
Yuya Nishihara <yuya@tcha.org> [Thu, 12 Jul 2018 23:07:29 +0900] rev 38705
revset: special case commonancestors(none()) to be empty set
This matches the behavior of ancestor(none()).
From an implementation perspective, ancestor() and commonancestors() are
intersection, and ancestors() is union, so it would make some sense that
commonancestors(none()) returned all revisions. However, ancestor(none())
isn't implemented as such, which breaks ancestor(x) == max(commonancestors(x)).
From a user perspective, ancestors of nothing is nothing whichever type
of operation the ancestor predicate does.
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Jul 2018 23:01:53 +0900] rev 38704
revset: clarify heads() order doesn't matter while computing common ancestors
Follows up
5460926352ee and
52f19a840543.
Yuya Nishihara <yuya@tcha.org> [Sat, 14 Jul 2018 10:51:52 +0900] rev 38703
hghave: require clang-format >= 6 due to output change
Yuya Nishihara <yuya@tcha.org> [Sat, 14 Jul 2018 10:50:10 +0900] rev 38702
cext: reformat with clang-format 6.0
It appears some changes in clang-format affect our code. I didn't dig into
that deeper since the new output looks better.
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:52:35 +0900] rev 38701
py3: use bytes() to byte-stringify Abort message in handleremotechangegroup()
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:44:51 +0900] rev 38700
py3: don't str() to byte-stringify object in test-bundle2-remote-changegroup.t
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:39:11 +0900] rev 38699
py3: byte-stringify literals in extension in test-bundle2-remote-changegroup.t
# skip-blame just some b''
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:41:00 +0900] rev 38698
py3: open file in binary mode in test-bundle2-remote-changegroup.t
Boris Feld <boris.feld@octobus.net> [Fri, 01 Jun 2018 12:10:34 +0200] rev 38697
statprof: small if cleanup
Explicitly testing for None to avoid comparison bugs.
Boris Feld <boris.feld@octobus.net> [Sat, 14 Jul 2018 02:10:43 +0200] rev 38696
store: assert the fncache have been loaded if dirty
This should catch fncache corruption as the one that existed in
`perffncachewrite`.
Boris Feld <boris.feld@octobus.net> [Sat, 14 Jul 2018 02:09:47 +0200] rev 38695
perffncachewrite: load fncache after lock is acquired
Without this patch, running perffncachewrite on a repository destroy its
fncache.
Lock Acquisition drops various caches, including the fncache one. Then writing
of an non-loaded fncache result into an empty one.
Boris Feld <boris.feld@octobus.net> [Fri, 22 Jun 2018 11:02:42 +0100] rev 38694
perf: add a 'perf.all-timing' option to display more than best time
Minimal time is a useful information, but it is useful to have a wider view on
the performance picture.
Boris Feld <boris.feld@octobus.net> [Wed, 11 Jul 2018 10:46:15 +0200] rev 38693
perf: document the perfmanifest command
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 22:38:29 +0900] rev 38692
fileset: remove fullmatchctx class
It's exactly the same as matchctx.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 22:35:21 +0900] rev 38691
fileset: remove subset and unused filtering functions from matchctx
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 22:31:51 +0900] rev 38690
fileset: remove callexisting flag and mctx.existing() (API)
They are no longer needed since any files are included as long as they are
passed in to the matcher.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 19:55:10 +0900] rev 38689
fileset: rewrite predicates to return matcher not closed to subset (API) (BC)
This makes fileset expression open to any input, so that we can just say
"hg status 'set: not binary()'" to select text files including unknowns.
With this and removal of subset computation, 'set:**' becomes as fast as
'glob:**'. Further optimization will probably be possible by narrowing the
file tree to compute status for example.
This also fixes 'subrepo()' to not ignore the current mctx.subset.
.. bc::
The fileset expression may include untracked files by default. Use
``tracked()`` to explicitly filter out files not existing at the context
revision.
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Jul 2018 23:49:48 +0900] rev 38688
highlight: use matcher API to test if file should be pygmentized
Prepares for the upcoming API change. We'll no longer have to call the
fileset function directly since the cost of the matcher-based fileset will
become O(number of tests) from O(number of files in subset).
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 20:58:10 +0900] rev 38687
fileset: parse argument of size() by predicate function
This change is necessary to pass in a size expression to predicatematcher.
See the next patch.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 22:19:56 +0900] rev 38686
fileset: add "tracked()" to explicitly select files in the revision
I'm going to rewrite filesets to be match predicates, which means basic
patterns such as '*' will no longer be "closed" to the subset constructed
from the ctx.
Good thing is that 'hg status "set:not binary()"' can include unknown files
out of the box, and fileset computation will likely to be faster as we won't
have to walk dirstate twice, for example. Bad thing is that we can't select
files at a certain revision by 'set:revs(REV, **)' since '**' is "open" to
any paths. So, this patch introduces "tracked()" as a replacement for the '**'
in the example above.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:11:49 +0900] rev 38685
fileset: rewrite andset() to not use mctx.narrow()
New code is less efficient than the original, but it helps porting andset()
to matcher composition. This will be cleaned up later.
This effectively disables the fullmatchctx magic since mctx will never be
demoted to the matchctx. The fullmatchctx class will be removed later.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 20:02:53 +0900] rev 38684
fileset: add helpers to make predicatematcher and nevermatcher
These functions will be used to compose a tree of matchers from a fileset
expression.
Yuya Nishihara <yuya@tcha.org> [Sat, 14 Jul 2018 13:21:49 +0900] rev 38683
phases: micro-optimize newheads() to not create context objects
Yuya Nishihara <yuya@tcha.org> [Sat, 14 Jul 2018 13:19:18 +0900] rev 38682
phases: remove excessive optimization from newheads() (
issue5939)
This function is intended to compute 'heads(::heads - roots::)', but it
failed because 'heads + parents(roots)' missed sibling branches of the roots.
That's why the public heads slipped down from D to B in the example added by
2a227782e754 "tests: add test demonstrating phase loss when cloning":
> E draft
> |\Z draft
> | Y draft
> D | public
> | X draft
> C/ public
> B public
> A public
where heads = {E, Z},
roots = {X}
Sushil khanchi <sushilkhanchi97@gmail.com> [Sun, 15 Jul 2018 15:48:18 +0530] rev 38681
rebase: remove unused variable "release" and an extra blank line
Differential Revision: https://phab.mercurial-scm.org/D3947
Sushil khanchi <sushilkhanchi97@gmail.com> [Sat, 14 Jul 2018 23:00:22 +0530] rev 38680
rebase: remove unnecessary confirm block
Removed unnecessary 'if confirm:' block as that thing is now
handled at 'finally'.
Differential Revision: https://phab.mercurial-scm.org/D3945
Sushil khanchi <sushilkhanchi97@gmail.com> [Sat, 14 Jul 2018 08:59:42 +0530] rev 38679
rebase: in --confirm option just abort if hit a conflict
Before this patch, it was prompting the user in both cases 1) when
there is no conflict 2) when there is at least one conflict. But
for simplicity we can just abort if we hit a conflict and no need to
prompt in that case.
Differential Revision: https://phab.mercurial-scm.org/D3944
Joerg Sonnenberger <joerg@bec.de> [Thu, 12 Jul 2018 15:29:03 +0200] rev 38678
pullbundle: fix handling of gzip bundlespecs
Differential Revision: https://phab.mercurial-scm.org/D3933
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 11 Jul 2018 16:44:33 -0700] rev 38677
tests: add test demonstrating phase loss when cloning (
issue5939)
The added tests demonstrate that phases exchange when using the
listkeys based phases exchange fails to preserve public phase in
a certain scenario when a merge is a phase root. Both non-bundle2
and bundle2 prior to the binary phase data part are buggy.
Differential Revision: https://phab.mercurial-scm.org/D3932
Gregory Szorc <gregory.szorc@gmail.com> [Fri, 13 Jul 2018 14:20:12 -0700] rev 38676
scmutil: rewrite docstring for filecache
The old docstring was incorrect in that it said that subsequent
calls perform a stat() and refresh the object if things change.
This is not how things work: __get__ populates obj.__dict__[self.sname]
with the result of the decorated function and returns this value
without validation on subsequent calls, if available.
The correct usage of this type is kinda wonky. It would probably
benefit from a refactor. But I don't have time to do that right
now. But we can change the docstring so others aren't entrapped by
its lies (like I was when using repofilecache in a Mozilla extension).
Differential Revision: https://phab.mercurial-scm.org/D3943
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 12 Jul 2018 22:35:54 +0530] rev 38675
rebase: correct misleading message in --confirm option
Differential Revision: https://phab.mercurial-scm.org/D3939
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 12 Jul 2018 22:23:51 +0530] rev 38674
rebase: make sure we don't loose the return code in --confirm option
return _dorebase() to make sure it returns 'return code'.
Differential Revision: https://phab.mercurial-scm.org/D3938
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 15:12:01 -0700] rev 38673
rebase: use revnums (not nodes) for set of extinct revisions
There is no need to convert extinct revisions to nodeids.
Differential Revision: https://phab.mercurial-scm.org/D3942
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 15:01:47 -0700] rev 38672
rebase: avoid converting from nodes to revnums twice
In the case where the node has successors, but none of them is an
ancestor of the destination, we would iterate over the successor nodes
twice, check if they're in the repo and convert them to revnums. I
doubt it's a measureable cost, but it gets simpler this way too.
Differential Revision: https://phab.mercurial-scm.org/D3941
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 15:03:39 -0700] rev 38671
rebase: reduce scope of a variable
Differential Revision: https://phab.mercurial-scm.org/D3940
Martin von Zweigbergk <martinvonz@google.com> [Thu, 12 Jul 2018 08:22:28 -0700] rev 38670
context: rename descendant() to isancestorof()
This makes the direction much clearer, IMO.
Differential Revision: https://phab.mercurial-scm.org/D3936
Martin von Zweigbergk <martinvonz@google.com> [Thu, 12 Jul 2018 09:25:02 -0700] rev 38669
copies: delete now-unnecessary check for "a == b" before "a.descendant(b)"
Unnecessary since
879cbdde63df (revlog: do inclusive descendant
testing (API), 2018-06-21).
Differential Revision: https://phab.mercurial-scm.org/D3935
Martin von Zweigbergk <martinvonz@google.com> [Thu, 12 Jul 2018 08:14:21 -0700] rev 38668
revlog: delete isdescendantrev() in favor of isancestorrev()
As agreed on by Boris, Yuya, and me on D3929.
Differential Revision: https://phab.mercurial-scm.org/D3934
Sushil khanchi <sushilkhanchi97@gmail.com> [Sat, 30 Jun 2018 12:42:49 +0530] rev 38667
rebase: add --confirm option
This feature adds a functionality in rebase to confirm before applying
changes.
When there is no conflict and user confirm to apply actions, we just
finish the unfinished rebase. But when there is a conflict and user
confirm to apply actions then we can't just finish rebasing using
rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so
we have to abort and run on-disk merge in this case.
And if user doesn't confirm to apply actions then simply abort the rebase.
Differential Revision: https://phab.mercurial-scm.org/D3870
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 16:29:23 -0700] rev 38666
revlog: introduce a isancestorrev() and use it in rebase
Differential Revision: https://phab.mercurial-scm.org/D3931
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 16:37:30 -0700] rev 38665
revlog: make isdescendantrev(a, b) check if a < b
This check was taken from rebase.py. It seems to make sense to move it
here, but I haven't done any measurements.
Differential Revision: https://phab.mercurial-scm.org/D3930
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 16:21:41 -0700] rev 38664
revlog: replace descendant(b, a) by isdescendantrev(a, b) (API)
The "is" is to match "isancestor" and to make it clear that it doesn't
return a descendant. The "rev" is to make it clear that it's not about
nodeids (unlike e.g. isancestor()). The argument order change is just
seems more natural (and makes isancestor() less confusing).
Differential Revision: https://phab.mercurial-scm.org/D3929
Martin von Zweigbergk <martinvonz@google.com> [Wed, 11 Jul 2018 16:27:40 -0700] rev 38663
revlog: move comment about commonancestorsheads where it's used
Differential Revision: https://phab.mercurial-scm.org/D3928
Kyle Lippincott <spectral@google.com> [Wed, 11 Jul 2018 13:02:06 -0700] rev 38662
removeemptydirs: add test for `hg split` inside a disappearing directory
Differential Revision: https://phab.mercurial-scm.org/D3927
Martijn Pieters <mj@zopatista.com> [Wed, 11 Jul 2018 14:28:13 +0100] rev 38661
fncache: avoid loading the filename cache when not actually modifying it
With time, fncache can become very large. The mozilla-central repo for example,
has a 31M and growing fncache file. Loading this file takes time (280ms for the
mozilla-central repository).
In many scenarios, we don't need to load fncache at all. For example, when
committing changes to existing files, or pushing such commits to another clone.
This patch detects when a name is added via store.vfs(), and only loads the
cache if a) the data metadata file doesn't already exist, or b) when opening
for appending, the data or metadata file exists but has size (a transaction
rollback leaves behind such files).
Benchmarks (run on Macos 10.13 on a 2017-model Macbook Pro with Core i7 2.9GHz
and flash drive), each test without and with patch run 5 times:
* committing to an existing file, against the mozilla-central repository.
Baseline real time average 2.3736, with patch 1.9884.
* unbundling a large changeset consisting *only* of existing-file modifications
(159 revisions, 1050 modifications, mozilla-central
4a250a0e4f29:
beea9ac7d823), into a clone limited to the ancestor revision of
that revset). Baseline real time average 1.5048, with patch 1.3108.
Sune Foldager <cryo@cyanite.org> [Wed, 11 Jul 2018 16:11:33 +0200] rev 38660
tests: add diff color trailing whitespace test
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 13:40:50 -0400] rev 38659
scmutil: fix shortesthexnodeidprefix on Python 3 for 0-prefixed nodes
This fixes test-bookmarks.t on Python 3 (which had regressed.)
Differential Revision: https://phab.mercurial-scm.org/D3926
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 12:36:37 -0400] rev 38658
tests: add missing b prefix in test-context.py
# skip-blame just a b prefix
Differential Revision: https://phab.mercurial-scm.org/D3925
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 11:43:22 -0400] rev 38657
manifest: just duplicate the definition of items as iteritems
The forwarding trick was failing test-check-interfaces on Python
3. Duplicating a line of code is easy enough I'm doing that rather
than try and figure out what's going on in any kind of detail.
Differential Revision: https://phab.mercurial-scm.org/D3924
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 11:41:14 -0400] rev 38656
tests: properly sort imports in test-nointerrupt.t
Somehow this was only detected in Python 3.
Differential Revision: https://phab.mercurial-scm.org/D3923
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 11:34:41 -0400] rev 38655
revlog: adjust doctest examples to be portable to Python 3
The range() builtin returns a special object rather than a list, but
we really wanted a list in these examples.
Differential Revision: https://phab.mercurial-scm.org/D3922
Augie Fackler <augie@google.com> [Wed, 11 Jul 2018 13:41:47 -0400] rev 38654
py3: whitelist 3 more passing tests caught with the ratchet
Differential Revision: https://phab.mercurial-scm.org/D3921
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Jul 2018 22:55:30 +0900] rev 38653
grep: hide cryptic revision number by default
I believe nobody would want to see the "
2147483647:" prefix while grepping
working directory files.
The wdir revision is still visible if "-r wdir()" is specified since a revset
may point to more than one revisions, and it seems confusing to change the
visibility dynamically by the number of the matched revisions.
Differential Revision: https://phab.mercurial-scm.org/D3920
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 22:06:04 +0900] rev 38652
grep: restore pre-
9ef10437bb88 behavior, enable wdir search by tweakdefaults
Unfortunately, python-hglib relies on the original grep behavior and is
documented as such. Even though we agreed to introduce the BC, we shouldn't
break existing libraries.
So this patch flips the default again and move the new default to
ui.tweakdefaults. We could instead use HGPLAIN to turn this flag off, but
that would be rather confusing as the old/new behaviors are quite different.
Differential Revision: https://phab.mercurial-scm.org/D3919
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:51:47 +0900] rev 38651
grep: add config knob to enable/disable the default wdir search
This allows us to conditionally enable the new behavior to unbreak
python-hglib. See the next patch.
The config option is undocumented since the --all-files is still experimental
and isn't fully implemented. It can be moved to [experimental] if that's
preferred.
Differential Revision: https://phab.mercurial-scm.org/D3918
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:35:31 +0900] rev 38650
grep: search working directory files by default if --all-files is specified
The default was -rtip:0 before, but "--all-files -rtip:0" would be the most
useless combination, and it isn't supported yet. Let's change the default to
something useful.
This isn't flagged as BC since --all-files isn't released.
Differential Revision: https://phab.mercurial-scm.org/D3917
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:23:18 +0900] rev 38649
grep: reject --diff --all-files
This combination doesn't make any sense since --diff is the flag to search
change history, whereas --all-files is to include unmodified contents.
Differential Revision: https://phab.mercurial-scm.org/D3916
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Jul 2018 21:15:52 +0900] rev 38648
grep: rename --allfiles to --all-files
This matches the config name to be added.
Note that we don't have to keep the old flag since it isn't released yet.
Differential Revision: https://phab.mercurial-scm.org/D3915
Boris Feld <boris.feld@octobus.net> [Wed, 11 Jul 2018 13:48:44 +0200] rev 38647
debugdeltachain: protect against 0 readsize
If you don't read any data, read density should be 1.
Paul Morelle <paul.morelle@octobus.net> [Thu, 21 Jun 2018 18:19:57 +0200] rev 38646
debugdeltachain: avoid division by zero when a chain is empty
The two ratios chainratio and extraratio are computed using dividers
that may be zero when the file is empty.
As the denominators are integers, the limit of the ratio "just before zero" is
the numerator value itself.
If the numerator itself is zero, the ratio value is still meaningful: in both
cases, a "good" value is a low ratio, and a size of zero is the optimal case.
Danny Hooper <hooper@google.com> [Mon, 09 Jul 2018 15:33:49 -0700] rev 38645
tests: prevent conflict markers in test case from triggering warnings
Broadly, having lines that begin with several '<' tends to trigger tools that
try to warn you about unresolved conflicts. It will save some headaches to
tweak this string literal to avoid that.
Differential Revision: https://phab.mercurial-scm.org/D3897
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 12:20:57 +0200] rev 38644
revlog: enforce chunk slicing down to a certain size
Limit maximum chunk size to 4x final size when reading a revision from a
revlog. We only apply this logic when the target size is known from the
revlog.
Ideally, revlog's delta chain would be written in a way that does not trigger
this extra slicing often. However, having this second guarantee that we won't
read unexpectedly large amounts of memory in all cases is important for the
future. Future delta chain building algorithms might have good reason to
create delta chain with such characteristics.
Including this code in core as soon as possible will make Mercurial 4.7
forward-compatible with such improvement.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 11:57:33 +0200] rev 38643
revlog: postprocess chunk to slice them down to a certain size
After the density slicing is done, we enforce a maximum chunk size to avoid
memory consumption issue.
Boris Feld <boris.feld@octobus.net> [Wed, 11 Jul 2018 00:35:01 -0700] rev 38642
revlog: add function to slice chunk down to a given size
It is possible to encounter situations where the slicing based on density did
not achieve chunk smaller than the 4*textlength limit. To avoid extra memory
consumption in those cases, we need to be able to break down chunk to a given
size. Actual caller comes in the next changesets.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 11:53:36 +0200] rev 38641
revlog: extract density based slicing into its own function
We are going to introduce another slicing step. We start by extracting the
existing one into its own function.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:34:33 +0200] rev 38640
revlog: document and test _slicechunk
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:18:46 +0200] rev 38639
revlog: add a doctest for _segmentspan
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:04:44 +0200] rev 38638
revlog: add a doctest to _trimchunk
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 10:04:31 +0200] rev 38637
revlog: introduce a tiny mock of a revlog class
This will be used in various function doctest added in the next changesets.
The class seems small enough to live in the module directly.
Paul Morelle <paul.morelle@octobus.net> [Thu, 17 May 2018 15:10:36 +0200] rev 38636
revlog: _segmentspan computes the byte span of a segment
Refactor out this code to be used somewhere else in a next changeset
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 15:17:05 -0700] rev 38635
revlog: early return in _slicechunk when span is already small enough
If the full span is smaller than the minimum gap size we'll consider, we know we
won't do any slicing and we can return earlier.
Paul Morelle <paul.morelle@octobus.net> [Tue, 19 Jun 2018 15:03:58 +0200] rev 38634
revlog: early return in _slicechunk when density is already good
We don't need to do anything if we know we won't enter the second while loop.
Save the overhead of the first loop by returning earlier.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 02:33:43 +0200] rev 38633
sparse-read: discard gap below 65K only
Testing on actual data shows that 65K is more efficient in both time and memory
than 256K.
Paul Morelle <paul.morelle@octobus.net> [Fri, 22 Jun 2018 17:12:24 +0200] rev 38632
sparse-read: target density of 50% instead of 25%
The target density value is wrong. The default target chain span is
4*text-length. However, the target max chain payload is 2*text-length. So
default target density should be 50% (2/4) not 25% (1/4).
Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> [Fri, 06 Jul 2018 00:39:21 +0530] rev 38631
grep: change default behaviour to search working directory files (BC)
With this patch, grep searches on the working directory by default
and looks for all files tracked by the working directory and greps on them.
### OLD BEHAVIOUR
$ hg init a
$ cd a
$ echo "some text">>file1
$ hg add file1
$ hg commit -m "adds file1"
$ hg mv file1 file2
$ hg grep "some"
`file2:1:some text`
`file1:0:some text`
This behaviour is undesirable since file1 is not in the current history and was
renamed as file2, so the second result was redundant and confusing.
### NEW BEHAVIOUR
$ hg init a
$ cd a
$ echo "some text">>file1
$ hg add file1
$ hg commit -m "adds file1"
$ hg mv file1 file2
$ hg grep "some"
`file2:
2147483647:some text`
Differential Revision: https://phab.mercurial-scm.org/D3826
Sune Foldager <cryo@cyanite.org> [Tue, 10 Jul 2018 13:18:34 +0200] rev 38630
patch: don't separate \r and \n when colorizing diff output
When displaying diffs, \r at the end of a line is treated as trailing
whitespace. This causes an ANSI escape code to be inserted between \r and \n.
Some programs, such as less since version 530 (maybe earlier, but at least not
version 487) displays ^M when it encounters a lone \r. This causes a lot of
noise in diff output on Windows, where \r\n is used to terminate lines.
We avoid that by treating both \n and \r\n as end of line when considering
trailing whitespace.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 23:38:06 -0400] rev 38629
hook: add support for disabling the shell to native command translation
I think having it on by default is the right thing to do, but this is an escape
hatch if someone has a command that shouldn't be mangled. The inspiration is
the priority prefix. The translation does nothing on non Windows platforms, so
the default value is selected to avoid printing a useless note by default.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 23:47:49 -0400] rev 38628
hook: narrow the 'priority' prefix check to align with the documentation
A prefix like 'priorityfoo' is meaningless, but `hg help config.hooks` calls out
the dot.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 07 Jul 2018 22:13:56 -0400] rev 38627
windows: don't consider '$$' to be an escaped '$' when translating to cmd.exe
This functionality was inherited from `os.path.expandvars()`. But the point of
adding this translating code is to be able to write a portable hook, and bash
wouldn't replace '$$' with '$'. Escaping with '\' works, and is portable.
Sean Farley <sean@farley.io> [Wed, 20 Jun 2018 17:07:46 -0700] rev 38626
contrib: add heads(commonancestors(_)) to all-revsets
This is mainly to check that we don't regress our optimization path.
Sean Farley <sean@farley.io> [Tue, 26 Jun 2018 15:26:21 -0700] rev 38625
revset: add optimization for heads(commonancestors())
Previously, the only way to get these commits were (tested on
mozilla-central):
hg perfrevset 'heads(::a7cf55 and ::d8b15)'
! wall 4.988366 comb 4.960000 user 4.780000 sys 0.180000 (best of 3)
After this patch:
(python)
hg perfrevset 'heads(commonancestors(a7cf55 + d8b15))'
! wall 0.002155 comb 0.000000 user 0.000000 sys 0.000000 (best of 1107)
(C)
hg perfrevset 'heads(commonancestors(a7cf55 + d8b15))'
! wall 0.000568 comb 0.000000 user 0.000000 sys 0.000000 (best of 4646)
Sean Farley <sean@farley.io> [Mon, 18 Jun 2018 19:41:54 -0700] rev 38624
revsets: add commonancestors revset
This is a method to reproduce "::x and ::y" such that a set can be sent
in. For instance, it'd be convenient to have "::heads()" work like this
but that already means "::x + ::y + ..." for each element in the
"heads()" set.
Therefore, we add the "commonancestors" method to mean "::x and ::y ..."
for each head in the given set.
Augie Fackler <augie@google.com> [Mon, 09 Jul 2018 10:07:20 -0400] rev 38623
tweakdefaults: enable word-diff by default
It's another creature comfort in diff output, we may as well include
it alongside git-diffs and showfunc.
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 08:31:33 +0200] rev 38622
run-tests: fix a too long line
Differential Revision: https://phab.mercurial-scm.org/D3900
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 08:25:04 +0200] rev 38621
run-tests: add missing life-cycle methods on the example custom test result
A previous commit introduced `onStart` and `onEnd` methods on test result but
the one used in tests lacked those two methods. Fix it and add some output to
be sure they are called.
Differential Revision: https://phab.mercurial-scm.org/D3899
Boris Feld <boris.feld@octobus.net> [Tue, 10 Jul 2018 08:23:46 +0200] rev 38620
run-tests: fix test result verbosity
A previous refactoring created the test result with a verbosity of 0 hiding
some of the outputs in the normal case.
Differential Revision: https://phab.mercurial-scm.org/D3898
Boris Feld <boris.feld@octobus.net> [Tue, 05 Jun 2018 12:04:15 +0200] rev 38619
shelve: use more accurate description in conflict marker
We use "shelve" and "working-copy" instead of "source" and "dest". This is a net
win.
Differential Revision: https://phab.mercurial-scm.org/D3694
Boris Feld <boris.feld@octobus.net> [Tue, 29 May 2018 00:30:50 +0200] rev 38618
shelve: directly handle the initial parent alignment
Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.
After this change, we no longer need to use rebase in shelve.
Differential Revision: https://phab.mercurial-scm.org/D3693
Boris Feld <boris.feld@octobus.net> [Thu, 24 May 2018 17:39:07 +0200] rev 38617
run-tests: extract onStart and onEnd into the test result
It would allow custom test result to display custom messages.
Differential Revision: https://phab.mercurial-scm.org/D3701
Boris Feld <boris.feld@octobus.net> [Sat, 28 Apr 2018 12:51:44 +0200] rev 38616
run-tests: add support for external test result
The goal is to begin experiment with custom test result. I'm not sure we
should offers any backward-compatibility guarantee on that plugin API as it
doesn't change often and shouldn't have too much clients.
Differential Revision: https://phab.mercurial-scm.org/D3700
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 23:36:53 +0900] rev 38615
encoding: alias cp65001 to utf-8 on Windows
As far as I can tell, cp65001 is the Windows name for UTF-8. I don't know
how different it is from the UTF-8, but Python 3 appears to have introduced
new codec for cp65001, so the alias is enabled only for Python 2.
https://bugs.python.org/
issue13216
This patch is untested, but hopefully fixes the following issue.
https://bitbucket.org/tortoisehg/thg/issues/5127/
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 15 Mar 2018 17:37:03 +0530] rev 38614
remotenames: synchronise remotenames after push also
Earlier we use to pull remotenames information from the server in case of pull
and clone only. This patch adds logic to push also command to pull remotenames
information.
This will help us in keeping the remotenames more upto date where there are a
lot people changing state of branches and bookmarks at the server.
Differential Revision: https://phab.mercurial-scm.org/D2874
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 20:45:13 +0900] rev 38613
fileset: pass in badfn to inner matchers
Just for sanity. No idea if this will make a difference, but it should
propagate the badfn because the matcher created by mctx.matcher() will be
returned by fileset.match() in future patches.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 20:53:12 +0900] rev 38612
fileset: restrict getfileset() to not return a computed set (API)
And rename the functions accordingly. fileset.match() will be changed to
not compute the initial subset.
test-glog*.t get back to the state before
9f9ffe5f687c "match: compose
'set:' pattern as matcher."
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 22:04:07 +0900] rev 38611
match: add prefixdirmatcher to adapt subrepo matcher back
This serves as an inverse function to the subdirmatcher, and will be used
to wrap a fileset matcher of subrepositories. One of the root/prefix paths
could be deduced from the matcher attributes to be wrapped, but we don't
since the callers of this class know the root/prefix paths and can simply
pass them in.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:58:16 +0900] rev 38610
fileset: make debugfileset filter repository files
This prepares for the structural change of the fileset. A computed fileset
will no longer be a set of files, but a boolean function (i.e. matcher) to
test if an input file matches the given fileset expression.
--all-files option is added because some examples in the test need to scan
files across revisions.
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:24:18 +0900] rev 38609
bundle2: use ProgrammingError to report bad use of addparam()
This allows us to embed error message in bytes.
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:34:11 +0900] rev 38608
py3: byte-stringify literals in extension in test-bundle2-format.t
# skip-blame just some b''
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:32:39 +0900] rev 38607
py3: drop b'' while formatting BundleUnknownFeatureError message
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:11:54 +0900] rev 38606
py3: suppress write() result and close file in test-bookmarks-pushpull.t
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 18:58:11 +0900] rev 38605
py3: drop b'' while formatting ResponseError
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 18:52:28 +0900] rev 38604
py3: fix revnums in bookmark discovery to be consumable more than once
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 19:05:00 +0900] rev 38603
py3: byte-stringify literals in extension in test-bundle2-exchange.t
# skip-blame just some b''
Paul Morelle <paul.morelle@octobus.net> [Fri, 22 Jun 2018 01:42:38 +0200] rev 38602
aggressivemergedeltas: enabled the option by default
The option has been around for a while (August 2015) but was never turned on by
default. In-depth testing shows large wins for having that on with no
significant drawbacks.
When enabled, revlog consider delta against both p1 and p2 at the same time when
storing a revision. Selecting a delta against "p2" can produce better deltas and
chain. This raise large benefit for all repositories, especially if they have a
lot of merges.
Comparison of `.hg/store/` size:
mercurial (6.74% merges):
before: 54,225,348 bytes
after: 47,279,959 bytes -13%
pypy (8.30% merges):
before: 459,041,759 bytes
after: 346,090,067 bytes -25%
netbeans (34.21% merges):
before: 2,468,041,333 bytes
after: 1,364,077,645 bytes -45%
mozilla-central (4.84% merges):
before: 2,731,799,546 bytes
after: 2,157,718,019 bytes -21%
Comparison of `00manifest.d` size:
mercurial (6.74% merges):
before: 11,682,516 bytes
after: 6,143,044 bytes -47%
pypy (8.30% merges):
before: 156,447,163 bytes
after: 52,941,780 bytes -66%
netbeans (34.21% merges):
before: 1,250,363,851 bytes
after: 130,088,982 bytes -90%
mozilla-central (4.84% merges):
before: 468,202,733 bytes
after: 215,096,339 bytes -54%
In addition, the better deltas help with the performance of multiple core
operations. However, better chains mean longer chains, which can affect
performance negatively (mostly manifest revision retrieval time). Chains length
is a deeper problem that also affects linear repository too. Overall we think
the benefits of using p2 as a diff target are bigger than the downsizes. In
addition, we are also working on ways to improve the performance impact of chain
length, so theses downsizes get fixed in the future.
Below are interesting items from the full benchmark run:
bundling 100 revisions from pypy:
before: 670ms
after: 480ms -28%
bundle 10000 revisions from pypy:
before: 1.38s
after: 1.10s -54%
bundle 10000 revisions from pypy:
before: 16.1s
after: 7.81s -52%
bundle 10000 revisions from netbeans:
before: 19.3s
after: 15.5s -19%
unbundle 1000 revisions to pypy:
before: 641ms
after: 315ms - 51%
clone mercurial (http):
before: 26.0s
after: 22.6s -23%
pulling 1000 revisions from pypy (shh):
before: 2.07s
after: 1.36s -44%
pushing 1000 revision through http (pypy repository)
before: 2.18s
after: 1.35s -48%
diff time in mozilla-central:
before: 1.420s
after: 0.983s -31%
status time in mozilla-central:
before: 1.260s
after: 0.828s -34%
Impact in other cases seems minimal (within a couple of percent in worse cases)
and can be seen in both direction:
Timing for a simple `hg commit`:
mozilla-central:
before: 3.37s
after: 3.22s -4%
pypy:
before: 194ms
after: 197ms +2%
Timing for status (from tip to parent of tip):
mercurial:
before: 52.4ms
after: 52.4ms (same)
pypy:
before: 55.2
after: 56.9 +3%
Timing for `hg update`
mozilla-central, across 10 revisions:
before: 4.82s
after: 4.59s -5%
mozilla-central, across 10000 revisions:
before: 49.1s
after: 49.9s +2%
pypy, across 10 revisions:
before: 213ms
after: 216ms +1%
pypy, across 10000 revisions:
before: 5.31ms
after: 5.24ms -1%
The negative consequences are related to manifest fetch time:
(timing for the tip revision tested by the benchmark)
pypy-2018:
before: 2.60ms
after: 3.88ms +50%
mozilla-central-2018:
before: 565ms
after: 652ms +15% (~+100ms)
netbeans-2018:
before: 101ms
after: 250ms +48% (~+150ms)
This shows up as a fixed overhead on some command we benchmarked:
no-op push of mozilla-central:
before: 945ms
after: 1040ms +10% (~+100ms)
pushing 10 changeset in netbeabs over ssh:
before: 557ms
after: 712ms +28% (+155ms)
pushing 100 changeset in netbeabs over ssh:
before: 592ms
after: 771ms +30% (+179ms)
Augie Fackler <augie@google.com> [Mon, 09 Jul 2018 09:50:23 -0400] rev 38601
merge with stable
Joerg Sonnenberger <joerg@bec.de> [Fri, 06 Jul 2018 17:57:46 +0200] rev 38600
ui: make the large file warning limit fully configurable
While add --large can be used to override it selectively, often enough
the user simply doesn't care about machines with less than 100MB RAM or
so, so make it possible to just specify a larger limit in hgrc.
Differential Revision: https://phab.mercurial-scm.org/D3893
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:26:04 +0900] rev 38599
fileset: sort debugfileset output
Unlike revset, the order of fileset result doesn't matter since it's used
as a matcher predicate. This stabilizes debugfileset output for upcoming
changes.
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 18:00:26 +0900] rev 38598
fileset: move helper functions to top
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:45:42 +0900] rev 38597
py3: fix bundle heads to be consumable more than once
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:37:05 +0900] rev 38596
py3: byte-stringify literals in hook script in test-bundle.t
# skip-blame just some b''
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 17:17:54 +0900] rev 38595
py3: make 'None in lazyancestors' not crash
This looks somewhat weird, but we have callers like 'torev(n) in futurecommon'
around where torev(n) is dictlike.get(n). I could fix callers, but that would
be unnecessarily verbose.
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:55:21 +0900] rev 38594
py3: convert server-string to unicode to make http library happy
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:45:40 +0900] rev 38593
py3: fix dumbhttp.py to convert --daemon-postexec arguments back to bytes
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:31:14 +0900] rev 38592
py3: use bytes.endswith() instead of bytes[n]
Yuya Nishihara <yuya@tcha.org> [Sun, 08 Jul 2018 16:21:26 +0900] rev 38591
diff: graduate word-diff option from experimental
Per 4.6 Sprint notes.
I've also made it gated by "formatchanging" since it could change the output
if we had an option to highlight words without using colors.
Danny Hooper <hooper@google.com> [Fri, 06 Jul 2018 12:47:02 -0700] rev 38590
fix: add test case that shows why --whole with --base is useful
Differential Revision: https://phab.mercurial-scm.org/D3894
Martin von Zweigbergk <martinvonz@google.com> [Fri, 06 Jul 2018 16:45:44 -0700] rev 38589
context: raise ProgrammingError on repo['my-tag']
We had an internal extension that I had failed to migrate off of the
deprecated API and its "'my-tag' in repo" check just started returning
False. It took a while to figure out that that was what was
happening. This patch would have helped.
Differential Revision: https://phab.mercurial-scm.org/D3895
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:49:25 +0900] rev 38588
diffutil: move the module out of utils package
mercurial.utils modules inherit the property of the mercurial.util, which is
no dependency on ui, repo, ctx, etc. As the diffutil module seems to reside
in the scmutil layer, it's probably better to not put it under the utils
package.
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:41:36 +0900] rev 38587
diffutil: remove diffopts() in favor of diffallopts()
patch.diffopts() exists only for backward compatibility. We don't need it
in new module.
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:38:33 +0900] rev 38586
obsutil: use public interface to access to repo.ui
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:35:47 +0900] rev 38585
hgweb: pass ui to diffstatgen() explicitly
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:31:04 +0900] rev 38584
synthrepo: simply use the ui passed as a function argument
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:29:05 +0900] rev 38583
templatekw: obtain ui directly from the template context
Yuya Nishihara <yuya@tcha.org> [Fri, 06 Jul 2018 21:28:02 +0900] rev 38582
context: remove unneeded alias of diffopts
Yuya Nishihara <yuya@tcha.org> [Tue, 12 Jun 2018 22:01:59 +0900] rev 38581
match: remove ctx argument from code path down to _buildmatch()
'ctx' was there only for filesets.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 16:08:58 +0900] rev 38580
match: compose 'set:' pattern as matcher
Baby step towards porting fileset to matcher composition.
We can't use the exactmatcher since it would provide a computed set as exact
paths. That's why we use the predicatematcher with fset.__contains__. This
will be cleaned up later.
The test change in test-glog.t means that the "set:copied()" pattern is no
longer be processed as a slow path. That's because the fset is empty. This
will also change in future patches.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 15:52:27 +0900] rev 38579
match: resolve 'set:' patterns first in _buildmatch()
This just makes the next patch less complicated. The order of 'set:' and
'subinclude:' expansion doesn't matter.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 15:47:58 +0900] rev 38578
match: explode if unsupported pattern passed down to _regex() builder
Yuya Nishihara <yuya@tcha.org> [Sat, 09 Jun 2018 21:13:24 +0900] rev 38577
match: add basic wrapper for boolean function
This serves as a generic wrapper for fileset predicates. In future patches,
a fileset expression will be mapped to a tree of matchers for a better support
of match attributes such as visitdir(). For example,
$ hg debugwalk -v 'set:contrib/** and binary()'
* matcher:
<intersectionmatcher
m1=<patternmatcher patterns='(?:contrib/.*$)'>,
m2=<predicatematcher pred=binary>>
...
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 17:19:31 +0900] rev 38576
stringutil: move _formatsetrepr() from smartset
I'll add a matcher subclass wrapping a boolean function, which will use
buildrepr() to provide debugging information in a similar way to
smartset.filteredset.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 17:07:29 +0900] rev 38575
pycompat: move rapply() from util
I want to use rapply() in utils.* modules, but that would introduce a
reference cycle util -> utils.* -> util. Moving rapply() to pycompat
should be okay since it mostly serves as a compatibility helper.
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 05 Jul 2018 09:53:00 +0530] rev 38574
strip: improve help text for --no-backup option
Help text is modified to clearly define the meaning of
--no-backup option.
Differential Revision: https://phab.mercurial-scm.org/D3886
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jul 2018 15:07:29 -0400] rev 38573
test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg
It looks like the manifest value changing is the only difference, but I'm not
sure why it's happening. I've got a similar divergence in a production repo
that was also converted from bzr and has an octopus merge[1]. Unlike here, the
manifest values for the destination merge commits reflect the initial merge
only, instead of all four merges agreeing like this test.
$ hg -R src_repo manifest -r 310 --debug | grep file # octopus fixup merge
2d8775bc2481bd28ac87038ecdf33e1dbddc80e9 644 file1
6adb9353a55bb8be76e71382efc724ec3ccf7ed5 644 file2
$ hg -R src_repo manifest -r 309 --debug | grep file # first merge
362e7cb5163153c4989daad1a834871ae849f205 644 file1
2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2
$ hg -R dst_repo manifest -r 273 --debug | grep file # octopus fixup merge
362e7cb5163153c4989daad1a834871ae849f205 644 file1
2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2
$ hg -R dst_repo manifest -r 272 --debug | grep file # first merge
362e7cb5163153c4989daad1a834871ae849f205 644 file1
2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2
This divergence is espcially annoying because unlike changelog differences, I
haven't figured out a way to fix this in code. The only way I found to work
around it is to convert up to the point of divergence, `hg bundle` the bad
revision in the source, apply it to the destination, add a line to the shamap,
and fire off the conversion again.
But I suspect that there's more to it than just the octopus merge because
I also have a commit in the same repo, done in Mercurial (well after the
conversion) that is exhibiting a similar issue (and it's not a merge commit).
I'm almost positive that it was created with 4.4 or later. Any ideas?
[1] https://www.mercurial-scm.org/pipermail/mercurial/2018-June/050924.html
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jul 2018 15:07:29 -0400] rev 38572
convert: add a config knob for not saving the bzr revision
Now that the timestamp is fixed, the log of the Mercurial repo is still
unstable with --debug, because the bzr commit ID keeps changing. Both hg and
git implement `convert.*.saverev`, so do the same here.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jul 2018 15:07:29 -0400] rev 38571
test-bzr: use a fixed commit time
This will help stabilize the hashes when converting to a Mercurial repo.
Boris Feld <boris.feld@octobus.net> [Wed, 23 May 2018 15:31:44 +0200] rev 38570
diff: use `context.diff` to produce diff
We want to make sure `context.diff` if full featured. Using it in the main
diff code path is a good way to do so.
The end goal is to be able to easily compute diff between in-memory context.
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 15:03:05 +0200] rev 38569
context: no longer accept diff options as dictionnary
Since we already broke the API earlier in this stack, there are no point to
introducing a new deprecation warning.
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 15:00:16 +0200] rev 38568
obsutil: pass a diffopts object to context.diff
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 14:46:28 +0200] rev 38567
synthrepo: pass a diffopts object to context.diff
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 14:42:58 +0200] rev 38566
webutil: pass a diffopts object to context.diff
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 14:37:10 +0200] rev 38565
revset: pass an explicit `diffopts` objet to context.diff
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 14:30:31 +0200] rev 38564
template: directly instantiate diff options for diffstat
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 13:26:23 +0100] rev 38563
tests: update test-context.py to use diffopts as diff argument
Boris Feld <boris.feld@octobus.net> [Thu, 28 Jun 2018 16:11:13 +0200] rev 38562
diffutil: extract diff options code into a dedicated util-module
We want to be able to create and use diffoptions in more places. Currently the
official function to instantiate diffoptions live into `mercurial.patch`. A
module too high level to be easily imported in some places.
So we extract the diff options related function in their own utility module.
Augie Fackler <augie@google.com> [Thu, 05 Jul 2018 01:04:32 -0400] rev 38561
packaging: add fedora 28
Differential Revision: https://phab.mercurial-scm.org/D3892
Augie Fackler <augie@google.com> [Thu, 05 Jul 2018 02:11:06 -0400] rev 38560
packaging: add missing path segments in cp statements in fedora build
Differential Revision: https://phab.mercurial-scm.org/D3891
Augie Fackler <augie@google.com> [Thu, 05 Jul 2018 01:07:00 -0400] rev 38559
packaging: fix misplaced ( in docker-fedora rule definition
Differential Revision: https://phab.mercurial-scm.org/D3890
Augie Fackler <augie@google.com> [Thu, 05 Jul 2018 01:04:22 -0400] rev 38558
packaging: make help output correct for fedora and centos targets
Differential Revision: https://phab.mercurial-scm.org/D3889
Augie Fackler <augie@google.com> [Thu, 05 Jul 2018 01:02:59 -0400] rev 38557
packaging: remove stray = that confuses make(1) on my Mac
Differential Revision: https://phab.mercurial-scm.org/D3888
Gregory Szorc <gregory.szorc@gmail.com> [Sun, 01 Jul 2018 14:25:44 -0700] rev 38556
manifest: define and implement addgroup() on manifestlog
Changegroup code was bypassing our manifest interface and calling a
method on the private revlog attribute.
This commit formalizes the interface for adding a group of
revisions from deltas and changes the changegroup code to use it.
This enables alternate manifest storage to work with changegroup
application operations (like `hg unbundle` and `hg pull`).
Differential Revision: https://phab.mercurial-scm.org/D3883
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 04 Jul 2018 12:12:49 -0700] rev 38555
manifest: define and implement rev() on manifestlog
Various code is accessing repo.manifestlog._revlog - a private
attribute. This bypasses our interface and makes it difficult to
implement non-revlog manifest storage.
This commit adds a rev() method to the manifestlog interface and
class and teaches callers to use it.
Ideally this method wouldn't exist, as very few consumers should
need to resolve the revision number of a manifest. Again, the
primary goal of interface work is to establish and use interfaces
first and to improve them later.
Differential Revision: https://phab.mercurial-scm.org/D3882
Martin von Zweigbergk <martinvonz@google.com> [Mon, 02 Jul 2018 11:14:13 -0700] rev 38554
tests: don't allow reodering of glob/re lines across non-glob/re lines
As shown in the test case added in the previous patch, it can be
really hard to interpret diffs from the test runner if there are
multiple lines that would match a given glob or regular expression. It
looks like this has been the case since
1ad0ddf8cccc (run-tests: teach
_processoutput to handle multiple lines of churn, 2016-03-17). It
seems like the point of that was to preserve the "(glob)" annotation
on lines even if they got moved. This patch tries to preserve that but
only allows the lines to be moved past other glob/re lines.
Differential Revision: https://phab.mercurial-scm.org/D3881
Martin von Zweigbergk <martinvonz@google.com> [Fri, 29 Jun 2018 11:29:03 -0700] rev 38553
tests: add test showing puzzling test output with (glob) lines
When using multiple (glob) lines, the test runner often moves the
lines around in the output on failure. I have run into this problem
many times. The added test shows one example of this. Note that it
doesn't show the mismatching lines and instead shows diff hunks that
appear to replace a literal by a glob, and other hunks that should
clearly match.
Differential Revision: https://phab.mercurial-scm.org/D3880
Martin von Zweigbergk <martinvonz@google.com> [Tue, 03 Jul 2018 15:30:22 -0700] rev 38552
tests: move handling of None "el" out of linematch()
It just seems odd for linematch() to know what None means.
Differential Revision: https://phab.mercurial-scm.org/D3879
Martin von Zweigbergk <martinvonz@google.com> [Mon, 02 Jul 2018 00:05:54 -0700] rev 38551
tests: remove some redundant code in run-tests
These two lines also happen below if "r" is truthy, which it is in
this case since it's equal to "retry".
Differential Revision: https://phab.mercurial-scm.org/D3878
Martin von Zweigbergk <martinvonz@google.com> [Mon, 02 Jul 2018 00:02:31 -0700] rev 38550
tests: don't reimplement enumerate() in run-tests
Differential Revision: https://phab.mercurial-scm.org/D3877
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 05 Jul 2018 09:47:11 +0530] rev 38549
histedit: improve help text for --no-backup option
Improved help text for --no-backup option to clearly
define it's meaning.
Differential Revision: https://phab.mercurial-scm.org/D3885
Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 22 Jun 2018 23:53:43 +0530] rev 38548
histedit: add --no-backup option (
issue5825)
This option provides a functionality to not store a backup
while aborting histedit in between. Also added tests for the
same.
Differential Revision: https://phab.mercurial-scm.org/D3872
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 30 Jun 2018 18:55:04 -0700] rev 38547
tests: use interfaceutil in simplestorerepo
Without it, we crash at module import time.
This has likely been busted since
856f381ad74b.
Differential Revision: https://phab.mercurial-scm.org/D3884
Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 29 Jun 2018 01:35:09 +0530] rev 38546
rebase: improve output of --dry-run
Improved output when in dryrun, for user to make sure that
no change will be written to repository.
Differential Revision: https://phab.mercurial-scm.org/D3764
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:18:46 +0900] rev 38545
status: add support for log-like template keywords and functions
It's bound to ctx2 since "hg status" can be considered to show the status
of the files at ctx2 given ctx1 as the base.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:11:23 +0900] rev 38544
resolve: add support for log-like template keywords and functions
It uses wctx as the associated revision since "hg resolve" is the command
to manipulate the working directory files.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:06:53 +0900] rev 38543
manifest: add support for log-like template keywords and functions
"hg manifest --all" isn't supported since it has no single associated
revision.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:01:20 +0900] rev 38542
files: add support for log-like template keywords and functions
Note that the ctx does not point to the revision where the file was
last changed, but the revision specified by -rREV option.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 21:55:37 +0900] rev 38541
files: automatically populate fields referenced from template
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:02:53 +0900] rev 38540
grep: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 21:47:43 +0900] rev 38539
cat: add support for log-like template keywords and functions
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 22:22:07 +0900] rev 38538
bookmarks: add support for log-like template keywords and functions
This is basically the same as
5d9b765dbe15 "tags: unblock log-like template
keywords and functions."
Danny Hooper <hooper@google.com> [Tue, 26 Jun 2018 16:29:55 -0700] rev 38537
fix: add progress bar for number of file revisions processed
This ensures responsiveness when the configured tools are slow or numerous.
Differential Revision: https://phab.mercurial-scm.org/D3848
Danny Hooper <hooper@google.com> [Tue, 26 Jun 2018 15:30:49 -0700] rev 38536
fix: use a worker pool to parallelize running tools
This is important for usability when tools are slow or numerous.
Differential Revision: https://phab.mercurial-scm.org/D3846
Danny Hooper <hooper@google.com> [Tue, 26 Jun 2018 15:27:29 -0700] rev 38535
worker: support more return types in posix worker
This allows us to return things that aren't tuple(int, str) from worker
functions. I wanted to use marshal instead of pickle, but it seems to read from
the pipe in non-blocking mode, which means it stops before it sees the results.
The windows worker already supports arbitrary return values without
serialization, because it uses threads instead of subprocesses.
Differential Revision: https://phab.mercurial-scm.org/D3845
Boris Feld <boris.feld@octobus.net> [Tue, 19 Jun 2018 19:18:31 +0100] rev 38534
debug: process --debug flag earlier
This allow the verbosity level to be set correctly during extension
initialization.
Sune Foldager <cryo@cyanite.org> [Wed, 04 Jul 2018 14:19:13 +0200] rev 38533
windows: fix incorrect detection of broken pipe when writing to pager
Paging e.g. hg incoming on Windows and quitting the pager before the
output is consumed will print 'abort: Invalid argument'. This is
because the windows error 0xE8 (ERROR_NO_DATA) is mapped to EINVAL
even though it is documented as 'The pipe is being closed'.
Note that this fix assumes that Windows' last error code is still
valid in the exception handler. It works correctly in all my tests.
A simpler fix would be to just map EINVAL to EPIPE, like was done is
flush previously, but that would be less precise.
This error was not observed previously, when pager was an extension.
Boris Feld <boris.feld@octobus.net> [Tue, 19 Jun 2018 19:10:31 +0100] rev 38532
test: stop passing --quiet in a run dedicated to debug output
The goal of the run is to display some debug output. Passing --quiet in this
case is strange.
Sandu Turcan <idlsoft@gmail.com> [Fri, 15 Jun 2018 14:07:13 -0400] rev 38531
acl: add bookmarks support
Originally submitted at
https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-March/080650.html
as an RFC by timeless.
.. feature::
The `acl` extension now has support for bookmarks as well as branches.
Differential Revision: https://phab.mercurial-scm.org/D3750
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 30 Jun 2018 18:34:33 -0700] rev 38530
repository: define manifest interfaces
The long march towards declaring interfaces for repository
primitives continues.
This commit essentially defines interfaces based on the following
types:
* manifest.manifestdict -> imanifestdict
* manifest.manifestlog -> imanifestlog
* manifest.memmanifestctx -> imanifestrevisionwritable
* manifest.manifestctx -> imanifestrevisionstored
* manifest.memtreemanifestctx -> imanifestrevisionwritable
* manifest.treemanifestctx -> imanifestrevisionstored
* util.dirs -> idirs
The interfaces are thoroughly documented. Their documentation is
now better than the documentation in manifest.py in many cases.
With the exception of util.dirs, classes have been annotated with
their interfaces. (I didn't feel like util.dirs needed the
proper interface treatment.)
Tests have been added demonstrating that all classes and instances
conform to their interfaces.
This work was much easier than filelogs. That's because Durham
did an excellent job formalizing the manifest API a while back.
There are still some minor kludges with the interfaces that should
probably be addressed. But the primary goal with interface
declarations is getting something established. Once we have an
interface, we can modify it later easily enough.
Differential Revision: https://phab.mercurial-scm.org/D3869
Augie Fackler <augie@google.com> [Tue, 12 Jun 2018 11:31:20 -0400] rev 38529
narrowbundle2: when we handle a widen, mark the operation as unsafe
We have to manually drive the context manager here since the logic is
awkwardly split between a couple of places.
Differential Revision: https://phab.mercurial-scm.org/D3719
Augie Fackler <augie@google.com> [Mon, 11 Jun 2018 17:06:29 -0400] rev 38528
narrow: mark the critical chunks of narrowing/widening as unsafe
I'm _mostly_ sure these are the only unsafe chunks here.
Differential Revision: https://phab.mercurial-scm.org/D3718
Augie Fackler <augie@google.com> [Mon, 11 Jun 2018 17:03:29 -0400] rev 38527
repair: mark the critical section of strip() as unsafe
When our experimental nointerrupt feature is enabled, this will
help prevent users from corrupting their repo during a strip.
Differential Revision: https://phab.mercurial-scm.org/D3717
Augie Fackler <augie@google.com> [Wed, 27 Jun 2018 10:47:14 -0400] rev 38526
ui: add an uninterruptable context manager that can block SIGINT
The blocking of SIGINT is not done by default, but my hope is that we
will one day. This was inspired by Facebook's "nointerrupt" extension,
which is a bit more heavy-handed than this (whole commands are treated
as unsafe to interrupt). A future patch will enable this for varying
bits of Mercurial that are performing unsafe operations.
It's intentional that the KeyboardInterrupt is raised as the context
manager exits: during the span of the context manager interrupting
Mercurial could lead to data loss, but typically those spans are
fairly narrow, so we can let the unsafe block complete and then
terminate hg (which will leave the repo in a consistent state, even if
it's not the user's desired state).
.. api::
New context manager ``ui.uninterruptable()`` to mark portions of a command
as potentially unsafe places to interrupt Mercurial with Control-C or
similar.
Differential Revision: https://phab.mercurial-scm.org/D3716
Augie Fackler <augie@google.com> [Tue, 03 Jul 2018 12:22:37 -0400] rev 38525
merge with stable
Augie Fackler <raf@durin42.com> [Tue, 03 Jul 2018 12:10:22 -0400] rev 38524
Added signature for changeset
0b63a6743010
Augie Fackler <raf@durin42.com> [Tue, 03 Jul 2018 12:10:21 -0400] rev 38523
Added tag 4.6.2 for changeset
0b63a6743010
Yuya Nishihara <yuya@tcha.org> [Fri, 29 Jun 2018 23:13:23 +0900] rev 38522
revset: add partial support for ancestor(wdir())
It's easy, so let's make it happen. I'm not certain if 'wdir() &' should
be required. ancestors(wdir()) works without it, but ancestor(wdir()) doesn't
as of now. That's the issue of fullreposet.__contains__() vs __and__().
Boris Feld <boris.feld@octobus.net> [Sat, 23 Jun 2018 13:19:03 +0100] rev 38521
context: also accept diff option directly
For now we accept both diff option and dictionary. This will let us upgrade
internal users gradually before we drop the old API at the end of this series.
Boris Feld <boris.feld@octobus.net> [Wed, 23 May 2018 15:31:40 +0200] rev 38520
context: also take all other arguments than `patch.diff` accept
This is needed to use `context.diff` as a full replacement of `patch.diff`
Boris Feld <boris.feld@octobus.net> [Tue, 22 May 2018 15:02:52 +0200] rev 38519
context: explicitly take diffopts in `context.diff` (API)
To provide a proper replacement for the `patch.diff(…)` function, the
`context.diff(…)` method needs to be able to take more parameters. To
distinguish the diff options from the new other arguments, we upgrade the diff
options to its own explicit argument.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Jul 2018 01:00:39 +0530] rev 38518
rebase: check whether the rebasestate exists or not a bit early
Converted the else part into `if True` because that part will soon be under a
except part.
Differential Revision: https://phab.mercurial-scm.org/D3876
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Jul 2018 00:52:25 +0530] rev 38517
rebase: use staeobj to check whether interrupted rebase exists
This cleans up the code a bit.
Differential Revision: https://phab.mercurial-scm.org/D3875
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Jul 2018 00:46:59 +0530] rev 38516
rebase: add a stateobj variable to rebaseruntime class
The stateobj variable is an object of state.cmdstate() and will be used in
upcoming patches to clean up the logic a bit and also use cbor format to write
data to rebasestate class.
Differential Revision: https://phab.mercurial-scm.org/D3874
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Jul 2018 00:31:57 +0530] rev 38515
rebase: refactor logic to read rebasestate in a separate function
This will help us in plugging the use of state.cmdstate() to read rebasestate.
Differential Revision: https://phab.mercurial-scm.org/D3873
Boris Feld <boris.feld@octobus.net> [Fri, 22 Jun 2018 00:07:22 +0100] rev 38514
revlog: reuse 'descendant' implemention in 'isancestor'
The two functions do the same thing, but one takes nodes while the other takes
revs. Using one to implement the other make sense.
We should probably cleanup the API at some point to avoid having so many similar
functions. However, we focus on an efficient implementation for now.
Boris Feld <boris.feld@octobus.net> [Fri, 22 Jun 2018 00:05:20 +0100] rev 38513
revlog: efficient implementation of 'descendant'
Iterating over descendants is costly, because there are no "parent -> children"
pointers. Walking the other way around is much more efficient, especially on
large repositories, where descendant walks can cost seconds. And the other hand,
common ancestors code follows links in the right direction and has a compiled
implementation.
In real life usage, this saved up to 80s during some pull operations, where
descendant test happens in extension code.
Boris Feld <boris.feld@octobus.net> [Thu, 21 Jun 2018 23:56:51 +0100] rev 38512
revlog: refactor out the rev-oriented part of commonancestorheads
We plan to use this in a function taking revs as argument. Round trips to nodes
seem silly.
Boris Feld <boris.feld@octobus.net> [Thu, 21 Jun 2018 23:53:43 +0100] rev 38511
revlog: do inclusive descendant testing (API)
In many other places, a revision is considered a descendant of itself. We
update the behavior of `revlog.descendant()` to match this. (for example.
`revlog.isancestor` does inclusive testing).
No tests break, so it seems safe to do so.
This will make it easier to use a more efficient implementation in a later
changeset.
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 30 Jun 2018 16:06:05 -0700] rev 38510
manifest: make cachesize a private attribute
AFAICT this isn't accessed outside the class. It is a private
attribute and its naming should reflect that.
Differential Revision: https://phab.mercurial-scm.org/D3868
Gregory Szorc <gregory.szorc@gmail.com> [Sat, 30 Jun 2018 15:51:04 -0700] rev 38509
repository: document that file() return value conforms to interface
Differential Revision: https://phab.mercurial-scm.org/D3867
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 21:40:55 +0900] rev 38508
cleanup: pass in overwrite flag to hg.updaterepo() as named argument
For clarity.
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 30 Jun 2018 07:23:02 +0530] rev 38507
histedit: use self.stateobj to check whether interrupted histedit exists
self.stateobj is an instance of state.cmdstate() class which has an .exists()
function which is used to check whether there exists an interrupted statefile or
not.
Differential Revision: https://phab.mercurial-scm.org/D3865
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 30 Jun 2018 07:21:21 +0530] rev 38506
histedit: add a stateobj variable to histeditstate class
The stateobj variable will be an instance of state.cmdstate() class. The
stateobj variable will be used in upcoming patches to simplify the code a bit
and start using cbor to write state files.
Differential Revision: https://phab.mercurial-scm.org/D3864
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 30 Jun 2018 07:10:49 +0530] rev 38505
histedit: factor out logic of processing state data in separate fn
The new function will serve as the point from where we always get a dictionary
of data stored in the statefile and will be helpful in integrating
state.cmdstate.read() to write statefile in cbor.
Differential Revision: https://phab.mercurial-scm.org/D3863
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 30 Jun 2018 07:05:36 +0530] rev 38504
histedit: use hg.updaterepo() to avoid ui.{push|pop}buffer() hack
In some parts of code, we call hg.update() and surround that with
ui.pushbuffer() and ui.popbuffer() to suppress the output returned by
hg.update().
We have hg.updaterepo() which does not writes to UI and can be used instead.
Differential Revision: https://phab.mercurial-scm.org/D3862
Danny Hooper <hooper@google.com> [Fri, 29 Jun 2018 14:43:41 -0700] rev 38503
scmutil: fix __enter__ in progress context manager
Differential Revision: https://phab.mercurial-scm.org/D3861
Martin von Zweigbergk <martinvonz@google.com> [Fri, 29 Jun 2018 14:14:35 -0700] rev 38502
httppeer: fix use of uninitialized variable with devel logging
If the request fails, "res" was uninitialized.
Differential Revision: https://phab.mercurial-scm.org/D3860
Yuya Nishihara <yuya@tcha.org> [Sat, 30 Jun 2018 11:33:05 +0900] rev 38501
rebase: convert opts dict to bytes at once
Yuya Nishihara <yuya@tcha.org> [Sat, 30 Jun 2018 11:29:48 +0900] rev 38500
rebase: isolate command options from internal flags
I want to get rid of per-function byteskwargs(opts).
Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 29 Jun 2018 01:05:08 +0530] rev 38499
rebase: suppress warning thrown when aborting rebase in case of dryrun
Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user prespective.
Differential Revision: https://phab.mercurial-scm.org/D3857
Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 29 Jun 2018 00:47:33 +0530] rev 38498
rebase: no need to store backup in case of dryrun
While aborting an unfinished rebase in case of dryrun
there is no need to store backup for those rebased csets.
Differential Revision: https://phab.mercurial-scm.org/D3827
Sushil khanchi <sushilkhanchi97@gmail.com> [Fri, 29 Jun 2018 00:22:50 +0530] rev 38497
rebase: split _origrebase() for conveniece in dryrun
This patch split _origrebase() method by extracting rbsrt part
from that to make it easy to implement dryrun in more elegant way
than before.
Differential Revision: https://phab.mercurial-scm.org/D3856
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 28 Jun 2018 23:57:15 +0530] rev 38496
rebase: extract dryrun as a function
To avoid more number of indented blocks and make it easier to add
additional functionality in dryrun, extracted as a function.
Differential Revision: https://phab.mercurial-scm.org/D3855
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 28 Jun 2018 23:36:45 +0530] rev 38495
rebase: add lock to cover whole dryrun process
Before this patch it is easy for another hg to interrupt
the dryrun. This patch make sure that dryrun will complete
without any interruption.
Differential Revision: https://phab.mercurial-scm.org/D3854
Boris Feld <boris.feld@octobus.net> [Tue, 29 May 2018 00:26:20 +0200] rev 38494
merge: add a 'keepconflictparent' argument to graft
Before this change, `merge.graft` was always dropping the "grafted" changeset
from the parent. This is impractical in case of conflict as the second parent
can be useful to help with conflict resolution.
We add a new boolean parameter to control this behavior. This will make using
`merge.graft` directly in shelve practicable.
Differential Revision: https://phab.mercurial-scm.org/D3692
Kyle Lippincott <spectral@google.com> [Thu, 28 Jun 2018 18:07:22 -0700] rev 38493
unlinkpath: make empty directory removal optional (
issue5901) (
issue5826)
There are known cases where performing operations such as rebase from a
directory that is newly created can fail or at least lead to being in a
directory handle that no longer exists.
This is even reproducible by just doing something as simple as:
cd foo; hg rm *
The behavior is different if you use `hg addremove`, the directory is not
removed until we attempt to go back to the node after committing it:
cd foo; rm *; hg addremove; hg ci -m'bye foo'; hg co .^; hg co tip
Differential Revision: https://phab.mercurial-scm.org/D3859
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 28 Jun 2018 21:24:47 +0530] rev 38492
py3: convert opts keys to bytes using pycompat.byteskwargs()
This fixes the py3 build broken due to
56b2074114b19e12abd9cd4c378d58b702232705.
Differential Revision: https://phab.mercurial-scm.org/D3853
Matt Harbison <matt_harbison@yahoo.com> [Thu, 28 Jun 2018 22:23:08 -0400] rev 38491
procutil: add a shim for translating shell commands to native commands
Yuya Nishihara <yuya@tcha.org> [Sat, 16 Jun 2018 23:26:40 +0900] rev 38490
revset: move lookup of first ancestor() candidate out of the loop
Yuya Nishihara <yuya@tcha.org> [Sat, 16 Jun 2018 23:21:47 +0900] rev 38489
revset: leverage orset() to flatten ancestor() arguments
This also makes orset() accept an empty argument because nullary ancestor()
call is valid. That's not the case for orset(), but should be okay.
Yuya Nishihara <yuya@tcha.org> [Sat, 16 Jun 2018 23:12:41 +0900] rev 38488
revset: remove orphan i18n comment from ancestor()