Page MenuHomePhabricator

durin42 (Augie Fackler)
User

Projects

User Details

User Since
Jun 23 2017, 4:23 PM (162 w, 6 d)

Recent Activity

Wed, Aug 5

durin42 committed rHGfa18b02df8dd: merge with stable.
merge with stable
Wed, Aug 5, 1:41 PM

Wed, Jul 22

durin42 committed rHG4b923da0cb86: merge with stable.
merge with stable
Wed, Jul 22, 10:14 PM

Fri, Jul 17

D8700: commitctx: document a fast path in _filecommit now requires changes to proceed.
Fri, Jul 17, 4:45 PM
durin42 closed D8353: debugcommands: create new debugantivirusrunning command.
Fri, Jul 17, 2:07 PM
durin42 committed rHG87047efbc6a6: debugcommands: create new debugantivirusrunning command.
debugcommands: create new debugantivirusrunning command
Fri, Jul 17, 2:04 PM

Wed, Jul 15

durin42 committed rHGde1d3f4246e9: merge with stable.
merge with stable
Wed, Jul 15, 12:11 PM
durin42 added a comment to D8680: rhg: fix test-rhg.t code style.

Seems to need rebased?

Wed, Jul 15, 12:06 PM
durin42 added a comment to D8656: localrepo: load the share source .hg/hgrc also in share-safe mode (API).

