phillco updated this revision to Diff 4348.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1652?vs=4347=4348
REVISION DETAIL
https://phab.mercurial-scm.org/D1652
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-conflicts.t
phillco added inline comments.
INLINE COMMENTS
> krbullock wrote in rebase.py:393
> Rather than having this method spookily set self.wctx, why not make
> `_assignworkingcopy` _return_ the wctx (and rename it accordingly)?
Good point, I'll send a followup.
REPOSITORY
rHG Mercurial
REVISION
phillco updated this revision to Diff 4347.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1652?vs=4346=4347
REVISION DETAIL
https://phab.mercurial-scm.org/D1652
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff
phillco updated this revision to Diff 4346.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1652?vs=4345=4346
REVISION DETAIL
https://phab.mercurial-scm.org/D1652
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is just a very simple start, but verifies some of the basic cases of an
in-memory rebase.
REPOSITORY
rHG Mercurial
REVISION DETAIL
phillco added a comment.
(To make this easier to review, I sent https://phab.mercurial-scm.org/D1651
as an abandoned diff that just makes the changes to the `log -G` calls. You
could take that one, then run the whole test suite and accept the changes, if
it'd be easier to review.)
phillco 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/D1651
AFFECTED FILES
tests/test-mq-header-date.t
tests/test-mq-header-from.t
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Commit hashes are a useful way to ensure the content of commits made in the
tests are not changing, even if we don't query every aspect of every commit.
(And
On Sun, 10 Dec 2017 18:28:03 -0500, Augie Fackler wrote:
On Dec 10, 2017, at 5:39 PM, Matt Harbison
wrote:
On Sun, 10 Dec 2017 16:48:26 -0500, Augie Fackler
wrote:
On Dec 10, 2017, at 3:47 PM, Matt Harbison
# HG changeset patch
# User Matt Harbison
# Date 1512963935 18000
# Sun Dec 10 22:45:35 2017 -0500
# Node ID 2cb32998a00989f2abab3a4bf330ab6a13bb5cec
# Parent e4c1d9c1ec94052a062c91f1b4570fabf5ed8bd2
check-code: drop the rules for adding (glob) for Windows paths
# HG changeset patch
# User Matt Harbison
# Date 1512951708 18000
# Sun Dec 10 19:21:48 2017 -0500
# Node ID e4c1d9c1ec94052a062c91f1b4570fabf5ed8bd2
# Parent dfae14354660d240517a37cdeb785dd587d343fa
run-tests: stop automatically adding a (glob) for bundle backup
20 new changesets in mercurial:
https://www.mercurial-scm.org/repo/hg/rev/d13526333835
changeset: 35309:d13526333835
user:Joerg Sonnenberger
date:Wed Dec 06 15:46:41 2017 +0100
summary: phases: drop the list with phase of each rev, always comput phase
sets
> On Dec 10, 2017, at 5:39 PM, Matt Harbison wrote:
>
> On Sun, 10 Dec 2017 16:48:26 -0500, Augie Fackler wrote:
>
>>
>>> On Dec 10, 2017, at 3:47 PM, Matt Harbison wrote:
>>>
>>> # HG changeset patch
>>> # User Matt Harbison
On Sun, 10 Dec 2017 16:48:26 -0500, Augie Fackler wrote:
On Dec 10, 2017, at 3:47 PM, Matt Harbison
wrote:
# HG changeset patch
# User Matt Harbison
# Date 1512882971 18000
# Sun Dec 10 00:16:11 2017 -0500
# Node ID
> On Dec 10, 2017, at 3:47 PM, Matt Harbison wrote:
>
> # HG changeset patch
> # User Matt Harbison
> # Date 1512882971 18000
> # Sun Dec 10 00:16:11 2017 -0500
> # Node ID ebc7a05d9389989fc2e81d30fa1c10dd01be9a76
> # Parent
joerg.sonnenberger added a comment.
This version should be committable. It introduces the necessary API for
isolating further changes and gives a small improvement already. I'll be
looking at provider a memory and time efficient sparce vector next, that's
where the real benefits will be.
joerg.sonnenberger updated this revision to Diff 4341.
joerg.sonnenberger edited the summary of this revision.
joerg.sonnenberger retitled this revision from "[PoC] transaction: split
changes['phases'] into sets for src and target phase" to "transaction: encodes
tuples in changes['phases'] as 4
# HG changeset patch
# User Matt Harbison
# Date 1512882971 18000
# Sun Dec 10 00:16:11 2017 -0500
# Node ID ebc7a05d9389989fc2e81d30fa1c10dd01be9a76
# Parent e1119050f15e2169ac766e6a69eeab70729e9e40
run-tests: accept '\' vs '/' path differences without '(glob)'
# HG changeset patch
# User Matt Harbison
# Date 1512882036 18000
# Sun Dec 10 00:00:36 2017 -0500
# Node ID e1119050f15e2169ac766e6a69eeab70729e9e40
# Parent d607e334441c01020660497186aa11945bba670e
run-tests: suggest a (glob) for os.path.sep mismatches with '\r\n'
# HG changeset patch
# User Matt Harbison
# Date 1512881204 18000
# Sat Dec 09 23:46:44 2017 -0500
# Node ID d607e334441c01020660497186aa11945bba670e
# Parent c7d49b87c1ee06b14d72de0ff58018bb10b49220
tests: stabilize the sorted output of list-tree.py on Windows
The
# HG changeset patch
# User Augie Fackler
# Date 1512928257 18000
# Sun Dec 10 12:50:57 2017 -0500
# Node ID a58ab92c962337fe177001ec17df0efc673e8279
# Parent fd3e0c7b22d8807e30f96f734d10c59f4433
_readchannel: if a read failure is due to a broken server, report that
# HG changeset patch
# User Augie Fackler
# Date 1512927456 18000
# Sun Dec 10 12:37:36 2017 -0500
# Node ID fd3e0c7b22d8807e30f96f734d10c59f4433
# Parent 22767a1e61acff3521c0b84589546906274cdbcf
config: un-break showconfig wrapper when environment variables are used
# HG changeset patch
# User Augie Fackler
# Date 1512928357 18000
# Sun Dec 10 12:52:37 2017 -0500
# Node ID 20fdbd5e5d426bb710df2be46b7877ea99d18ada
# Parent a58ab92c962337fe177001ec17df0efc673e8279
hgclient: look for an open server before closing it in ResponseError
On Sun, Dec 10, 2017 at 2:58 AM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara
> # Date 1512902379 -32400
> # Sun Dec 10 19:39:39 2017 +0900
> # Node ID 85a8d0279d24d039a4f113179dcafac44a3eb93c
> # Parent
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc7d49b87c1ee: tests: use Python to write binary data in lfs
test instead of shell (authored by durin42, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D1636?vs=4303=4340#toc
yuja added a comment.
In https://phab.mercurial-scm.org/D1622#27981, @joerg.sonnenberger wrote:
> Like I said, this is primarily a proof of concept. I'm still playing with
different approaches
Ah, okay. I've added [PoC] to the subject so this won't be queued by mistake.
# HG changeset patch
# User Yuya Nishihara
# Date 1512902509 -32400
# Sun Dec 10 19:41:49 2017 +0900
# Node ID 9766da17d816b8c919fc6df2ea6a493f533b615f
# Parent 85a8d0279d24d039a4f113179dcafac44a3eb93c
debugformat: embed raw values in JSON and template output
diff --git
# HG changeset patch
# User Yuya Nishihara
# Date 1512902615 -32400
# Sun Dec 10 19:43:35 2017 +0900
# Node ID d4a53118544e976ef3809e6e2fda77e39034da8d
# Parent 9766da17d816b8c919fc6df2ea6a493f533b615f
upgrade: simplify workaround for repo.ui.copy()
Copied from
# HG changeset patch
# User Yuya Nishihara
# Date 1512902379 -32400
# Sun Dec 10 19:39:39 2017 +0900
# Node ID 85a8d0279d24d039a4f113179dcafac44a3eb93c
# Parent ea645c6c6d4609a8beedee97610ce27cb4d18a6c
debugformat: flush formatter output per item
diff --git
29 matches
Mail list logo