Page MenuHomePhabricator

rdamazio (Rodrigo Damazio Bovendorp)
User

Projects

User does not belong to any projects.

User Details

User Since
Jul 17 2017, 9:53 PM (131 w, 3 d)

Recent Activity

Tue, Jan 14

rdamazio committed rHG8eb3c52337a6: phases: reduce code duplication in phasecache.getrevset.
phases: reduce code duplication in phasecache.getrevset
Tue, Jan 14, 11:39 AM
rdamazio committed rHGab41dad7345e: phases: make phasecache._phasesets immutable.
phases: make phasecache._phasesets immutable
Tue, Jan 14, 11:39 AM
rdamazio committed rHGa30a59582c15: phases: make phasecache._phasesets immutable.
phases: make phasecache._phasesets immutable
Tue, Jan 14, 11:37 AM
rdamazio committed rHG23c399e39b27: phases: reduce code duplication in phasecache.getrevset.
phases: reduce code duplication in phasecache.getrevset
Tue, Jan 14, 11:37 AM
rdamazio closed D7854: phases: make phasecache._phasesets immutable.
Tue, Jan 14, 9:22 AM
rdamazio committed rHGc31ec768d70a: phases: make phasecache._phasesets immutable.
phases: make phasecache._phasesets immutable
Tue, Jan 14, 9:22 AM
rdamazio closed D7853: phases: reduce code duplication in phasecache.getrevset.
Tue, Jan 14, 9:21 AM
rdamazio committed rHG90eedaa80503: phases: reduce code duplication in phasecache.getrevset.
phases: reduce code duplication in phasecache.getrevset
Tue, Jan 14, 9:21 AM

Mon, Jan 13

rdamazio created D7854: phases: make phasecache._phasesets immutable.
Mon, Jan 13, 10:18 PM
rdamazio created D7853: phases: reduce code duplication in phasecache.getrevset.
Mon, Jan 13, 10:18 PM
rdamazio added a comment to D7705: phases: make the working directory consistently a draft.

x

Mon, Jan 13, 9:55 PM
rdamazio added a comment to D7705: phases: make the working directory consistently a draft.
In D7705#114943, @yuja wrote:

@@ -252,25 +254,44 @@

    revs = set.union(*[self._phasesets[p] for p in phases])
if repo.changelog.filteredrevs:
    revs = revs - repo.changelog.filteredrevs

+

if subset is None:
    return smartset.baseset(revs)
else:

+ if wdirrev in subset and repo[None].phase() in phases:
+ # The working dir would never be in the cache, but it was
+ # in the subset being filtered for its phase, so add it to
+ # the output.
+ revs.add(wdirrev)

Suppose self._phasesets[] is a read-only object in this method,
I think revs shouldn't be mutated if revs is self._phasesets[p].

+ if wdirrev in subset and repo[None].phase() in phases:
+ # The working dir is in the subset being filtered, and its
+ # phase is in the phases *not* being returned, so add it to the
+ # set of revisions to filter out.
+ revs.add(wdirrev)

Same here.

Mon, Jan 13, 9:55 PM

Wed, Jan 8

rdamazio committed rHG9c1fd975e9ac: phases: make the working directory consistently a draft.
phases: make the working directory consistently a draft
Wed, Jan 8, 1:10 PM
rdamazio closed D7705: phases: make the working directory consistently a draft.
Wed, Jan 8, 11:50 AM
rdamazio committed rHG2ab225377c27: phases: make the working directory consistently a draft.
phases: make the working directory consistently a draft
Wed, Jan 8, 11:50 AM

Mon, Jan 6

rdamazio added a comment to D7705: phases: make the working directory consistently a draft.

I don't understand what you're asking me to do here, can you clarify?

In short we should have a test matching

$ hg log -r 'wdir() and secret()' -T '{phase}\n' --config phases.new-commit=secret
secret
Mon, Jan 6, 7:56 PM
rdamazio updated the diff for D7705: phases: make the working directory consistently a draft.
Mon, Jan 6, 7:56 PM
rdamazio added a comment to D7631: absorb: allowing committed changes to be absorbed into their ancestors.
In D7631#112414, @quark wrote:

--rev seems ambiguous since there might be different kinds of revisions to specify - target and revisions to edit. Maybe something like --source, --from, --target?

Done. Used --source to match rebase.