Something in this stack (that I didn't push) breaks the phabricator extension. See phabricator.py line 170:

@eh.wrapfunction(localrepo, "loadhgrc")
def _loadhgrc(orig, ui, wdirvfs, hgvfs, requirements):

So you'll need to do....something there. Maybe look for other wrappers in extensions too while you're there...

Wed, Jul 15, 11:44 AM
D8698: phases: sparsify phaseroots and phasesets is now accepted and ready to land.
Wed, Jul 15, 11:28 AM
durin42 added a comment to D8745: config: add option to control creation of empty successors during rewrite.

I queued a mailing list version of this series. Should I drop it?

Wed, Jul 15, 11:10 AM

Mon, Jul 13

durin42 committed rHG3a6ec080b521: merge with stable.
merge with stable
Mon, Jul 13, 1:08 PM

Wed, Jul 8

durin42 added a comment to D8712: black: format some files in preparation for subsequent changes.

Yeah, if you’re seeing these changes I’m pretty sure you have a too-old black...

Wed, Jul 8, 10:25 PM

Jul 7 2020

durin42 added a comment to D8691: hg: allow usage of XDG_CONFIG_HOME/hg/hgrc on OSX.

Thanks for the prompt review.

(If anything, ~/Library/Preferences/org.mercurial-scm.hgrc might make sense, but that seems silly to me.)

I agree that ~/Library/Preferences would be the default XDG analogy in macOS. However, the patch was more motivated by relocating the configuration file.
Am I to understand that setting HGRCPATH is the preferred approach for relocating hgrc on macOS?

Jul 7 2020, 5:39 PM
D8691: hg: allow usage of XDG_CONFIG_HOME/hg/hgrc on OSX now requires changes to proceed.

Yes: XDG isn't a thing on macOS, and we won't respect it there. Perhaps the help text should be improved instead.

Jul 7 2020, 2:22 PM

Jul 6 2020

durin42 committed rHGdd3050227a84: merge with stable.
merge with stable
Jul 6 2020, 10:04 PM

Jul 1 2020

durin42 committed rHGdf3660cc60f5: merge with stable.
merge with stable
Jul 1 2020, 2:31 PM
D8670: repoview: use the phasecache directly to determine mutable revisions now requires changes to proceed.

LGTM, but needs rebased.

Jul 1 2020, 2:29 PM

Jun 26 2020

durin42 committed rHG05277278f177: merge with stable.
merge with stable
Jun 26 2020, 11:25 AM

Jun 25 2020

durin42 added a comment to D8666: locks: expect repo lock, not wlock, when writing to .hg/strip-backup/.

My feelings on this are "obviously yes" but I thought that so quickly I lack confidence that I'm not missing something. :)

Jun 25 2020, 3:34 PM
durin42 added a comment to D8645: clonebundles: optional memory-requirement attribution.

I'm a fan of this, but for default, not stable. Is there a specific reason you need a new feature on the stable branch?

Jun 25 2020, 1:30 PM

Jun 22 2020

durin42 added inline comments to D8640: ui: add option to timestamp status and diagnostic messages.
Jun 22 2020, 9:25 AM
durin42 committed rHG0ff59434af72: fuzz: tell manifest fuzzer about longer node hashes.
fuzz: tell manifest fuzzer about longer node hashes
Jun 22 2020, 6:21 AM

Jun 17 2020

durin42 closed D8374: fuzz: tell manifest fuzzer about longer node hashes.
Jun 17 2020, 2:53 PM
durin42 committed rHG9bedcfb4bb0e: fuzz: tell manifest fuzzer about longer node hashes.
fuzz: tell manifest fuzzer about longer node hashes
Jun 17 2020, 2:53 PM
durin42 added a comment to D8374: fuzz: tell manifest fuzzer about longer node hashes.

This is still valid.

Jun 17 2020, 11:01 AM

Jun 16 2020

D8634: hg-core: commit forgotten Cargo.lock now requires changes to proceed.

Doesn't apply?

Jun 16 2020, 5:19 PM

Jun 15 2020

durin42 committed rHGef8dcee272ac: fuzz: add config knob for PYTHON_CONFIG_FLAGS.
fuzz: add config knob for PYTHON_CONFIG_FLAGS
Jun 15 2020, 4:07 PM
durin42 closed D8637: fuzz: add config knob for PYTHON_CONFIG_FLAGS.
Jun 15 2020, 4:07 PM
durin42 closed D8636: pyutil: this has taken so long to fix, I'm using 3.8 now.
Jun 15 2020, 4:07 PM
durin42 committed rHGee5f27d7b9fb: pyutil: this has taken so long to fix, I'm using 3.8 now.
pyutil: this has taken so long to fix, I'm using 3.8 now
Jun 15 2020, 4:07 PM
durin42 created D8636: pyutil: this has taken so long to fix, I'm using 3.8 now.
Jun 15 2020, 3:30 PM
durin42 created D8637: fuzz: add config knob for PYTHON_CONFIG_FLAGS.
Jun 15 2020, 3:30 PM
durin42 committed rHG78cafd48b9b2: merge with stable.
merge with stable
Jun 15 2020, 1:04 PM

Jun 11 2020

durin42 updated the diff for D8624: wip: this does not help but seems less wrong.
Jun 11 2020, 3:46 PM
durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Jun 11 2020, 3:46 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Jun 11 2020, 3:46 PM
durin42 added a comment to D8563: localrepo: get mergestate via context.

Okay, now localrepo correctly uses the same context across whole operations. This almost certainly avoids some bugs, given that committing a memctx was (surprise!) reading the mergestate from disk.

Jun 11 2020, 1:06 PM
durin42 updated the diff for D8563: localrepo: get mergestate via context.
Jun 11 2020, 1:04 PM
durin42 updated the diff for D8624: wip: this does not help but seems less wrong.
Jun 11 2020, 1:04 PM
durin42 updated the diff for D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
Jun 11 2020, 1:04 PM
durin42 created D8626: memctx: add mergestate method.
Jun 11 2020, 1:04 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Jun 11 2020, 1:04 PM
durin42 updated the diff for D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).
Jun 11 2020, 12:09 PM
durin42 retitled D8623: rebase: add a config knob for forcing in-memory rebasing from rebase: add environment variable to allow forcing in-memory rebase to rebase: add a config knob for forcing in-memory rebasing.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8624: wip: this does not help but seems less wrong.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8572: merge: remove special case for in-memory merge.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8569: merge: get mergestate from context instead of directly.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8563: localrepo: get mergestate via context.
Jun 11 2020, 12:08 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Jun 11 2020, 12:07 PM
durin42 added a comment to D8563: localrepo: get mergestate via context.

Is your concern about the creation of new "independant" wctc (by each call of repo[None]) instead of reusing the same wctx for the full operation ?

Yes. I guess I'd rather have the pattern wctx.mergestate() indicate that it works with either a workingctx or a overlayworkingctx, while direct access to mergestate.read() indicates that we care about the actual working copy.

