This revision was automatically updated to reflect the committed changes.
Closed by commit rHG21e77ede77ab: narrow: factor out logic to build ellipses
related b2parts in separate fn (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG92f584065b4f: narrow: remove unrequired compat code for old
versions of hg (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
# HG changeset patch
# User Matt Harbison
# Date 1558666211 14400
# Thu May 23 22:50:11 2019 -0400
# Branch stable
# Node ID be145b004d53ec01e5a5ffcd4ca0f7e6245746b1
# Parent 4cb54e688c12790fcf3cacff2b2fb3822e9f8e8f
manifest: add some documentation to _lazymanifest python code
It was not
# HG changeset patch
# User Matt Harbison
# Date 1558662864 14400
# Thu May 23 21:54:24 2019 -0400
# Branch stable
# Node ID 4cb54e688c12790fcf3cacff2b2fb3822e9f8e8f
# Parent 89c0c8edc9d40ccb707acbeccff25891c5456521
manifest: avoid corruption by dropping removed files with pure (issue5801)
# HG changeset patch
# User Matt Harbison
# Date 1558661959 14400
# Thu May 23 21:39:19 2019 -0400
# Branch stable
# Node ID 89c0c8edc9d40ccb707acbeccff25891c5456521
# Parent 2338bdea44744312e42632d68bc00491184c748b
tests: demonstrate broken manifest generation with the pure module
This
hooper added inline comments.
INLINE COMMENTS
> durin42 wrote in fix.py:106
> I wonder if it'd be more generally useful to run the fixer in the repo root
> than the same `pwd` as the command invocation. WDYT?
It depends on whether we want to make it easier for tools that want to examine
the
On Thu, 23 May 2019 13:29:05 +0200, Georges Racinet wrote:
> # HG changeset patch
> # User Georges Racinet
> # Date 1558603154 -7200
> # Thu May 23 11:19:14 2019 +0200
> # Node ID 36b4c4869531b3de0b101c941b77b94da85890b7
> # Parent 52beb1b8a64967bead7bc9e8a63c460430729b7a
> # EXP-Topic
On Thu, 23 May 2019 19:13:48 +0200, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David
> # Date 1558631139 -7200
> # Thu May 23 19:05:39 2019 +0200
> # Node ID b6d5cc6ccb0a14d094590a42bdaaab41f74ed945
> # Parent b02f3aa2fab572dac4deb5271d349d1cdceedf96
> # EXP-Topic
Hello all,
Thanks for the comments. I found that a commit with an unresolved state
should be similar to a normal merge commit with some metadata about the
files which have unresolved conflicts. This is how I thought of creating a
commit with unresolved files:
* Flag the changeset as unresolved
# HG changeset patch
# User Pierre-Yves David
# Date 1558631139 -7200
# Thu May 23 19:05:39 2019 +0200
# Node ID b6d5cc6ccb0a14d094590a42bdaaab41f74ed945
# Parent b02f3aa2fab572dac4deb5271d349d1cdceedf96
# EXP-Topic perf-followup
# Available At https://bitbucket.org/octobus/mercurial-devel/
On 5/23/19 4:16 PM, Yuya Nishihara wrote:
On Thu, 23 May 2019 09:03:48 +0200, Pierre-Yves David wrote:
On 5/23/19 1:21 AM, Yuya Nishihara wrote:
On Wed, 22 May 2019 16:46:11 +0200, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David
# Date 1558445208 -7200
# Tue May
# HG changeset patch
# User Pierre-Yves David
# Date 1558628108 -7200
# Thu May 23 18:15:08 2019 +0200
# Node ID 72771aee91364de80511c22b356b724cde35f73f
# Parent 2a0e626bc8f1b7ac1cf38789fcc32876f8684f91
# EXP-Topic perf-mergecopies
# Available At
# HG changeset patch
# User Pierre-Yves David
# Date 1558612921 -7200
# Thu May 23 14:02:01 2019 +0200
# Node ID 1587f4e0cca53e0f6074599c079b664461877dfb
# Parent c5959a988d0d0142c62ab4a0bdd54732f18fc2c9
# EXP-Topic perf-mergecopies
# Available At
# HG changeset patch
# User Pierre-Yves David
# Date 1558615682 -7200
# Thu May 23 14:48:02 2019 +0200
# Node ID 2a0e626bc8f1b7ac1cf38789fcc32876f8684f91
# Parent 1587f4e0cca53e0f6074599c079b664461877dfb
# EXP-Topic perf-mergecopies
# Available At
# HG changeset patch
# User Pierre-Yves David
# Date 1558603188 -7200
# Thu May 23 11:19:48 2019 +0200
# Node ID 041e1cfff879810c62afef3101db4e8b016a62a4
# Parent b162229ebe0de1cac21b8287ecee5f2ef0a9d530
# EXP-Topic perf-mergecopies
# Available At
# HG changeset patch
# User Pierre-Yves David
# Date 1558612171 -7200
# Thu May 23 13:49:31 2019 +0200
# Node ID c5959a988d0d0142c62ab4a0bdd54732f18fc2c9
# Parent 041e1cfff879810c62afef3101db4e8b016a62a4
# EXP-Topic perf-mergecopies
# Available At
martinvonz added a comment.
This is going to break our server. Can you make it work with existing servers
for a while (behave differently depending on capability, I suppose), so we can
get a chance to transition? I would think it's not going to be terribly hard,
but let me know if it would
martinvonz added inline comments.
INLINE COMMENTS
> narrowbundle2.py:69
> +def generateellipsesbundle2(bundler, repo, oldinclude, oldexclude,
> newinclude,
> +newexclude, version, common, known, depth,
> heads):
> +newmatch = narrowspec.match(repo.root,
martinvonz added a comment.
In https://phab.mercurial-scm.org/D6432#93545, @yuja wrote:
> > @@ -1384,26 +1384,26 @@
> >
> > >>> _rootsdirsandparents(
> > ... [(b'glob', b'g/h/*', b''), (b'glob', b'g/h', b''),
> > ... (b'glob', b'g*', b'')])
> >
> > - (['g/h',
Queued, thanks.
(I'm also updating the tox environment list to include more hg versions.)
> On May 22, 2019, at 21:29, Matt Harbison wrote:
>
> # HG changeset patch
> # User Matt Harbison
> # Date 1557281819 14400
> # Tue May 07 22:16:59 2019 -0400
> # Node ID
ngoldbaum 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/D6442
AFFECTED FILES
mercurial/help.py
tests/test-help.t
CHANGE DETAILS
diff --git
ngoldbaum 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/D6441
AFFECTED FILES
mercurial/help.py
CHANGE DETAILS
diff --git a/mercurial/help.py
kevincox accepted this revision.
kevincox added inline comments.
INLINE COMMENTS
> discovery.rs:124
> +fn next( self) -> Option {
> +if self.cur > 1 {
> +return None;
I think it would be nice to remove the magic number.
if self.cur >= self.parents.len()
REPOSITORY
On 5/23/19 3:14 PM, Martin von Zweigbergk wrote:
On Wed, May 22, 2019, 07:49 Pierre-Yves David
mailto:pierre-yves.da...@ens-lyon.org>>
wrote:
# HG changeset patch
# User Pierre-Yves David mailto:pierre-yves.da...@octobus.net>>
# Date 1558445208 -7200
# Tue May 21
On Thu, 23 May 2019 09:03:48 +0200, Pierre-Yves David wrote:
> On 5/23/19 1:21 AM, Yuya Nishihara wrote:
> > On Wed, 22 May 2019 16:46:11 +0200, Pierre-Yves David wrote:
> >> # HG changeset patch
> >> # User Pierre-Yves David
> >> # Date 1558445208 -7200
> >> # Tue May 21 15:26:48 2019 +0200
https://bz.mercurial-scm.org/show_bug.cgi?id=6145
Bug ID: 6145
Summary: hg help internals.foo returns wireprotocolv2 docs if
foo isn't an internals help topic
Product: Mercurial
Version: default branch
Hardware: PC
durin42 added inline comments.
INLINE COMMENTS
> fix.py:106
> +
> +Fixer tools are run the in same working directory as the :hg:`fix` command.
> This
> +allows them to read configuration files from the working copy, or even write
> to
I wonder if it'd be more generally useful to run the fixer
On Wed, May 22, 2019, 07:49 Pierre-Yves David <
pierre-yves.da...@ens-lyon.org> wrote:
> # HG changeset patch
> # User Pierre-Yves David
> # Date 1558445208 -7200
> # Tue May 21 15:26:48 2019 +0200
> # Node ID b5c316b4248f3add425313ac0f443c706b79
> # Parent
martinvonz marked an inline comment as done.
martinvonz added inline comments.
INLINE COMMENTS
> pulkit wrote in test-convert-hg-sink.t:604
> Oh, I understood the merge commit other way. So this should show `a` or not?
> I am not sure whether we consider mod change as file change or not.
A
pulkit added inline comments.
INLINE COMMENTS
> pulkit wrote in test-convert-hg-sink.t:604
> Shouldn't this show `b`?
Oh, I understood the merge commit other way. So this should show `a` or not? I
am not sure whether we consider mod change as file change or not.
REPOSITORY
rHG Mercurial
pulkit added inline comments.
INLINE COMMENTS
> test-convert-hg-sink.t:604
> +# No files changed
> + $ hg log -r 3 -T '{files}\n'
> +
Shouldn't this show `b`?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6408
To: martinvonz, #hg-reviewers
Cc: pulkit,
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb02f3aa2fab5: test: add missing cd .. to test
case (authored by hooper, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6439?vs=15243=15245
# HG changeset patch
# User Georges Racinet
# Date 1558569932 -7200
# Thu May 23 02:05:32 2019 +0200
# Node ID b545a9ff26590cfb6a8c5f983f7b5ac881ef1287
# Parent 1ea01a0c2d35420f3b9f1a9e98e7bb41de29956a
# EXP-Topic rust-modulepolicy
rust: new rust options in setup.py
The --rust global
# HG changeset patch
# User Georges Racinet
# Date 1558603154 -7200
# Thu May 23 11:19:14 2019 +0200
# Node ID 36b4c4869531b3de0b101c941b77b94da85890b7
# Parent 52beb1b8a64967bead7bc9e8a63c460430729b7a
# EXP-Topic rust-modulepolicy
rust: module policy with importrust
We introduce two
# HG changeset patch
# User Georges Racinet
# Date 1558603373 -7200
# Thu May 23 11:22:53 2019 +0200
# Node ID 1ea01a0c2d35420f3b9f1a9e98e7bb41de29956a
# Parent 36b4c4869531b3de0b101c941b77b94da85890b7
# EXP-Topic rust-modulepolicy
rust: using policy.importrust from Python callers
This
On 5/23/19 1:21 AM, Yuya Nishihara wrote:
On Wed, 22 May 2019 16:46:11 +0200, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David
# Date 1558445208 -7200
# Tue May 21 15:26:48 2019 +0200
# Node ID b5c316b4248f3add425313ac0f443c706b79
# Parent
36 matches
Mail list logo