spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This adds $labellocal, $labelother, and $labelbase to the replacement set for
merge-tools..args config variables, and to the environment as
HG_MY_LABEL,
HG_OTH
> On Feb 2, 2018, at 06:47, Yuya Nishihara wrote:
>
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1516507383 -32400
> # Sun Jan 21 13:03:03 2018 +0900
> # Node ID 490c47454ca5727475db6039802017bce51495d7
> # Parent 4d73d231cfcbe6f58355da6d9156f116ebffd0e6
> cmdutil: drop aliase
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, if the user had phases.new-commit=secret, there was no way on the
command line to commit as draft. This lets the user specify --no-secret to
request
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
With this change, `hg split` will preserve the phase of the commit that is
being
split, ignoring the phases.new-commit setting. Previously, we would use
whateve
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, commit --amend would keep the phase of the commit that's being
amended, and commit --amend --secret would force it to secret. There was no
mechanism
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is for parity with the identically named option on the `hg commit`
(including `hg commit --amend`) command.
REPOSITORY
rHG Mercurial
REVISION DETAIL
ht
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2015
AFFECTED FILES
tests/test-split.t
CHANGE DETAILS
diff --git a/tests/test-split.t b/tests/test-s
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The protocol handler doesn't raise ErrorResponse. So it doesn't
need to be in this `try..except ErrorResponse` block.
REPOSITORY
rHG Mercurial
REVISION DETAIL
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The exception handler for ErrorResponse has more to do with the
wire protocol than the generic HTTP server. Move the code so it
lives alongside other wire proto
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Previously, hgweb_mod had code for detecting if the request
was for the wire protocol. It would then (eventually) call
wireprotoserver.callhttp() to dispatch th
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The wireproto.wireprotocommand decorator is the preferred mechanism for
registering wire protocol commands. In addition, wireproto.commands
is no longer a 2-tup
martinvonz added a comment.
I wonder if we should instead have a --draft option for this. Reasons:
- If we ever add a fourth phase (like Jun's proposed "archived" phase), then
--no-secret doesn't clearly indicate "draft", it could just as well be
"archived".
- Actually, we of course al
# HG changeset patch
# User Matt Harbison
# Date 1517632050 18000
# Fri Feb 02 23:27:30 2018 -0500
# Node ID 76b26c09b25612513ae567b62473c634ce8c27cb
# Parent d293af8e5a4a48a38ff9103e129c1af5719081c1
context: drop deprecated methods (API)
.. api::
The following deprecated methods have b
# HG changeset patch
# User Matt Harbison
# Date 1517631655 18000
# Fri Feb 02 23:20:55 2018 -0500
# Node ID d293af8e5a4a48a38ff9103e129c1af5719081c1
# Parent c8e2d6ed1f9ea4eee7b28250b5aff22433d538b6
bookmarks: drop deprecated methods (API)
.. api::
The following deprecated methods have
# HG changeset patch
# User Matt Harbison
# Date 1517633131 18000
# Fri Feb 02 23:45:31 2018 -0500
# Node ID 14e7553aa4b1e94e3ff6ac06bb26e7950daf0009
# Parent 76b26c09b25612513ae567b62473c634ce8c27cb
obsolete: drop deprecated methods (API)
.. api::
The following deprecated methods have
# HG changeset patch
# User Matt Harbison
# Date 1517634117 18000
# Sat Feb 03 00:01:57 2018 -0500
# Node ID b616b6a43ffd812a80348162ca499060278baf5e
# Parent 7f21211d4bf3e9cd7a21b2c2bd1fabb69b9b7e94
localrepo: drop the deprecated walk() method (API)
.. api::
The deprecated localrepo.wa
# HG changeset patch
# User Matt Harbison
# Date 1517633539 18000
# Fri Feb 02 23:52:19 2018 -0500
# Node ID b71a66ddae5be734a660be91aa6ceadcff59c541
# Parent a6c740bc66e17962642dc9ad87ce0ca4769f1947
obsutil: drop deprecated methods (API)
.. api::
The following deprecated methods have b
# HG changeset patch
# User Matt Harbison
# Date 1517633305 18000
# Fri Feb 02 23:48:25 2018 -0500
# Node ID a6c740bc66e17962642dc9ad87ce0ca4769f1947
# Parent 14e7553aa4b1e94e3ff6ac06bb26e7950daf0009
revset: drop deprecated evolution predicates
diff --git a/mercurial/revset.py b/mercurial/r
# HG changeset patch
# User Matt Harbison
# Date 1517633637 18000
# Fri Feb 02 23:53:57 2018 -0500
# Node ID 859ae990404c55b790e297a17bd65ccb89cee9cb
# Parent b71a66ddae5be734a660be91aa6ceadcff59c541
templatekw: drop the deprecated '{troubles}' keyword
diff --git a/mercurial/templatekw.py b
# HG changeset patch
# User Matt Harbison
# Date 1517633872 18000
# Fri Feb 02 23:57:52 2018 -0500
# Node ID 7f21211d4bf3e9cd7a21b2c2bd1fabb69b9b7e94
# Parent 859ae990404c55b790e297a17bd65ccb89cee9cb
dirstate: drop deprecated methods (API)
.. api::
beginparentchange() and endparentchang
On Fri, 02 Feb 2018 06:07:20 -0500, Yuya Nishihara wrote:
On Thu, 01 Feb 2018 20:29:29 -0500, Matt Harbison wrote:
# HG changeset patch
# User Matt Harbison
# Date 1517281788 18000
# Mon Jan 29 22:09:48 2018 -0500
# Node ID dac55f22cd775a8d3a213e9b6716f03e49e1e765
# Parent 0088fad7fa84a
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> cmdutil.py:1593
> else:
> def write(s, **kw):
> fp.write(s)
We no longer need this `write()` wrapper because no labeling is required if
lothiraldan updated this revision to Diff 5151.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1952?vs=5024&id=5151
REVISION DETAIL
https://phab.mercurial-scm.org/D1952
AFFECTED FILES
mercurial/commands.py
mercurial/exchange.py
CHANGE DETAILS
diff
lothiraldan updated this revision to Diff 5152.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1954?vs=5026&id=5152
REVISION DETAIL
https://phab.mercurial-scm.org/D1954
AFFECTED FILES
mercurial/bundle2.py
CHANGE DETAILS
diff --git a/mercurial/bundle
lothiraldan updated this revision to Diff 5150.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1951?vs=5023&id=5150
REVISION DETAIL
https://phab.mercurial-scm.org/D1951
AFFECTED FILES
mercurial/bundle2.py
mercurial/commands.py
CHANGE DETAILS
diff
lothiraldan added a comment.
Now that we have more time to review this series, this is the part I am the
least comfortable with. I think we could/should extract the stream part
generator somewhere else than exchange.py. Maybe bundle2.py directly but I'm
not sure. Any ideas?
REPOSITORY
rHG
lothiraldan added a reviewer: durin42.
lothiraldan added a subscriber: durin42.
lothiraldan added a comment.
@durin42 please tell me if I am on the right tracks
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
To: lothiraldan, #hg-reviewers, durin42
Cc: durin
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
With this commit, util.py lose 313 lines
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
AFFECTED FILES
contrib/synthrepo.
On Tue, Jan 30, 2018 at 5:45 AM, Sean Farley wrote:
>
> Pulkit Goyal <7895pul...@gmail.com> writes:
>
>>
>> Sean, how about getting some work done for mercurial-scm.org?
>
> Sorry about the delay. Is it too late for this now?
Nope, we participate under PSF and hence we don't need to apply
directl
On Thu, 01 Feb 2018 20:29:29 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1517281788 18000
> # Mon Jan 29 22:09:48 2018 -0500
> # Node ID dac55f22cd775a8d3a213e9b6716f03e49e1e765
> # Parent 0088fad7fa84a6ec668682e137273e252bc7441c
> lfs: emit a status me
# HG changeset patch
# User Yuya Nishihara
# Date 1517030246 -32400
# Sat Jan 27 14:17:26 2018 +0900
# Node ID 522864fae7f6de76a49f80baf267d455a9a480dd
# Parent fe731c4b62ea05def7ed74a30d23a36a3adaefbd
tests: make doctest py3-compatible again
A parsed tree is replaced with parse(expr) becau
# HG changeset patch
# User Yuya Nishihara
# Date 1516505803 -32400
# Sun Jan 21 12:36:43 2018 +0900
# Node ID 85fffc6b5554b64deb39a798fc3f6e2202f90a9b
# Parent bc1c16b34e84ba7f08a80cfd48d43b6b60388282
logcmdutil: rename classes and functions to conform to our coding style (API)
show_change
# HG changeset patch
# User Yuya Nishihara
# Date 1516506519 -32400
# Sun Jan 21 12:48:39 2018 +0900
# Node ID 4d73d231cfcbe6f58355da6d9156f116ebffd0e6
# Parent 85fffc6b5554b64deb39a798fc3f6e2202f90a9b
logcmdutil: drop redundant "log" from function names (API)
A few exceptions:
- s/loglimi
# HG changeset patch
# User Yuya Nishihara
# Date 1516507383 -32400
# Sun Jan 21 13:03:03 2018 +0900
# Node ID 490c47454ca5727475db6039802017bce51495d7
# Parent 4d73d231cfcbe6f58355da6d9156f116ebffd0e6
cmdutil: drop aliases for logcmdutil functions (API)
.. api::
Log-related utility fun
yuja added a comment.
I'll drop this from hg-committed. Please make sure to touch your local
revision
before pulling.
INLINE COMMENTS
> commands.py:1674
> editor = ui.geteditor()
> ui.system("%s \"%s\"" % (editor, f),
>onerr=error.Abort, errprefix=_("e
mharbison72 added a comment.
Should dateutil.py be created with ‘hg cp’ to make annotate easier?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
To: lothiraldan, #hg-reviewers, durin42
Cc: mharbison72, durin42, mercurial-devel
___
yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.
These functions look quite similar. Perhaps we can extract a helper function
`f(repo, subset, x, rtypes)`.
INLINE COMMENTS
> remotenames.py:35
> registrar,
> +revset,
> +
> On Feb 2, 2018, at 6:46 AM, Yuya Nishihara wrote:
>
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1517030246 -32400
> # Sat Jan 27 14:17:26 2018 +0900
> # Node ID 522864fae7f6de76a49f80baf267d455a9a480dd
> # Parent fe731c4b62ea05def7ed74a30d23a36a3adaefbd
> tests: make doctest
yuja added inline comments.
INLINE COMMENTS
> bdiff.c:197
> + const char *text;
> + int i, start = 0;
> + Py_ssize_t nelts = 0, size;
Perhaps Py_ssize_t is preferred.
> bdiff.c:202
> + if (!PyArg_ParseTuple(args, "s#", &text, &size))
> + goto abort;
> + if (!size
martinvonz added inline comments.
INLINE COMMENTS
> yuja wrote in commands.py:1674
> The variable `f` is used here.
Wow, good catch! Thanks for reading carefully.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1994
To: martinvonz, #hg-reviewers, indygreg
Cc: yuja
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2006
AFFECTED FILES
hgext/narrow/__init__.py
hgext/narrow/narrowbundle2.py
hgext/narrow/narrowchang
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
It's worth considering at this point if we should just move the two
ellipsis functions to core tagged experimental or something, since
they're not really narrowi
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This became obvious when preparing the previous change, so there's no
reason to not just do it now while it's easy.
REPOSITORY
rHG Mercurial
REVISION DETAIL
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We can just move to "narrow" or similar when we finalize the
format. I'm not sure what the migration process from one requirement
to another should look like, bu
durin42 created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is the correct place to register this type of flag.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2004
AFFECTED FILES
hgext/narrow/narrowbundle2.py
hgext/narrow/narrowcommands.py
CHANGE DETAILS
dif
durin42 marked 6 inline comments as done.
durin42 added a subscriber: martinvonz.
durin42 added a comment.
Alrighty, I've added some follow-ups. There's one question for Martin here,
which I think will result in one more follow-up to improve a comment. Take
another look?
INLINE COMMENTS
> i
durin42 added a comment.
I think this is a reasonable approach. Do mark the copy though for blame
preservation, and make sure to add utils/__init__.py and add mercurial.utils to
the setup.py
Thanks!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
To:
durin42 added inline comments.
INLINE COMMENTS
> indygreg wrote in bdiff.c:216-217
> I have a feeling this extra line scan will matter in a benchmark. Could you
> `perf record` the new `hg perf*` command and verify? If it is a big deal, I
> would allocate an `int[16384]` array on the stack or s
durin42 updated this revision to Diff 5160.
durin42 marked 7 inline comments as done.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1973?vs=5086&id=5160
REVISION DETAIL
https://phab.mercurial-scm.org/D1973
AFFECTED FILES
mercurial/cext/bdiff.c
merc
martinvonz added inline comments.
INLINE COMMENTS
> durin42 wrote in narrowbundle2.py:223
> Hmm, I think this might be talking about client versions in the server code.
> @martinvonz do you remember what's going on here? If not I can dig more.
Copied from here:
https://www.mercurial-scm.org/re
pulkit updated this revision to Diff 5161.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2002?vs=5149&id=5161
REVISION DETAIL
https://phab.mercurial-scm.org/D2002
AFFECTED FILES
hgext/remotenames.py
tests/test-logexchange.t
CHANGE DETAILS
diff --
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
nameswithallthewordssmashedtogetherarehardtoread.
especiallyifenglishisnotyourprimarylanguage.
Let's align with the rest of the programming universe and
al
pulkit accepted this revision.
pulkit added a comment.
I am +1 on this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2010
To: indygreg, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing li
durin42 accepted this revision as: durin42.
durin42 added a comment.
I'm also +1 on this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2010
To: indygreg, #hg-reviewers, pulkit, durin42
Cc: durin42, pulkit, mercurial-devel
__
indygreg added a comment.
We can treat two requirements strings as equivalent.
The trick is once we introduce a requirements string in the wild, we can't
make BC changes to its format. i.e. the behavior surrounding a store
requirement must be immutable over time. So e.g. if we introduce
martinvonz requested changes to this revision.
martinvonz added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> narrowrevlog.py:16-20
> ELLIPSIS_NODE_FLAG = 1 << 14
> revlog.REVIDX_KNOWN_FLAGS |= ELLIPSIS_NODE_FLAG
> -if (util.safehasattr(revlog, 'REVIDX_FLAGS_
indygreg added a comment.
Should we alias the symbols into `util` to avoid the massive API break? We
already re-export a number of symbols from `util`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
To: lothiraldan, #hg-reviewers, durin42
Cc: indygreg, mha
durin42 added a comment.
Probably, but I'd also like to time-box how long we do those exports to a
release cycle or two so we can get out from under the mess.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2003
To: lothiraldan, #hg-reviewers, durin42
Cc: indygr
indygreg added inline comments.
INLINE COMMENTS
> narrowrevlog.py:25
>
> -revlog.addflagprocessor(ELLIPSIS_NODE_FLAG,
> +revlog.addflagprocessor(revlog.ELLIPSIS_NODE_FLAG,
> (readtransform, writetransform, rawtransform))
Does this also need to move to core? What happen
martinvonz added inline comments.
INLINE COMMENTS
> revlog.py:60
> REVLOGV2 = 0xDEAD
> +ELLIPSIS_NODE_FLAG = (1 << 14)
> FLAG_INLINE_DATA = (1 << 16)
See comment on earlier patch that the flag is already defined here (line 71),
unless I'm missing something
REPOSITORY
rHG Mercurial
REVISIO
indygreg added a comment.
I'm still reviewing. Just thought I'd flush another batch of feedback :)
INLINE COMMENTS
> narrowrepo.py:28-33
> +def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
> +orig(sourcerepo, destrepo, **kwargs)
> +if requirement in sourcerepo.requirements:
>
indygreg added a comment.
Another batch before I head off to a meeting...
INLINE COMMENTS
> narrowcopies.py:1
> +# narrowcopies.py - extensions to mercurial copies module to support narrow
> +# clones
Copy code is complex and has performance concerns. I'd like to see this moved
into core so
Subscribe to https://www.mercurial-scm.org/wiki/4.6sprint and/or watch the
list. We started planning a little late this time, so we're just picking dates
that we know work for most reviewers and trying to make that work. I hope to
have it finalized middle of next week.
Sorry for the short notic
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb9e9f1280617: httppeer: remove support for connecting to
<0.9.1 servers (BC) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG0d8024be7166: internals: document when "hello"
and "capabilities" commands were added (authored by indygreg,
committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercuria
indygreg added a comment.
I'm still only partly through the changegroup and bundle code. Haven't looked
at commands or tests yet. I think I'm going to take a break for a bit because
this is a lot of code to absorb!
INLINE COMMENTS
> narrowbundle2.py:37
> +
> +narrowcap = 'narrow'
> +narrowa
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Tools that did not use labels already, used only one, or used some label other
than the exact strings of "local" or "other" were unmodified. Cases that used
th
68 matches
Mail list logo