Is there any reason to distinct the two ? From afar, it would be better for the mergestate module to become an implementation details and every access to happen throught the context for consistency.
Do you have concrêt example where distincting the two seems better ?

Jun 11 2020, 12:05 PM
durin42 added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

@martinvonz can you clarify why mergestate on an overlayworkingctx would never make sense ?

That makes sense. What I said does not make sense is to check for unresolved merge conflicts (before starting an operation).

Checking for unresolved merge conflict on an overlayworkingctx does not make sense because the overlayctx is new and therefor will always be conflict free ?

I view overlayworkingctx as something that exists for creating commits without touching the working copy and without caring about the working copy state. In the code here, we explicitly care about the working copy state (because we're going to modify it).

Ah, interesting. That angle hadn't occurred to me. I don't think I'm wholly convinced, but maybe we need an explicit mechanism for "get the wdir" as contrasted with "get a context for the wdir".
I think I'll at least remove this patch from the stack for now...

Question @martinvonz : do you think overlayworkingctx should also not read the local mergestate, but instead should use an in-memory one? I'm not sure how you're envisioning the abstraction boundary there...

Oh, definitely. That's also what you did in later patches, right? It would seem like a bug to me if it read the local mergestate.

+1

Jun 11 2020, 12:04 PM
durin42 abandoned D8565: mergestate: optimize unresolvedcount() a little bit.
Jun 11 2020, 11:29 AM

Jun 10 2020

durin42 closed D8625: git: add debug logging when there's a mismatch in the cached heads list.
Jun 10 2020, 1:41 PM
durin42 committed rHG83e41b73d115: git: add debug logging when there's a mismatch in the cached heads list.
git: add debug logging when there's a mismatch in the cached heads list
Jun 10 2020, 1:41 PM
durin42 added a comment to D8353: debugcommands: create new debugantivirusrunning command.

Sadly I have no idea on that.

Jun 10 2020, 10:32 AM

Jun 9 2020

durin42 updated the diff for D8625: git: add debug logging when there's a mismatch in the cached heads list.
Jun 9 2020, 5:18 PM
durin42 created D8625: git: add debug logging when there's a mismatch in the cached heads list.
Jun 9 2020, 5:15 PM
durin42 updated the diff for D8504: diff: add experimental support for "merge diffs".
Jun 9 2020, 4:54 PM
durin42 updated the diff for D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).
Jun 9 2020, 4:53 PM
durin42 created D8623: rebase: add a config knob for forcing in-memory rebasing.
Jun 9 2020, 4:53 PM
durin42 created D8624: wip: this does not help but seems less wrong.
Jun 9 2020, 4:52 PM
durin42 updated the diff for D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
Jun 9 2020, 4:52 PM
durin42 updated the diff for D8556: commands: get mergestate via context.
Jun 9 2020, 4:52 PM
durin42 updated the summary of D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Jun 9 2020, 4:52 PM
durin42 added a comment to D8353: debugcommands: create new debugantivirusrunning command.

Best guess (given I've never hit an AV problem) is that the AV engine would lose its lunch on the EICAR file and alert the user. I figure if the AV engine isn't picking up on it after 2 seconds then it's probably also not a performance issue for us.

Jun 9 2020, 4:48 PM
durin42 added a comment to D8565: mergestate: optimize unresolvedcount() a little bit.

I don't have concrete numbers, but it avoids some function calls and uses only internal details instead of part of the public API.

Jun 9 2020, 4:47 PM
durin42 added a comment to D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).

how well, I see why you want an explicite method to avoid unrolling the iterator. Could we return an object with sensible bool and len methods?

Jun 9 2020, 4:46 PM
durin42 added a comment to D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.

Is this to represent conflict for in-memory merge ? Or to help with the "merge diff" display ? Because I am not sure how it help (or is used) in the first case, but I can see it tremendously useful for mergediff (since it show how conflict got resolved)

Jun 9 2020, 4:44 PM
durin42 added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

@martinvonz can you clarify why mergestate on an overlayworkingctx would never make sense ?

That makes sense. What I said does not make sense is to check for unresolved merge conflicts (before starting an operation).

Checking for unresolved merge conflict on an overlayworkingctx does not make sense because the overlayctx is new and therefor will always be conflict free ?

