Small comments inline for the tests. Overall looks good to me, but
other people should take a look since I had a hand in the design for
this patch and am therefore biased.
On 2/22/17 10:49 PM, Phil Cohen wrote:
# HG changeset patch
# User Phil Cohen
# Date 1487831905 28800
# Wed Feb 22
# HG changeset patch
# User Durham Goode
# Date 1487973639 28800
# Fri Feb 24 14:00:39 2017 -0800
# Node ID ed987b24e755a4c61c006f7d98a4ff370229faad
# Parent f01df5d2fe493376a67569756a9bc2ddffa5cd81
manifest: allow specifying the revlog filename
Previously we had hardcoded the manifest
# HG changeset patch
# User Durham Goode
# Date 1487975562 28800
# Fri Feb 24 14:32:42 2017 -0800
# Node ID 00b8fe57296ae9c657fedd40a8e4ad6eb76e4bd6
# Parent ed987b24e755a4c61c006f7d98a4ff370229faad
treemanifest: make node reuse match flat manifest behavior
In a flat manifest, a node with
Minor grammar nit. Series through here looks good to me though.
On 2/24/17 2:09 PM, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David
# Date 1487875532 -3600
# Thu Feb 23 19:45:32 2017 +0100
# Node ID fd0b7fed70ddeaf0568b02d5e0f9d982a68f1cb4
# Parent 13f7594f6a7e5cfd
On 2/24/17 2:09 PM, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David
# Date 1487590955 -3600
# Mon Feb 20 12:42:35 2017 +0100
# Node ID 07fe8ac5a9038dece502507af9e59728a6a8c13a
# Parent 419d5f42cc7b764f5304b2518146824329c32f91
# EXP-Topic color
color: drop the 'coloru
On 2/23/17 2:57 PM, Jun Wu wrote:
Congratulations on your first patch to the list!
But I think we have better ways to achieve the same goal that we may prefer
them to this patch.
1) Better way to provide conflicted file contents - in-python merge tools
From a high-level, the patch tries to s
On 2/24/17 3:25 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800:
On 2/23/17 2:57 PM, Jun Wu wrote:
Congratulations on your first patch to the list!
But I think we have better ways to achieve the same goal that we may prefer
them to this patch.
1) Better w
# HG changeset patch
# User Durham Goode
# Date 1488133007 28800
# Sun Feb 26 10:16:47 2017 -0800
# Node ID a21671dd2578fea1cb58011c392f6dec16f29dc7
# Parent 88203f26ea57627cabd7cf9c4f7843661d6c43ae
manifest: check 'if x is None' instead of 'if not x'
The old co
On 2/24/17 4:10 PM, Danek Duvall wrote:
Durham Goode wrote:
On 2/24/17 3:25 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800:
On 2/23/17 2:57 PM, Jun Wu wrote:
Congratulations on your first patch to the list!
But I think we have better ways to ac
On 2/24/17 4:04 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800:
Maybe I don't understand your proposal. The current merge-tools are
invoked once per file. Would this python merge-tool be invoked in some
other way where it's given the full conflict state at
On 2/27/17 11:01 AM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-27 10:41:39 -0800:
On 2/24/17 4:04 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800:
Maybe I don't understand your proposal. The current merge-tools are
invoked once per fil
On 2/27/17 4:58 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800:
Do you mean outputting the actual file content in the json? I was
thinking of having just the paths to the file contents be in the json.
That way we don't have to json escape a bunch of binary
On 2/27/17 5:59 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-27 17:39:10 -0800:
On 2/27/17 4:58 PM, Jun Wu wrote:
Excerpts from Durham Goode's message of 2017-02-27 16:37:56 -0800:
Do you mean outputting the actual file content in the json? I was
thinking of having just
On 2/27/17 11:09 AM, Danek Duvall wrote:
Durham Goode wrote:
On 2/24/17 4:10 PM, Danek Duvall wrote:
Is that the central issue? That is, you want to run a tool once over all
unresolved files, rather than one at a time?
It seems like perhaps a new config option for merge-tools could
On 2/27/17 5:10 PM, Martin von Zweigbergk wrote:
+mercurial-devel again (I had initially thought my comment was not
about the patch, but it turns out it was)
On Sat, Feb 25, 2017 at 3:23 PM, Durham Goode wrote:
On 2/24/17 10:00 PM, Martin von Zweigbergk wrote:
-list
On Fri, Feb 24, 2017
On 2/28/17 9:53 AM, Martin von Zweigbergk wrote:
On Tue, Feb 28, 2017 at 9:49 AM, Durham Goode wrote:
On 2/27/17 5:10 PM, Martin von Zweigbergk wrote:
+mercurial-devel again (I had initially thought my comment was not
about the patch, but it turns out it was)
On Sat, Feb 25, 2017 at 3
# HG changeset patch
# User Durham Goode
# Date 1488304382 28800
# Tue Feb 28 09:53:02 2017 -0800
# Node ID 0a5e6ad0a25c348384bb6c14a51057b3587e2857
# Parent 88203f26ea57627cabd7cf9c4f7843661d6c43ae
manifest: allow specifying the revlog filename
Previously we had hardcoded the manifest
# HG changeset patch
# User Durham Goode
# Date 1488067881 28800
# Sat Feb 25 16:11:21 2017 -0800
# Node ID fb45d40719699efa3139e3509775fd5442c1c36a
# Parent 0a5e6ad0a25c348384bb6c14a51057b3587e2857
treemanifest: make node reuse match flat manifest behavior
In a flat manifest, a node with
On 2/27/17 9:35 AM, Jun Wu wrote:
# HG changeset patch
# User Jun Wu
# Date 1488185788 28800
# Mon Feb 27 00:56:28 2017 -0800
# Node ID 5dac612ec9a87553fcd329100846bcb01bae9d80
# Parent b4cb86ab4c719eb615a4308eafd8b1386a511eeb
# Available At
https://urldefense.proofpoint.com/v2/url?u=ht
On 2/28/17 2:41 PM, Martin von Zweigbergk wrote:
On Tue, Feb 28, 2017 at 2:34 PM, Durham Goode wrote:
On 2/27/17 9:35 AM, Jun Wu wrote:
# HG changeset patch
# User Jun Wu
# Date 1488185788 28800
# Mon Feb 27 00:56:28 2017 -0800
# Node ID 5dac612ec9a87553fcd329100846bcb01bae9d80
# HG changeset patch
# User Durham Goode
# Date 1488414957 28800
# Wed Mar 01 16:35:57 2017 -0800
# Node ID 9c89185b63f574cad1d4009f6c9dd511a2cba986
# Parent 0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa
manifest: allow specifying the revlog filename
Previously we had hardcoded the manifest
# HG changeset patch
# User Durham Goode
# Date 1488413981 28800
# Wed Mar 01 16:19:41 2017 -0800
# Node ID f99c019063bea8a0b5f66c1e79dbd0b98b1326d8
# Parent 9c89185b63f574cad1d4009f6c9dd511a2cba986
treemanifest: make node reuse match flat manifest behavior
In a flat manifest, a node with
# HG changeset patch
# User Durham Goode
# Date 1488415188 28800
# Wed Mar 01 16:39:48 2017 -0800
# Node ID b787c41767339158927232ec7a9092196e887453
# Parent 0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa
manifest: remove _repo from manifestctx objects
We were storing the repo on the manifestctx
# HG changeset patch
# User Durham Goode
# Date 1488426665 28800
# Wed Mar 01 19:51:05 2017 -0800
# Node ID a8458fe51a9d155f1daeaffdcf503e674d4d4588
# Parent b787c41767339158927232ec7a9092196e887453
revert: remove set(mf) because it's O(repo)
The revert code had a 'set(manifest
On 3/1/17 7:08 PM, Jun Wu wrote:
# HG changeset patch
# User Jun Wu
# Date 1488421266 28800
# Wed Mar 01 18:21:06 2017 -0800
# Node ID c1f380ab1539b0dc0bd05f0ef2eb15b827453dbc
# Parent 1e74c8187c9b98644ae35902c9e3faddad00f364
# Available At
https://urldefense.proofpoint.com/v2/url?u=https
On 3/2/17 8:09 AM, Ryan McElroy wrote:
On 3/2/17 7:46 AM, Yuya Nishihara wrote:
On Wed, 1 Mar 2017 17:55:25 -0800, Jun Wu wrote:
According to
https://urldefense.proofpoint.com/v2/url?u=https-3A__bz.mercurial-2Dscm.org_show-5Fbug.cgi-3Fid-3D4546-3A&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE
# HG changeset patch
# User Durham Goode
# Date 1488476378 28800
# Thu Mar 02 09:39:38 2017 -0800
# Node ID d52b0a72423f65b4f774d5b646474cdafd4a5cc0
# Parent a8458fe51a9d155f1daeaffdcf503e674d4d4588
util: add allowhardlinks module variable
To enable extensions to enable hardlinks for
# HG changeset patch
# User Durham Goode
# Date 1488478360 28800
# Thu Mar 02 10:12:40 2017 -0800
# Node ID 32c17aa5fc546a112b355e734fb71b740172cf09
# Parent a8458fe51a9d155f1daeaffdcf503e674d4d4588
util: add allowhardlinks module variable
To enable extensions to enable hardlinks for
On 3/2/17 10:12 AM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488476378 28800
# Thu Mar 02 09:39:38 2017 -0800
# Node ID d52b0a72423f65b4f774d5b646474cdafd4a5cc0
# Parent a8458fe51a9d155f1daeaffdcf503e674d4d4588
util: add allowhardlinks module variable
To
On 3/2/17 9:57 AM, Martin von Zweigbergk wrote:
On Wed, Mar 1, 2017 at 8:01 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488426665 28800
# Wed Mar 01 19:51:05 2017 -0800
# Node ID a8458fe51a9d155f1daeaffdcf503e674d4d4588
# Parent
On 3/2/17 11:55 AM, Augie Fackler wrote:
On Mar 2, 2017, at 12:37 PM, Durham Goode wrote:
On 3/2/17 8:09 AM, Ryan McElroy wrote:
On 3/2/17 7:46 AM, Yuya Nishihara wrote:
On Wed, 1 Mar 2017 17:55:25 -0800, Jun Wu wrote:
According to
https://urldefense.proofpoint.com/v2/url?u=https
On 3/3/17 9:27 AM, Martin von Zweigbergk via Mercurial-devel wrote:
# HG changeset patch
# User Martin von Zweigbergk
# Date 1456353854 28800
# Wed Feb 24 14:44:14 2016 -0800
# Node ID bf26c605e2e0772f5f49a185f4d73429e4303ca7
# Parent c22253c4c1b8bdd414f227232499ae323bd2173f
revert: move
# HG changeset patch
# User Durham Goode
# Date 1488519936 28800
# Thu Mar 02 21:45:36 2017 -0800
# Node ID 883bb49a3b40609074d56257aab7619f0c306efc
# Parent 4cebdd029399cf7c3b0fff73faf1f41af0e895d1
merge: remove uses of manifest.matches
This gets rid of the manifest.matches calls in
# HG changeset patch
# User Durham Goode
# Date 1488519862 28800
# Thu Mar 02 21:44:22 2017 -0800
# Node ID 4cebdd029399cf7c3b0fff73faf1f41af0e895d1
# Parent e2ec7a1c68da7209233489a5c05efc5728463632
copies: remove use of manifest.matches
Convert the existing use of manifest.matches to use
# HG changeset patch
# User Durham Goode
# Date 1488569391 28800
# Fri Mar 03 11:29:51 2017 -0800
# Node ID 207763e895c7d24885df22f5b9c0df5494d77daf
# Parent 78e0fb2bd1bc972444ae08e7b7165da66cbf53a3
context: remove uses of manifest.matches
This removes the uses of manifest.matches in
# HG changeset patch
# User Durham Goode
# Date 1488566235 28800
# Fri Mar 03 10:37:15 2017 -0800
# Node ID 78e0fb2bd1bc972444ae08e7b7165da66cbf53a3
# Parent 883bb49a3b40609074d56257aab7619f0c306efc
status: handle more node indicators in buildstatus
There are several different node markers
# HG changeset patch
# User Durham Goode
# Date 1488519802 28800
# Thu Mar 02 21:43:22 2017 -0800
# Node ID e2ec7a1c68da7209233489a5c05efc5728463632
# Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f
manifest: add match argument to diff and filesnotin
As part of removing manifest.matches
# HG changeset patch
# User Durham Goode
# Date 1488517595 28800
# Thu Mar 02 21:06:35 2017 -0800
# Node ID 1bed8ee65389133923b9076909e04f66ef26f1b8
# Parent 207763e895c7d24885df22f5b9c0df5494d77daf
manifest: rename matches to _matches
Now that there are no external consumers of
# HG changeset patch
# User Durham Goode
# Date 1488665211 28800
# Sat Mar 04 14:06:51 2017 -0800
# Node ID 9c3ea2112952f398aaa7625f43dcfa36cfd34379
# Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f
rebase: move actual rebase into a single transaction
Previously, rebasing would open
On 3/4/17 2:08 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488665211 28800
# Sat Mar 04 14:06:51 2017 -0800
# Node ID 9c3ea2112952f398aaa7625f43dcfa36cfd34379
# Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f
rebase: move actual rebase into a single
On 3/4/17 2:11 PM, Durham Goode wrote:
On 3/4/17 2:08 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488665211 28800
# Sat Mar 04 14:06:51 2017 -0800
# Node ID 9c3ea2112952f398aaa7625f43dcfa36cfd34379
# Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f
rebase
# HG changeset patch
# User Durham Goode
# Date 1488759650 28800
# Sun Mar 05 16:20:50 2017 -0800
# Node ID f902e85491b50b1d2495fecb6b4ce2c48829ec12
# Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
dirstate: track otherparent files same as nonnormal
Calling dirstate.setparents() is
# HG changeset patch
# User Durham Goode
# Date 1488759607 28800
# Sun Mar 05 16:20:07 2017 -0800
# Node ID 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
# Parent 9f62182a506396ee246ee5ec535c076caff98bde
dirstate: track updated files to improve write time
Previously, dirstate.write() would
# HG changeset patch
# User Durham Goode
# Date 1488761157 28800
# Sun Mar 05 16:45:57 2017 -0800
# Node ID a465bc91a3c1a04c9c75a3cbd13fd5b777487de9
# Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
dirstate: track otherparent files same as nonnormal
Calling dirstate.setparents() is
On 3/5/17 4:24 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488759650 28800
# Sun Mar 05 16:20:50 2017 -0800
# Node ID f902e85491b50b1d2495fecb6b4ce2c48829ec12
# Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
dirstate: track otherparent files same as nonnormal
# HG changeset patch
# User Durham Goode
# Date 1488759607 28800
# Sun Mar 05 16:20:07 2017 -0800
# Node ID 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
# Parent 9f62182a506396ee246ee5ec535c076caff98bde
dirstate: track updated files to improve write time
Previously, dirstate.write() would
On 3/6/17 5:32 PM, Martin von Zweigbergk wrote:
On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488517595 28800
# Thu Mar 02 21:06:35 2017 -0800
# Node ID 1bed8ee65389133923b9076909e04f66ef26f1b8
# Parent
On 3/6/17 10:31 PM, Martin von Zweigbergk wrote:
On Mon, Mar 6, 2017 at 5:40 PM, Durham Goode wrote:
On 3/6/17 5:32 PM, Martin von Zweigbergk wrote:
On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488517595 28800
# Thu Mar 02
# HG changeset patch
# User Durham Goode
# Date 1488919920 28800
# Tue Mar 07 12:52:00 2017 -0800
# Node ID 4d485e46a3e5c83ff8d2ae0a4ba8e484a284f65b
# Parent 7433b3bc55eebfa9149280339b406bd4cec64efb
fsmonitor: remove use of repo.opener
This has been deprecated, so we need to switch to the
On 3/3/17 7:42 AM, Pierre-Yves David wrote:
On 03/03/2017 02:50 PM, Yuya Nishihara wrote:
On Thu, 02 Mar 2017 03:58:45 +0100, Pierre-Yves David wrote:
# HG changeset patch
# User Pierre-Yves David
# Date 1470398170 -7200
# Fri Aug 05 13:56:10 2016 +0200
# Node ID aacf8b01b81483b4815a9
On 3/7/17 10:08 AM, Augie Fackler wrote:
On Sat, Mar 04, 2017 at 02:08:26PM -0800, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488665211 28800
# Sat Mar 04 14:06:51 2017 -0800
# Node ID 9c3ea2112952f398aaa7625f43dcfa36cfd34379
# Parent
On 3/7/17 2:29 PM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 9:37 AM, Durham Goode wrote:
On 3/6/17 10:31 PM, Martin von Zweigbergk wrote:
On Mon, Mar 6, 2017 at 5:40 PM, Durham Goode wrote:
On 3/6/17 5:32 PM, Martin von Zweigbergk wrote:
On Fri, Mar 3, 2017 at 11:34 AM
On 3/7/17 2:40 PM, Martin von Zweigbergk wrote:
On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488569391 28800
# Fri Mar 03 11:29:51 2017 -0800
# Node ID 207763e895c7d24885df22f5b9c0df5494d77daf
# Parent
# HG changeset patch
# User Durham Goode
# Date 1488924269 28800
# Tue Mar 07 14:04:29 2017 -0800
# Node ID 8451bfc2e1d6260a0ce9dac505dd9f34fb3b19aa
# Parent 9ee513d4a3884d19a85b2aadd7bac362d1530d11
rebase: add storestatus support for transactions
This let's the status writing
# HG changeset patch
# User Durham Goode
# Date 1488925148 28800
# Tue Mar 07 14:19:08 2017 -0800
# Node ID 4eb06495f778ecce2b3644e0d50585495f26162b
# Parent 7433b3bc55eebfa9149280339b406bd4cec64efb
rebase: clear updatestate during rebase --abort in more cases
Previously, rebase --abort
# HG changeset patch
# User Durham Goode
# Date 1488924704 28800
# Tue Mar 07 14:11:44 2017 -0800
# Node ID 9ee513d4a3884d19a85b2aadd7bac362d1530d11
# Parent 4eb06495f778ecce2b3644e0d50585495f26162b
rebase: move storestatus onto rebaseruntime
The rebaseruntime class already has the
# HG changeset patch
# User Durham Goode
# Date 1488933031 28800
# Tue Mar 07 16:30:31 2017 -0800
# Node ID 177c391caab3912e403e0eec469ea45a18c001f2
# Parent 8451bfc2e1d6260a0ce9dac505dd9f34fb3b19aa
rebase: allow aborting if last-message.txt is missing
Previously, if .hg/rebasestate
# HG changeset patch
# User Durham Goode
# Date 1488932852 28800
# Tue Mar 07 16:27:32 2017 -0800
# Node ID 39116126d70a5cc2fe330c880093beffa640aa64
# Parent 177c391caab3912e403e0eec469ea45a18c001f2
rebase: move actual rebase into a single transaction
Previously, rebasing would open
On 3/7/17 4:41 PM, Martin von Zweigbergk wrote:
On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488519936 28800
# Thu Mar 02 21:45:36 2017 -0800
# Node ID 883bb49a3b40609074d56257aab7619f0c306efc
# Parent
On 3/7/17 8:25 AM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1488568082 18000
# Fri Mar 03 14:08:02 2017 -0500
# Node ID adf7419abb89aef332ac5eac48a0f1c9d3eab527
# Parent 3e82376d7d3f3e11d11f09fceb8b4c79233057a8
extensions: tapdance to get reasonable import er
On 3/7/17 6:59 PM, Durham Goode wrote:
On 3/7/17 8:25 AM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1488568082 18000
# Fri Mar 03 14:08:02 2017 -0500
# Node ID adf7419abb89aef332ac5eac48a0f1c9d3eab527
# Parent 3e82376d7d3f3e11d11f09fceb8b4c79233057a8
On 3/7/17 8:25 AM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1488570207 18000
# Fri Mar 03 14:43:27 2017 -0500
# Node ID 4801067dee2c77ff4e720c931d8b19cf32515beb
# Parent a6e8bb19707e0c7505ccfdf44f7e1b19a0f65d48
dispatch: enforce bytes when converting boolean
# HG changeset patch
# User Durham Goode
# Date 1488909371 28800
# Tue Mar 07 09:56:11 2017 -0800
# Node ID 5ede3fa3bae6e964b4bce8b36681d203c05e94f7
# Parent 7433b3bc55eebfa9149280339b406bd4cec64efb
manifest: add match argument to diff and filesnotin
As part of removing manifest.matches
# HG changeset patch
# User Durham Goode
# Date 1488937790 28800
# Tue Mar 07 17:49:50 2017 -0800
# Node ID d2850df6c891a20585a0d5eac370c1c2f4463cad
# Parent 36bcc5d848c6bdf33d604999631a0708d1b7f067
context: remove duplicate manifest creation during _buildstatus
Previously we called
# HG changeset patch
# User Durham Goode
# Date 1488909371 28800
# Tue Mar 07 09:56:11 2017 -0800
# Node ID 68644896cbdcfc956079662668e010038bfe8048
# Parent ccec5eeceb85929c5df041b768d01694176b3a9d
status: handle more node indicators in buildstatus
There are several different node markers
# HG changeset patch
# User Durham Goode
# Date 1488940700 28800
# Tue Mar 07 18:38:20 2017 -0800
# Node ID ccec5eeceb85929c5df041b768d01694176b3a9d
# Parent f70310209acbbcb4cf7cae7c38d94e15c09c1ace
merge: remove uses of manifest.matches
This gets rid of the manifest.matches calls in
# HG changeset patch
# User Durham Goode
# Date 1488938190 28800
# Tue Mar 07 17:56:30 2017 -0800
# Node ID 36bcc5d848c6bdf33d604999631a0708d1b7f067
# Parent 68644896cbdcfc956079662668e010038bfe8048
context: move _manifest from committablectx to workingctx
committablectx had a _manifest
# HG changeset patch
# User Durham Goode
# Date 1488943242 28800
# Tue Mar 07 19:20:42 2017 -0800
# Node ID 541bf866729342f534bac425bd8f01b9fe7564e8
# Parent 611fac63adb09c326912e56df59c828ad12ffd9f
treemanifest: optimize diff using the matcher
This optimizes treemanifest.diff() to limit
# HG changeset patch
# User Durham Goode
# Date 1488909371 28800
# Tue Mar 07 09:56:11 2017 -0800
# Node ID f70310209acbbcb4cf7cae7c38d94e15c09c1ace
# Parent 5ede3fa3bae6e964b4bce8b36681d203c05e94f7
copies: remove use of manifest.matches
Convert the existing use of manifest.matches to use
# HG changeset patch
# User Durham Goode
# Date 1488937983 28800
# Tue Mar 07 17:53:03 2017 -0800
# Node ID b76e7da4fb9ab00c3b98e5613d7caa0b4aceaf8b
# Parent 822259e9f117b11cd54d6a13565a3202b508eae8
manifest: rename matches to _matches
Now that there are no external consumers of
# HG changeset patch
# User Durham Goode
# Date 1488940198 28800
# Tue Mar 07 18:29:58 2017 -0800
# Node ID 611fac63adb09c326912e56df59c828ad12ffd9f
# Parent b76e7da4fb9ab00c3b98e5613d7caa0b4aceaf8b
treemanifest: add tests covering hg diff of partial trees
Previously the hg files tests
# HG changeset patch
# User Durham Goode
# Date 1488937965 28800
# Tue Mar 07 17:52:45 2017 -0800
# Node ID 822259e9f117b11cd54d6a13565a3202b508eae8
# Parent d2850df6c891a20585a0d5eac370c1c2f4463cad
context: remove uses of manifest.matches
This removes the uses of manifest.matches in
On 3/8/17 9:46 AM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 7:22 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488938190 28800
# Tue Mar 07 17:56:30 2017 -0800
# Node ID 36bcc5d848c6bdf33d604999631a0708d1b7f067
# Parent
On 3/8/17 9:47 AM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 7:22 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488940700 28800
# Tue Mar 07 18:38:20 2017 -0800
# Node ID ccec5eeceb85929c5df041b768d01694176b3a9d
# Parent
On 3/8/17 10:21 AM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 7:22 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488937790 28800
# Tue Mar 07 17:49:50 2017 -0800
# Node ID d2850df6c891a20585a0d5eac370c1c2f4463cad
# Parent
On 3/8/17 10:28 AM, Martin von Zweigbergk wrote:
On Wed, Mar 8, 2017 at 10:25 AM, Durham Goode wrote:
On 3/8/17 10:21 AM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 7:22 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488937790 28800
# Tue Mar
On 3/8/17 1:01 PM, Martin von Zweigbergk wrote:
On Tue, Mar 7, 2017 at 7:22 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488943242 28800
# Tue Mar 07 19:20:42 2017 -0800
# Node ID 541bf866729342f534bac425bd8f01b9fe7564e8
# Parent
On 3/8/17 4:14 PM, Martin von Zweigbergk wrote:
On Wed, Mar 8, 2017 at 4:10 PM, Pierre-Yves David
wrote:
On 03/07/2017 09:29 AM, Augie Fackler wrote:
On Sun, Mar 05, 2017 at 04:51:01PM -0800, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1488761157 28800
# HG changeset patch
# User Durham Goode
# Date 1489019264 28800
# Wed Mar 08 16:27:44 2017 -0800
# Node ID 265484e77411893d910f2eff4efe02cfe6abd5b7
# Parent c9195d0e227ad2c3b4544a9352dd59ccd0336d36
histedit: pop action after the action is completed
We only want to pop the action after the
# HG changeset patch
# User Durham Goode
# Date 1489019264 28800
# Wed Mar 08 16:27:44 2017 -0800
# Node ID 92225c3757e833d117c91d063cb8d42f6f355eef
# Parent 265484e77411893d910f2eff4efe02cfe6abd5b7
histedit: add histedit.singletransaction config option
This adds an option (which defaults
# HG changeset patch
# User Durham Goode
# Date 1489019264 28800
# Wed Mar 08 16:27:44 2017 -0800
# Node ID c9195d0e227ad2c3b4544a9352dd59ccd0336d36
# Parent 150cd51257221fad5ccba5794e7a21837afba479
histedit: add transaction support to writing the state file
This will be used in a future
On 3/8/17 4:33 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1489019264 28800
# Wed Mar 08 16:27:44 2017 -0800
# Node ID 92225c3757e833d117c91d063cb8d42f6f355eef
# Parent 265484e77411893d910f2eff4efe02cfe6abd5b7
histedit: add histedit.singletransaction config
# HG changeset patch
# User Durham Goode
# Date 1489023320 28800
# Wed Mar 08 17:35:20 2017 -0800
# Node ID c1f6f1b0b0d5ca351761f82973860256ad63b16f
# Parent 150cd51257221fad5ccba5794e7a21837afba479
dirstate: track otherparent files same as nonnormal
Calling dirstate.setparents() is
On 3/8/17 5:36 PM, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1489023320 28800
# Wed Mar 08 17:35:20 2017 -0800
# Node ID c1f6f1b0b0d5ca351761f82973860256ad63b16f
# Parent 150cd51257221fad5ccba5794e7a21837afba479
dirstate: track otherparent files same as nonnormal
On 3/9/17 6:27 PM, Augie Fackler wrote:
On Wed, Mar 08, 2017 at 04:33:40PM -0800, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1489019264 28800
# Wed Mar 08 16:27:44 2017 -0800
# Node ID 92225c3757e833d117c91d063cb8d42f6f355eef
# Parent
# HG changeset patch
# User Durham Goode
# Date 1489189411 28800
# Fri Mar 10 15:43:31 2017 -0800
# Node ID 0c9a2c16ec96fa56206dbb1199f01dcb4ece7c11
# Parent 718a57e95a897f4ac407ae3733a7d41e87354acb
histedit: add transaction support to writing the state file
This will be used in a future
# HG changeset patch
# User Durham Goode
# Date 1489189949 28800
# Fri Mar 10 15:52:29 2017 -0800
# Node ID 34b22c430d074e57d5293c75349d4651e80dfdce
# Parent 4046a8f85f7c6b025b986aad9104b73ba2680493
histedit: add histedit.singletransaction config option
This adds an option (which defaults
# HG changeset patch
# User Durham Goode
# Date 1489189411 28800
# Fri Mar 10 15:43:31 2017 -0800
# Node ID 4046a8f85f7c6b025b986aad9104b73ba2680493
# Parent 0c9a2c16ec96fa56206dbb1199f01dcb4ece7c11
histedit: pop action after the action is completed
We only want to pop the action after the
Thanks for catching this!
On 3/10/17 2:00 PM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1489182881 18000
# Fri Mar 10 16:54:41 2017 -0500
# Node ID cef8a5be497c381bf9ac140977960910b491b8f6
# Parent 9fa4bea85bceac8c4851520a9fd9cfe604a53649
parsers: drop old nonn
# HG changeset patch
# User Durham Goode
# Date 1489347215 25200
# Sun Mar 12 12:33:35 2017 -0700
# Node ID ec3731bcacca0a6c65da08e20f7784bdd210161d
# Parent 718a57e95a897f4ac407ae3733a7d41e87354acb
rebase: move state serialization to use unfiltered repo
Now that rebasestate is serialized
On 3/13/17 2:48 AM, Jun Wu wrote:
# HG changeset patch
# User Jun Wu
# Date 1489395002 25200
# Mon Mar 13 01:50:02 2017 -0700
# Node ID 6ae6d1069ba1d4089afaeb0bb8ef2411983a1292
# Parent 0280ee091bd0ae33aa0a67b0c8a55ccffd2e0718
# Available At
https://urldefense.proofpoint.com/v2/url?u=http
On 3/13/17 2:06 PM, Kostia Balytskyi wrote:
This looks good to me.
On 13/03/2017 12:00, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler
# Date 1489431594 14400
# Mon Mar 13 14:59:54 2017 -0400
# Node ID 7d290452e8f119b1329f70c9d529a8c5ff271cea
# Parent dd7bb6e663c80553a6ab
On 3/14/17 12:33 PM, Gregory Szorc wrote:
# HG changeset patch
# User Gregory Szorc
# Date 1489519771 25200
# Tue Mar 14 12:29:31 2017 -0700
# Node ID c130f8c7496a823c92d3d71880e5beb9fb60c0f7
# Parent 5e02fae5419fcd9462b5be11f7f6d6dc4a04fc92
manifest: API to obtain new nodes in a manifes
On 3/14/17 12:33 PM, Gregory Szorc wrote:
# HG changeset patch
# User Gregory Szorc
# Date 1489519968 25200
# Tue Mar 14 12:32:48 2017 -0700
# Node ID 58091ccc1d551152d4c135db1a394c1763bb24c4
# Parent c130f8c7496a823c92d3d71880e5beb9fb60c0f7
changegroup: switch to manifestctx.readstorage
On 3/7/17 11:40 AM, Phil Cohen wrote:
# HG changeset patch
# User Phil Cohen
# Date 1488915535 28800
# Tue Mar 07 11:38:55 2017 -0800
# Node ID bbce62e3790220f19e7b37160a2f8351b7461272
# Parent 91e86a6c61c0c6a3b554eefeba906311aa29
merge: add `internal:dumpjson` tool to `resolve`, whi
# HG changeset patch
# User Durham Goode
# Date 1489618137 25200
# Wed Mar 15 15:48:57 2017 -0700
# Node ID 6257ea07d629e83e85f68d0c83202b4111f6d4fd
# Parent e83302d437485620c9bc25921f724af34cd5dd55
branchmap: handle nullrev in setcachedata
906be86990 recently changed to switch from
# HG changeset patch
# User Durham Goode
# Date 1489948937 25200
# Sun Mar 19 11:42:17 2017 -0700
# Node ID d598e42fa629195ecf43f438b71603df9fb66d6d
# Parent c2f68e8cd96f92c2fa240fe04e541c14c1bad3d8
merge: remove unnecessary matcher checks
As part of changing manifest.diff to accept a
# HG changeset patch
# User Durham Goode
# Date 1489949694 25200
# Sun Mar 19 11:54:54 2017 -0700
# Node ID 800c452bf1a44f9f817174c69443121f4ed4c3b8
# Parent d598e42fa629195ecf43f438b71603df9fb66d6d
rebase: use matcher to optimize manifestmerge
The old merge code would call manifestmerge
# HG changeset patch
# User Durham Goode
# Date 1489949655 25200
# Sun Mar 19 11:54:15 2017 -0700
# Node ID c2f68e8cd96f92c2fa240fe04e541c14c1bad3d8
# Parent 75e4bae56068bec4f965773a2d5f4d272a8dc5b0
rebase: use one dirstateguard for entire rebase
Recently we switched rebases to run the
On 3/20/17 1:14 AM, Yuya Nishihara wrote:
On Sun, 19 Mar 2017 12:00:58 -0700, Durham Goode wrote:
# HG changeset patch
# User Durham Goode
# Date 1489949694 25200
# Sun Mar 19 11:54:54 2017 -0700
# Node ID 800c452bf1a44f9f817174c69443121f4ed4c3b8
# Parent
1 - 100 of 609 matches
Mail list logo