Is --exact from hg fold a better model? I don't feel strongly; I only mention it because hg rebase -s will take that revision and its descendants, so it's more like "stack" in my mind. I'm not sure how many other commands have -s off the top of my head, but @martinvonz
mentioned adding that to hg fix (probably in IRC), and I think mentioned the word "stack" in that context. So I might not be the only one to get slightly tripped up by that.

Mon, Jan 6, 7:46 PM
rdamazio updated the diff for D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Mon, Jan 6, 7:46 PM
rdamazio updated the diff for D7630: absorb: make the absorbed changeset be automatically "evolved".
Mon, Jan 6, 7:46 PM

Fri, Dec 27

rdamazio added a comment to D7705: phases: make the working directory consistently a draft.

I simply sent this. If am I following your changeset right, we should have wdir() match draft() or secret() according to the projected phase (config + parent)

Fri, Dec 27, 6:21 PM
rdamazio added a comment to D7705: phases: make the working directory consistently a draft.

commitablectx code seems wrong here. I am sending a patch.

Fri, Dec 27, 3:42 PM

Dec 23 2019

rdamazio added a comment to D7705: phases: make the working directory consistently a draft.

The working copy is not necessarly draft phase. For example, it will be secret is the working copy parent is secret. One can also control it using the phases.new-commit config.
The mercurial.phases.newcommitphase(ui) function can help you there.

Dec 23 2019, 9:05 PM
rdamazio updated the diff for D7705: phases: make the working directory consistently a draft.
Dec 23 2019, 9:04 PM

Dec 19 2019

rdamazio closed D7668: status: make unresolved files always be in the morestatus structured output.
Dec 19 2019, 12:56 PM
rdamazio closed D7704: status: make morestatus call out unresolved conflicts after update.
Dec 19 2019, 12:56 PM
rdamazio closed D7667: status: extract active-merge state for reuse.
Dec 19 2019, 12:56 PM
rdamazio committed rHG07ebb567e8bb: status: make unresolved files always be in the morestatus structured output.
status: make unresolved files always be in the morestatus structured output
Dec 19 2019, 12:55 PM
rdamazio committed rHG489fdf27769c: status: make morestatus call out unresolved conflicts after update.
status: make morestatus call out unresolved conflicts after update
Dec 19 2019, 12:55 PM
rdamazio committed rHG4ca89cc20d02: status: extract active-merge state for reuse.
status: extract active-merge state for reuse
Dec 19 2019, 12:55 PM
rdamazio created D7705: phases: make the working directory consistently a draft.
Dec 19 2019, 3:34 AM
rdamazio updated the diff for D7668: status: make unresolved files always be in the morestatus structured output.
Dec 19 2019, 2:48 AM
rdamazio created D7704: status: make morestatus call out unresolved conflicts after update.
Dec 19 2019, 2:48 AM
rdamazio retitled D7667: status: extract active-merge state for reuse from status: make morestatus call out unresolved conflicts after update to status: extract active-merge state for reuse.
Dec 19 2019, 2:48 AM
rdamazio added a comment to D7667: status: extract active-merge state for reuse.

Can we split them up?

Dec 19 2019, 2:47 AM
rdamazio added inline comments to D7668: status: make unresolved files always be in the morestatus structured output.
Dec 19 2019, 2:47 AM
rdamazio updated the diff for D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Dec 19 2019, 2:37 AM
rdamazio updated the diff for D7630: absorb: make the absorbed changeset be automatically "evolved".
Dec 19 2019, 2:37 AM

Dec 18 2019

rdamazio updated the diff for D7668: status: make unresolved files always be in the morestatus structured output.
Dec 18 2019, 12:18 AM
rdamazio updated the diff for D7667: status: extract active-merge state for reuse.
Dec 18 2019, 12:18 AM

Dec 17 2019

rdamazio updated the diff for D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Dec 17 2019, 11:47 PM
rdamazio updated the diff for D7630: absorb: make the absorbed changeset be automatically "evolved".
Dec 17 2019, 11:47 PM
rdamazio added a comment to D7631: absorb: allowing committed changes to be absorbed into their ancestors.

Can you describe the feature a bit in the commit message. Specific things which I feel are missing:

Dec 17 2019, 11:42 PM
rdamazio updated the summary of D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Dec 17 2019, 11:42 PM
rdamazio updated the diff for D7630: absorb: make the absorbed changeset be automatically "evolved".
Dec 17 2019, 11:42 PM

Dec 16 2019

