https://bz.mercurial-scm.org/show_bug.cgi?id=5782
Bug ID: 5782
Summary: rebase complains about divergence when rebasing commit
with hidden successor
Product: Mercurial
Version: default branch
Hardware: PC
# HG changeset patch
# User Matt Harbison
# Date 1517979217 18000
# Tue Feb 06 23:53:37 2018 -0500
# Branch stable
# Node ID 7b2b82f891bf6355ed87c06ed9198bfcd033fe7d
# Parent 1d60ad093792706e1dc7a52b20942593f2c19655
fileset: don't abort when running copied() on a
quark updated this revision to Diff 5275.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2066?vs=5272=5275
REVISION DETAIL
https://phab.mercurial-scm.org/D2066
AFFECTED FILES
tests/drawdag.py
tests/test-lfs-bundle.t
CHANGE DETAILS
diff --git
quark updated this revision to Diff 5273.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2067?vs=5269=5273
REVISION DETAIL
https://phab.mercurial-scm.org/D2067
AFFECTED FILES
mercurial/changegroup.py
mercurial/revlog.py
tests/test-lfs-bundle.t
quark updated this revision to Diff 5274.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2068?vs=5270=5274
REVISION DETAIL
https://phab.mercurial-scm.org/D2068
AFFECTED FILES
mercurial/revlog.py
tests/test-lfs-bundle.t
tests/test-revlog-raw.py
quark updated this revision to Diff 5272.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2066?vs=5268=5272
REVISION DETAIL
https://phab.mercurial-scm.org/D2066
AFFECTED FILES
tests/drawdag.py
tests/test-lfs-bundle.t
CHANGE DETAILS
diff --git
Ivzhh added a comment.
Thank you @indygreg for your detailed explanation!
I understand the process now, and I will go back reading the developer's
guide thoroughly again. I will try my best to provide a relatively clean stack
of patches.
Thank you for you time!
REPOSITORY
rHG
indygreg added a comment.
I want to emphasize that I'm not committed to any implementation detail at
this point in time. I've very opened minded about alternatives and making
backwards incompatible changes throughout the 4.6 release cycle.
That being said, I am trying to make forward
indygreg added a comment.
We generally prefer that patches to Mercurial be small and do a single thing.
This makes it easier to review and understand changes, since each change can be
evaluated in isolation. If you submit changesets together using `hg phabsend`,
they automatically show up
Ivzhh added a comment.
Sure, thank you for the comments! I can definitely prepare makefile and
setup.py to make the building process work with rust part. I am planning to
change the policy.py module to support and try to load rust modules and run all
the tests. I will submit a new patch
quark updated this revision to Diff 5271.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2069?vs=5267=5271
REVISION DETAIL
https://phab.mercurial-scm.org/D2069
AFFECTED FILES
mercurial/revlog.py
tests/test-lfs-bundle.t
CHANGE DETAILS
diff --git
quark updated this revision to Diff 5269.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2067?vs=5264=5269
REVISION DETAIL
https://phab.mercurial-scm.org/D2067
AFFECTED FILES
mercurial/changegroup.py
mercurial/revlog.py
tests/test-lfs-bundle.t
quark updated this revision to Diff 5270.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2068?vs=5265=5270
REVISION DETAIL
https://phab.mercurial-scm.org/D2068
AFFECTED FILES
mercurial/revlog.py
tests/test-lfs-bundle.t
tests/test-revlog-raw.py
quark updated this revision to Diff 5268.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2066?vs=5263=5268
REVISION DETAIL
https://phab.mercurial-scm.org/D2066
AFFECTED FILES
tests/test-lfs-bundle.t
CHANGE DETAILS
diff --git
quark updated this revision to Diff 5267.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2069?vs=5266=5267
REVISION DETAIL
https://phab.mercurial-scm.org/D2069
AFFECTED FILES
mercurial/revlog.py
tests/test-lfs-bundle.t
CHANGE DETAILS
diff --git
quark created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
There is no way to distinguish whether a delta base is LFS or non-LFS.
If the delta is against LFS rawtext, and the client
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When a bundle containing LFS delta uses non-LFS delta-base, or vice-versa,
the bundle will fail to apply.
REPOSITORY
rHG Mercurial
REVISION DETAIL
quark created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This happens when a LFS delta base gets a non-LFS delta from another client.
In that case, the LFS delta base needs to be
quark created this revision.
Herald added a reviewer: indygreg.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is similar to what we have done for changegroups. It is needed to make
sure the delta application code path can assume
quark added a comment.
https://bz.mercurial-scm.org/5743 bisects to this change.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D375
To: phillco, #hg-reviewers
Cc: quark, mercurial-devel
___
Mercurial-devel mailing
martinvonz added a comment.
In https://phab.mercurial-scm.org/D2013#34320, @spectral wrote:
> In https://phab.mercurial-scm.org/D2013#33867, @martinvonz wrote:
>
> > I wonder if we should instead have a --draft option for this. Reasons:
> >
> > - If we ever add a fourth phase
On Tue, Feb 6, 2018 at 6:28 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1517923456 -3600
> # Tue Feb 06 14:24:16 2018 +0100
> # Node ID eee9cca843bc557274945688ea52e16539d45e67
> # Parent
On Tue, Feb 6, 2018 at 6:28 AM, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld
> # Date 1517839431 -3600
> # Mon Feb 05 15:03:51 2018 +0100
> # Node ID 345f1c897538cd2b0a5a2fd3952b880206fd9339
> # Parent
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The docstring isn't completely accurate for the current state
of the world. But it does describe the direction future patches
will be taking things.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This workaround dates all the way back to
https://phab.mercurial-scm.org/rHGa42d27bc809dda4939c5b3807b397bcc811ebbe0 in
2008.
The code is esoteric enough to
indygreg updated this revision to Diff 5260.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2021?vs=5175=5260
REVISION DETAIL
https://phab.mercurial-scm.org/D2021
AFFECTED FILES
mercurial/hgweb/hgweb_mod.py
mercurial/wireprotoserver.py
CHANGE
indygreg updated this revision to Diff 5259.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2019?vs=5173=5259
REVISION DETAIL
https://phab.mercurial-scm.org/D2019
AFFECTED FILES
mercurial/hgweb/hgweb_mod.py
mercurial/wireprotoserver.py
CHANGE
indygreg updated this revision to Diff 5258.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1999?vs=5138=5258
REVISION DETAIL
https://phab.mercurial-scm.org/D1999
AFFECTED FILES
mercurial/hgweb/hgweb_mod.py
mercurial/wireproto.py
indygreg added a comment.
Yes, we should definitely split things into multiple crates. Small,
narrowly-focused crates does seem to be the Rust way, after all.
`hgcli` should be for things specific to the Rust implementation of `hg`. I
think this can also include the feature set of `chg`
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
The existing SSH protocol has several design flaws. Future commits
will elaborate on these flaws as new features are introduced
to combat these flaws. For now,
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
With the introduction of version 2 of the SSH wire protocol,
we will need a new peer class to speak that protocol because
it will be too difficult to shoehorn
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Upcoming work will introduce a new version of the HTTP and SSH
transports. The differences will be significant enough to consider
them new transports. So, we
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Since the protocol is now negotiated before we construct a
peer instance, we can return the negotiated protocol from the
handshake function and instantiate an
krbullock accepted this revision as: krbullock.
krbullock added a comment.
This LGTM now. I think the executable as interpreted by shlex, but without
the added flags, gives enough signal for the user to figure out what might be
wrong without confusing things.
REPOSITORY
rHG Mercurial
spectral marked an inline comment as done.
spectral added a comment.
Sorry, I forgot about this, can you take another look? I believe I addressed
your most recent comment.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1808
To: spectral, #hg-reviewers,
6 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/83b9f96ce20f
changeset: 35915:83b9f96ce20f
user:Pulkit Goyal <7895pul...@gmail.com>
date:Mon Feb 05 13:01:35 2018 +0530
summary: py3: use "%d" to convert integer to bytes
https://www.mercurial-scm.org/wiki/4.6sprint has all the details, and I'll fill
in more as I have them.
Sorry for not doing the usual planning routine on this, but time got away from
us and we decided to make some decisions quickly rather than waiting for the
usual date-picking routine.
See
Ivzhh added a comment.
I am open to the three-crates plan. Oirginally I have hgcli and hgext
separately, and I was planning to replace CFFI. I am a pypy user too, so I will
be willing to provide a python C API free crate for pypy and others.
REPOSITORY
rHG Mercurial
REVISION DETAIL
On Mon, 5 Feb 2018 09:22:02 -0800, Gregory Szorc wrote:
> On Mon, Feb 5, 2018 at 5:23 AM, Yuya Nishihara wrote:
>
> > On Mon, 05 Feb 2018 18:48:00 +0800, Anton Shestakov wrote:
> > > # HG changeset patch
> > > # User Anton Shestakov
> > > # Date 1517827181
# HG changeset patch
# User Boris Feld
# Date 1517923456 -3600
# Tue Feb 06 14:24:16 2018 +0100
# Node ID eee9cca843bc557274945688ea52e16539d45e67
# Parent 1a3e6239a2eb841a5dce5e1cf8212c54bf33
# EXP-Topic parallel-patching
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517839431 -3600
# Mon Feb 05 15:03:51 2018 +0100
# Node ID 345f1c897538cd2b0a5a2fd3952b880206fd9339
# Parent eee9cca843bc557274945688ea52e16539d45e67
# EXP-Topic parallel-patching
# Available At
On Tue, 6 Feb 2018 08:02:30 -0500, Matt Harbison wrote:
> > On Feb 6, 2018, at 7:20 AM, Yuya Nishihara wrote:
> > - prefetchfiles() could be hosted by mergemod so lfs won't need to wrap
> > applyupdates().
>
> Would it be better to keep it in cmdutil, and call it just before
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5f029d03cf71: debugcommands: introduce debugpeer command
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2025?vs=5183=5242
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG556218e08e25: sshpeer: remove support for connecting to
0.9.1 servers (BC) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG80a2b8ae42a1: sshpeer: move handshake outside of sshpeer
(authored by indygreg, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D2034?vs=5235=5251#toc
REPOSITORY
rHG
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa622a927fe03: sshpeer: document the handshake mechanism
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2035?vs=5236=5252
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf8f034344b39: sshpeer: clean up API for sshpeer.__init__
(API) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa9cffd14aa04: sshpeer: inline I/O into _validaterepo()
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2033?vs=5234=5250
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb202d360d2a4: sshpeer: move URL validation out of
sshpeer.__init__ (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG00b9e26d727b: sshpeer: establish SSH connection before
class instantiation (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG94ba29934f00: sshpeer: remove frivolous call to _cleanup()
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG805edf16e8e0: sshpeer: extract pipe cleanup logic to own
function (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG31449baf0936: sshpeer: move ssh command and repo creation
logic out of __init__ (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG83d67257ba90: tests: add low-level SSH protocol tests
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2026?vs=5227=5243
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb0d2885c5945: sshpeer: make instance a function
(authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2024?vs=5182=5241
REVISION
# HG changeset patch
# User Boris Feld
# Date 1517848487 -3600
# Mon Feb 05 17:34:47 2018 +0100
# Node ID c4015bae897ca99b12933bf74a176fa6a349681b
# Parent da0b895c385747d820294509d102d633419f8036
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517848497 -3600
# Mon Feb 05 17:34:57 2018 +0100
# Node ID 1a212682563740e031380befc949167e73b476bd
# Parent c4015bae897ca99b12933bf74a176fa6a349681b
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517847733 -3600
# Mon Feb 05 17:22:13 2018 +0100
# Node ID d238ec45ba25f7c1ea9ec22aa11a4ec699c72740
# Parent b192ee27b376523292ec1cf52c49c9382a870658
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517850280 -3600
# Mon Feb 05 18:04:40 2018 +0100
# Node ID 70bf9e3148bf504164f1e5c3a40c92ced158e921
# Parent 6e3ed0354bf4f160bb7e1402ca1548282ba8b772
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517849849 -3600
# Mon Feb 05 17:57:29 2018 +0100
# Node ID 6e3ed0354bf4f160bb7e1402ca1548282ba8b772
# Parent 9073bbc68cb1ccc5685c78dbe837f31406324028
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517848459 -3600
# Mon Feb 05 17:34:19 2018 +0100
# Node ID da0b895c385747d820294509d102d633419f8036
# Parent d238ec45ba25f7c1ea9ec22aa11a4ec699c72740
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517848514 -3600
# Mon Feb 05 17:35:14 2018 +0100
# Node ID 9073bbc68cb1ccc5685c78dbe837f31406324028
# Parent 1a212682563740e031380befc949167e73b476bd
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517846636 -3600
# Mon Feb 05 17:03:56 2018 +0100
# Node ID b192ee27b376523292ec1cf52c49c9382a870658
# Parent dddbb1b848527a89ca887fdbec25725241efa376
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517916311 -3600
# Tue Feb 06 12:25:11 2018 +0100
# Node ID dddbb1b848527a89ca887fdbec25725241efa376
# Parent 53534aa0676becd566238ce945274853526e9823
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517911721 -3600
# Tue Feb 06 11:08:41 2018 +0100
# Node ID b9d09ad843263f81e9d561d76e65671af864cc6f
# Parent cc2e588940df0435bf0e3013ebd45013a22fa8fe
# EXP-Topic revlog-fp
# Available At
# HG changeset patch
# User Boris Feld
# Date 1517914357 -3600
# Tue Feb 06 11:52:37 2018 +0100
# Node ID 53534aa0676becd566238ce945274853526e9823
# Parent 4cd271a9bd82ddca149a0dd5a2ae819a4c1db8ef
# EXP-Topic revlog-fp
# Available At
> On Feb 6, 2018, at 7:20 AM, Yuya Nishihara wrote:
>
>> On Tue, 06 Feb 2018 00:29:06 -0500, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison
>> # Date 1517771668 18000
>> # Sun Feb 04 14:14:28 2018 -0500
>> # Node ID
On Tue, 06 Feb 2018 00:29:06 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1517771668 18000
> # Sun Feb 04 14:14:28 2018 -0500
> # Node ID ab23d9644edaf62b2c3927b735d2170fc76ca711
> # Parent
On Tue, 06 Feb 2018 00:29:04 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison
> # Date 1517082796 18000
> # Sat Jan 27 14:53:16 2018 -0500
> # Node ID ae7b40a6cb0863e26e245966388d766adf065bac
> # Parent
durin42 added a subscriber: indygreg.
durin42 added a comment.
I'd be curious to see what @indygreg has to say about this, maybe wait on his
input before doing any work in response to my feedback?
I do wonder if we should have at least three crates:
1. hgcli
2. libmercurial
3.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Nothing looks awful, so we can just turn it on.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2059
AFFECTED FILES
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Nothing in here looks awful, so I think we may as well just do it.
1. skip-blame because it's just reformatting with no functionality change
REPOSITORY
rHG
72 matches
Mail list logo