I view overlayworkingctx as something that exists for creating commits without touching the working copy and without caring about the working copy state. In the code here, we explicitly care about the working copy state (because we're going to modify it).

Ah, interesting. That angle hadn't occurred to me. I don't think I'm wholly convinced, but maybe we need an explicit mechanism for "get the wdir" as contrasted with "get a context for the wdir".
I think I'll at least remove this patch from the stack for now...

Jun 9 2020, 4:42 PM
durin42 added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

@martinvonz can you clarify why mergestate on an overlayworkingctx would never make sense ?

That makes sense. What I said does not make sense is to check for unresolved merge conflicts (before starting an operation).

Checking for unresolved merge conflict on an overlayworkingctx does not make sense because the overlayctx is new and therefor will always be conflict free ?

I view overlayworkingctx as something that exists for creating commits without touching the working copy and without caring about the working copy state. In the code here, we explicitly care about the working copy state (because we're going to modify it).

Jun 9 2020, 4:39 PM

Jun 3 2020

durin42 committed rHG03ba7de6a8b9: git: add coverage for manifest.diff() so we don't regress.
git: add coverage for manifest.diff() so we don't regress
Jun 3 2020, 11:31 AM

Jun 1 2020

durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Jun 1 2020, 11:50 AM
durin42 updated the diff for D8557: debugcommands: get mergestate via context.
Jun 1 2020, 11:50 AM

May 30 2020

durin42 closed D8590: githelp: add some minimal help for pickaxe functionality.
May 30 2020, 12:24 PM
durin42 committed rHG94f227baa76f: githelp: add some minimal help for pickaxe functionality.
githelp: add some minimal help for pickaxe functionality
May 30 2020, 12:23 PM

May 29 2020

durin42 closed D8592: filemerge: add __bytes__ for absentfilectx.
May 29 2020, 1:06 PM
durin42 committed rHGaa790f7c967a: filemerge: add __bytes__ for absentfilectx.
filemerge: add __bytes__ for absentfilectx
May 29 2020, 1:06 PM
durin42 closed D8591: mergestate: move staticmethod _filectxorabsent to module level.
May 29 2020, 1:06 PM
durin42 committed rHG17d928f8abaf: mergestate: move staticmethod _filectxorabsent to module level.
mergestate: move staticmethod _filectxorabsent to module level
May 29 2020, 1:06 PM

May 28 2020

durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
May 28 2020, 5:34 PM
durin42 added a comment to D8567: mergestate: implement trivial in-memory mergestate.

This is now much closer! I'm down to a handful of failures, all like this:

May 28 2020, 5:12 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
May 28 2020, 5:10 PM
durin42 updated the diff for D8565: mergestate: optimize unresolvedcount() a little bit.
May 28 2020, 5:10 PM
durin42 updated the diff for D8591: mergestate: move staticmethod _filectxorabsent to module level.
May 28 2020, 5:09 PM
durin42 updated the diff for D8504: diff: add experimental support for "merge diffs".
May 28 2020, 4:28 PM
durin42 updated the diff for D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).
May 28 2020, 4:28 PM
durin42 updated the diff for D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
May 28 2020, 4:27 PM
durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
May 28 2020, 4:27 PM
durin42 updated the diff for D8563: localrepo: get mergestate via context.
May 28 2020, 4:27 PM
durin42 updated the diff for D8556: commands: get mergestate via context.
May 28 2020, 4:27 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
May 28 2020, 4:27 PM
durin42 updated the diff for D8565: mergestate: optimize unresolvedcount() a little bit.
May 28 2020, 4:26 PM
durin42 updated the diff for D8555: cmdutil: get mergestate via context.
May 28 2020, 4:26 PM
durin42 created D8592: filemerge: add __bytes__ for absentfilectx.
May 28 2020, 4:26 PM
durin42 created D8591: mergestate: move staticmethod _filectxorabsent to module level.
May 28 2020, 4:25 PM
durin42 added a comment to D8576: help: fix description of revlog version 2.

ha!

May 28 2020, 11:39 AM
D8589: metadata: filter the `removed` set to only contains relevant data is now accepted and ready to land.
May 28 2020, 11:38 AM
D8588: files: extract code for extra filtering of the `removed` entry into copies is now accepted and ready to land.
May 28 2020, 11:38 AM