rdamazio closed D7666: update: add some tests for the status quo of morestatus on update conflicts.
Dec 16 2019, 1:32 AM
rdamazio committed rHG5709a9992c2a: update: add some tests for the status quo of morestatus on update conflicts.
update: add some tests for the status quo of morestatus on update conflicts
Dec 16 2019, 1:32 AM

Dec 14 2019

rdamazio updated the diff for D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Dec 14 2019, 1:25 AM
rdamazio updated the diff for D7630: absorb: make the absorbed changeset be automatically "evolved".
Dec 14 2019, 1:25 AM
rdamazio retitled D7631: absorb: allowing committed changes to be absorbed into their ancestors from RFC: absorb: allowing committed changes to be absorbed into their ancestors to absorb: allowing committed changes to be absorbed into their ancestors.
Dec 14 2019, 1:02 AM
rdamazio retitled D7630: absorb: make the absorbed changeset be automatically "evolved" from RFC: absorb: make the absorbed changeset be automatically "evolved" to absorb: make the absorbed changeset be automatically "evolved".
Dec 14 2019, 1:02 AM
rdamazio added a comment to D7631: absorb: allowing committed changes to be absorbed into their ancestors.
In D7631#112414, @quark wrote:

--rev seems ambiguous since there might be different kinds of revisions to specify - target and revisions to edit. Maybe something like --source, --from, --target?

Dec 14 2019, 1:02 AM
rdamazio added a comment to D7630: absorb: make the absorbed changeset be automatically "evolved".

Sorry for the upload mess (though it's arguably a phabsend bug :) ). Tried uploading the "right" way now.

Dec 14 2019, 1:02 AM
rdamazio created D7668: status: make unresolved files always be in the morestatus structured output.
Dec 14 2019, 12:49 AM
rdamazio created D7667: status: extract active-merge state for reuse.
Dec 14 2019, 12:49 AM
rdamazio created D7666: update: add some tests for the status quo of morestatus on update conflicts.
Dec 14 2019, 12:49 AM

Dec 13 2019

rdamazio added a comment to D7630: absorb: make the absorbed changeset be automatically "evolved".

(on mobile) I think it was hg phabsend -r .+.^

Dec 13 2019, 1:52 AM
rdamazio created D7631: absorb: allowing committed changes to be absorbed into their ancestors.
Dec 13 2019, 12:55 AM
rdamazio created D7630: absorb: make the absorbed changeset be automatically "evolved".
Dec 13 2019, 12:55 AM

Dec 12 2019

rdamazio closed D7595: status: outputting structured unfinished-operation information.
Dec 12 2019, 12:38 PM
rdamazio committed rHGaac921f54554: status: outputting structured unfinished-operation information.
status: outputting structured unfinished-operation information
Dec 12 2019, 12:36 PM
rdamazio updated the diff for D7595: status: outputting structured unfinished-operation information.
Dec 12 2019, 12:29 PM
rdamazio updated the summary of D7595: status: outputting structured unfinished-operation information.
Dec 12 2019, 1:40 AM

Dec 11 2019

rdamazio added inline comments to D7594: status: add template/json data about whether a file has unresolved conflicts.
Dec 11 2019, 4:38 PM
rdamazio closed D7593: status: split morestatus data loading from display.
Dec 11 2019, 6:56 AM
rdamazio closed D7594: status: add template/json data about whether a file has unresolved conflicts.
Dec 11 2019, 6:56 AM
rdamazio committed rHG7315464f0613: status: add template/json data about whether a file has unresolved conflicts.
status: add template/json data about whether a file has unresolved conflicts
Dec 11 2019, 6:55 AM
rdamazio committed rHGfb4a6d584756: status: split morestatus data loading from display.
status: split morestatus data loading from display
Dec 11 2019, 6:55 AM

Dec 10 2019

rdamazio added a comment to D7593: status: split morestatus data loading from display.

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

Are you asking me to do something, or are you going to?
This supersedes his change completely.

He's asking you to rebase this series. Pull from http://mercurial-scm.org/repo/hg-committed and then rebase on top of @.
Even if my patch had not been queued, I would have preferred if you had split that change out from this patch since it's a separate change from what the commit message says.

Dec 10 2019, 7:05 PM
rdamazio updated the diff for D7595: status: outputting structured unfinished-operation information.
Dec 10 2019, 1:18 PM
rdamazio updated the diff for D7593: status: split morestatus data loading from display.
Dec 10 2019, 1:17 PM
rdamazio updated the diff for D7594: status: add template/json data about whether a file has unresolved conflicts.
Dec 10 2019, 1:17 PM
rdamazio added a comment to D7593: status: split morestatus data loading from display.

Just phabsended after a rebase onto hg-committed, let me know if that's not what you expected.

Dec 10 2019, 1:16 PM
rdamazio added a comment to D7593: status: split morestatus data loading from display.

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

Dec 10 2019, 1:12 PM
rdamazio added inline comments to D7595: status: outputting structured unfinished-operation information.
Dec 10 2019, 1:07 PM
rdamazio created D7595: status: outputting structured unfinished-operation information.
Dec 10 2019, 1:40 AM
rdamazio created D7594: status: add template/json data about whether a file has unresolved conflicts.
Dec 10 2019, 1:40 AM
rdamazio created D7593: status: split morestatus data loading from display.
Dec 10 2019, 1:40 AM
rdamazio added a comment to D7591: status: remove pointless filtering by alwaysmatcher in morestatus.

FYI I'm going to send a chain that rewrites a lot of this

To be clear, are you telling reviewers not to queue this one because you will be rewriting the *patch* or you're saying that you will later be sending patches on top of this one?

Dec 10 2019, 12:56 AM
rdamazio added a comment to D7591: status: remove pointless filtering by alwaysmatcher in morestatus.

FYI I'm going to send a chain that rewrites a lot of this

Dec 10 2019, 12:33 AM

Oct 11 2019

rdamazio closed D6998: help: adding a help category to narrow and remotefilelog commands.
Oct 11 2019, 7:05 PM
rdamazio committed rHG5ff32fdf0b0b: help: adding a help category to narrow and remotefilelog commands.
help: adding a help category to narrow and remotefilelog commands
Oct 11 2019, 7:05 PM
rdamazio updated the diff for D6998: help: adding a help category to narrow and remotefilelog commands.
Oct 11 2019, 6:38 PM

Oct 9 2019

rdamazio added a comment to D6999: help: categorizing evolve and topic commands.

This will be reviewed via heptapod instead

Oct 9 2019, 8:19 PM

Oct 6 2019

rdamazio created D6999: help: categorizing evolve and topic commands.
Oct 6 2019, 11:08 AM
rdamazio created D6998: help: adding a help category to narrow and remotefilelog commands.
Oct 6 2019, 11:08 AM

Sep 13 2019

rdamazio added inline comments to D6848: narrow: add option for automatically removing unused includes.
Sep 13 2019, 8:40 PM
rdamazio added inline comments to D6848: narrow: add option for automatically removing unused includes.
Sep 13 2019, 4:53 PM

Jun 27 2019

rdamazio closed D6575: pycompat: make fewer assumptions about sys.executable.
Jun 27 2019, 12:20 PM
rdamazio closed D6577: py3: make catapult usable from the test runner in py3.
Jun 27 2019, 12:20 PM
rdamazio committed rHG9913fffd744b: py3: make catapult usable from the test runner in py3.
py3: make catapult usable from the test runner in py3
Jun 27 2019, 12:19 PM
rdamazio committed rHGf3fa10a5877d: py3: use integer division for the value passed to xrange.
py3: use integer division for the value passed to xrange
Jun 27 2019, 12:19 PM
rdamazio closed D6576: py3: use integer division for the value passed to xrange.
Jun 27 2019, 12:19 PM
rdamazio committed rHG49998d5ba66a: pycompat: make fewer assumptions about sys.executable.
pycompat: make fewer assumptions about sys.executable
Jun 27 2019, 12:19 PM

Jun 25 2019

rdamazio updated the diff for D6575: pycompat: make fewer assumptions about sys.executable.
Jun 25 2019, 11:06 PM
rdamazio updated the diff for D6577: py3: make catapult usable from the test runner in py3.
Jun 25 2019, 11:06 PM
rdamazio updated the diff for D6577: py3: make catapult usable from the test runner in py3.
Jun 25 2019, 11:05 PM
rdamazio created D6575: pycompat: make fewer assumptions about sys.executable.
Jun 25 2019, 10:38 PM
rdamazio created D6577: py3: make catapult usable from the test runner in py3.
Jun 25 2019, 10:38 PM
rdamazio created D6576: py3: use integer division for the value passed to xrange.
Jun 25 2019, 10:38 PM