Page MenuHomePhabricator

martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (168 w, 2 d)

Recent Activity

Today

martinvonz closed D9057: rebase: stop clearing on-disk mergestate when running in memory.
Sat, Sep 19, 3:58 AM
martinvonz closed D9054: rebase: fix an inconsistent hyphenation in a debug message.
Sat, Sep 19, 3:58 AM
martinvonz closed D9055: rebase: delete unused p1 argument to _concludenode().
Sat, Sep 19, 3:58 AM
martinvonz committed rHGb4abfe142ff6: rebase: stop clearing on-disk mergestate when running in memory.
rebase: stop clearing on-disk mergestate when running in memory
Sat, Sep 19, 3:58 AM
martinvonz committed rHGe29cd888fd17: rebase: delete unused p1 argument to _concludenode().
rebase: delete unused p1 argument to _concludenode()
Sat, Sep 19, 3:58 AM
martinvonz committed rHG1f5c548f15e5: rebase: fix an inconsistent hyphenation in a debug message.
rebase: fix an inconsistent hyphenation in a debug message
Sat, Sep 19, 3:58 AM

Yesterday

martinvonz created D9057: rebase: stop clearing on-disk mergestate when running in memory.
Fri, Sep 18, 6:23 PM
martinvonz updated the diff for D9054: rebase: fix an inconsistent hyphenation in a debug message.
Fri, Sep 18, 1:23 PM
martinvonz created D9054: rebase: fix an inconsistent hyphenation in a debug message.
Fri, Sep 18, 1:22 PM
martinvonz created D9055: rebase: delete unused p1 argument to _concludenode().
Fri, Sep 18, 1:21 PM
martinvonz created D9053: locking: remove support for inheriting locks in subprocess.
Fri, Sep 18, 12:16 PM
martinvonz retitled D9041: mergedriver: delete it from RFC: mergedriver: delete it to mergedriver: delete it.
Fri, Sep 18, 11:41 AM
martinvonz closed D9044: phabricator: fix loadhgrc() override broken by D8656.
Fri, Sep 18, 3:23 AM
martinvonz closed D9043: mergestate: move commit() from base class to on-disk subclass.
Fri, Sep 18, 3:23 AM
martinvonz committed rHGc7fe0dfb5312: phabricator: fix loadhgrc() override broken by D8656.
phabricator: fix loadhgrc() override broken by D8656
Fri, Sep 18, 3:23 AM
martinvonz committed rHG0e75c088f0dc: mergestate: move commit() from base class to on-disk subclass.
mergestate: move commit() from base class to on-disk subclass
Fri, Sep 18, 3:23 AM
martinvonz closed D9042: mergestate: make in-memory mergestate not clear on-disk mergestate on reset().
Fri, Sep 18, 3:23 AM
martinvonz committed rHGf2efc44213ec: mergestate: make in-memory mergestate not clear on-disk mergestate on reset().
mergestate: make in-memory mergestate not clear on-disk mergestate on reset()
Fri, Sep 18, 3:23 AM
martinvonz added inline comments to D9043: mergestate: move commit() from base class to on-disk subclass.
Fri, Sep 18, 2:57 AM
martinvonz updated the diff for D9043: mergestate: move commit() from base class to on-disk subclass.
Fri, Sep 18, 2:56 AM
martinvonz created D9044: phabricator: fix loadhgrc() override broken by D8656.
Fri, Sep 18, 2:54 AM
martinvonz created D9043: mergestate: move commit() from base class to on-disk subclass.
Fri, Sep 18, 2:20 AM
martinvonz created D9042: mergestate: make in-memory mergestate not clear on-disk mergestate on reset().
Fri, Sep 18, 2:20 AM
martinvonz created D9041: mergedriver: delete it.
Fri, Sep 18, 2:01 AM

Thu, Sep 17

martinvonz closed D9040: merge: use in-memory mergestate when using in-memory context.
Thu, Sep 17, 10:38 PM
martinvonz closed D9039: mergestate: extract a base class to be shared by future memmergestate.
Thu, Sep 17, 10:37 PM
martinvonz closed D9038: mergestate: extract overridable methods for making/restoring file backups.
Thu, Sep 17, 10:37 PM
martinvonz committed rHG19590b126764: merge: use in-memory mergestate when using in-memory context.
merge: use in-memory mergestate when using in-memory context
Thu, Sep 17, 10:37 PM
martinvonz committed rHGcc5f811b1f15: mergestate: extract a base class to be shared by future memmergestate.
mergestate: extract a base class to be shared by future memmergestate
Thu, Sep 17, 10:37 PM
martinvonz committed rHGe833ff4dd0ea: mergestate: extract overridable methods for making/restoring file backups.
mergestate: extract overridable methods for making/restoring file backups
Thu, Sep 17, 10:37 PM
martinvonz closed D9034: mergestate: make clean() only be about creating a clean mergestate.
Thu, Sep 17, 10:37 PM
martinvonz committed rHGef3273ac5f6e: mergestate: initialize all properties in __init__().
mergestate: initialize all properties in __init__()
Thu, Sep 17, 10:37 PM
martinvonz committed rHG3dd481e11c25: mergestate: remove unnecessary clearing of `localctx` and `otherctx`.
mergestate: remove unnecessary clearing of `localctx` and `otherctx`
Thu, Sep 17, 10:37 PM
martinvonz closed D9037: mergestate: initialize all properties in __init__().
Thu, Sep 17, 10:37 PM
martinvonz closed D9036: mergestate: remove unnecessary clearing of `localctx` and `otherctx`.
Thu, Sep 17, 10:37 PM
martinvonz committed rHG9ea4b52ac6bb: mergestate: move most of of reset() into start().
mergestate: move most of of reset() into start()
Thu, Sep 17, 10:36 PM
martinvonz committed rHG2c10876bb320: mergestate: make clean() only be about creating a clean mergestate.
mergestate: make clean() only be about creating a clean mergestate
Thu, Sep 17, 10:36 PM
martinvonz closed D9035: mergestate: move most of of reset() into start().
Thu, Sep 17, 10:36 PM
martinvonz closed D9031: mergestate: make some callers not pass pointless node argument.
Thu, Sep 17, 10:36 PM
martinvonz committed rHG08c6d6962b2a: mergestate: split up reset() for its two use cases.
mergestate: split up reset() for its two use cases
Thu, Sep 17, 10:36 PM
martinvonz closed D9033: mergestate: split up reset() for its two use cases.
Thu, Sep 17, 10:36 PM
martinvonz closed D9030: py3: don't risk passing a None value to error.ManifestLookupError().
Thu, Sep 17, 10:36 PM
martinvonz committed rHGaad11a26a054: mergestate: simplify reset(), knowing that `other` and `node` go together.
mergestate: simplify reset(), knowing that `other` and `node` go together
Thu, Sep 17, 10:36 PM
martinvonz closed D9032: mergestate: simplify reset(), knowing that `other` and `node` go together.
Thu, Sep 17, 10:35 PM
martinvonz committed rHG0ce6af73f481: mergestate: make some callers not pass pointless node argument.
mergestate: make some callers not pass pointless node argument
Thu, Sep 17, 10:35 PM
martinvonz committed rHGa108f7ff7778: py3: don't risk passing a None value to error.ManifestLookupError().
py3: don't risk passing a None value to error.ManifestLookupError()
Thu, Sep 17, 10:35 PM
martinvonz added inline comments to D8843: rebase: fix regression in file change detection introduced by 0ecb3b11fcad.
Thu, Sep 17, 7:10 PM
martinvonz created D9040: merge: use in-memory mergestate when using in-memory context.
Thu, Sep 17, 4:11 PM
martinvonz created D9039: mergestate: extract a base class to be shared by future memmergestate.
Thu, Sep 17, 4:11 PM
martinvonz created D9034: mergestate: make clean() only be about creating a clean mergestate.
Thu, Sep 17, 4:11 PM
martinvonz created D9038: mergestate: extract overridable methods for making/restoring file backups.
Thu, Sep 17, 4:11 PM
martinvonz created D9031: mergestate: make some callers not pass pointless node argument.
Thu, Sep 17, 4:10 PM
martinvonz created D9037: mergestate: initialize all properties in __init__().
Thu, Sep 17, 4:10 PM
martinvonz created D9036: mergestate: remove unnecessary clearing of `localctx` and `otherctx`.
Thu, Sep 17, 4:10 PM
martinvonz created D9035: mergestate: move most of of reset() into start().
Thu, Sep 17, 4:10 PM
martinvonz created D9033: mergestate: split up reset() for its two use cases.
Thu, Sep 17, 4:10 PM
martinvonz created D9032: mergestate: simplify reset(), knowing that `other` and `node` go together.
Thu, Sep 17, 4:10 PM
martinvonz created D9030: py3: don't risk passing a None value to error.ManifestLookupError().
Thu, Sep 17, 12:58 PM

Tue, Sep 15

martinvonz added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

This is stalled. I've got some bugs in the logic I can't track down and
this is second on my priority list at work. I do intend to come back to it,
but it'd be fair to mark it all as changes requested.

Tue, Sep 15, 12:25 PM

Mon, Sep 14

martinvonz added a comment to D9000: localrepo: warn if we are writing to cache without a lock.

The interesting part is that although we are still taking wlock to write store
caches at many places, but still the test pases.

Mon, Sep 14, 1:10 PM
martinvonz closed D9016: histedit: cache description line.
Mon, Sep 14, 4:04 AM
martinvonz closed D9007: graphlog: use '%' only if there are *unresolved* conflicts.
Mon, Sep 14, 4:04 AM
martinvonz committed rHGdd9e28612468: resourceutil: document when we expect to take the importlib.resouces code path.
resourceutil: document when we expect to take the importlib.resouces code path
Mon, Sep 14, 4:04 AM
martinvonz closed D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7.
Mon, Sep 14, 4:04 AM
martinvonz closed D9018: resourceutil: document when we expect to take the importlib.resouces code path.
Mon, Sep 14, 4:04 AM
martinvonz committed rHGe53a3d0ef416: templater: fix reading of templates in frozen binaries with py3 < 3.7.
templater: fix reading of templates in frozen binaries with py3 < 3.7
Mon, Sep 14, 4:04 AM
martinvonz closed D9017: tests: make emacs test less strict.
Mon, Sep 14, 4:04 AM
martinvonz committed rHG47d10ade5bc4: histedit: cache description line.
histedit: cache description line
Mon, Sep 14, 4:04 AM
martinvonz committed rHG814c7430f828: tests: make emacs test less strict.
tests: make emacs test less strict
Mon, Sep 14, 4:04 AM
martinvonz committed rHG85b03b1e4715: graphlog: use '%' only if there are *unresolved* conflicts.
graphlog: use '%' only if there are *unresolved* conflicts
Mon, Sep 14, 4:04 AM

Sat, Sep 12

martinvonz added a comment to D9007: graphlog: use '%' only if there are *unresolved* conflicts.

(maybe update the description to state this since this is a common question)

Sat, Sep 12, 2:30 PM
martinvonz updated the summary of D9007: graphlog: use '%' only if there are *unresolved* conflicts.
Sat, Sep 12, 2:30 PM
martinvonz added a comment to D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7.

looks good. As an unrelated change, maybe add a comment on the previous block to indicate it is relevant for all python starting from 3.9+

Sat, Sep 12, 2:26 PM
martinvonz created D9018: resourceutil: document when we expect to take the importlib.resouces code path.
Sat, Sep 12, 2:25 PM

Fri, Sep 11

martinvonz created D9017: tests: make emacs test less strict.
Fri, Sep 11, 12:55 PM
martinvonz created D9016: histedit: cache description line.
Fri, Sep 11, 12:48 PM
martinvonz added a comment to D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7.

Does this also works with python > 3.7 or we need to add a conditional here?

Fri, Sep 11, 9:48 AM
martinvonz added a comment to D9007: graphlog: use '%' only if there are *unresolved* conflicts.

Since you both ask basically the same question...

Fri, Sep 11, 9:42 AM
martinvonz created D9008: templater: fix reading of templates in frozen binaries with py3 < 3.7.
Fri, Sep 11, 3:16 AM

Thu, Sep 10

martinvonz updated the summary of D9007: graphlog: use '%' only if there are *unresolved* conflicts.
Thu, Sep 10, 4:21 PM
martinvonz added a comment to D8930: mergestate: clear merge state if there are no unresolved conflicts.

Abandoning this in favor of D9007.

Thu, Sep 10, 4:13 PM
martinvonz created D9007: graphlog: use '%' only if there are *unresolved* conflicts.
Thu, Sep 10, 4:13 PM

Thu, Aug 27

martinvonz added a comment to D8930: mergestate: clear merge state if there are no unresolved conflicts.

The ability to re-run the merge seems quite important and I fear the BC implication.

Thu, Aug 27, 2:20 PM
martinvonz committed rHG7d24201b6447: worker: don't expose readinto() on _blockingreader since pickle is picky.
worker: don't expose readinto() on _blockingreader since pickle is picky
Thu, Aug 27, 10:10 AM
martinvonz closed D8928: worker: don't expose readinto() on _blockingreader since pickle is picky.
Thu, Aug 27, 4:48 AM
martinvonz committed rHGc2bf211c74bf: worker: don't expose readinto() on _blockingreader since pickle is picky.
worker: don't expose readinto() on _blockingreader since pickle is picky
Thu, Aug 27, 4:48 AM

Wed, Aug 26

martinvonz added inline comments to D8928: worker: don't expose readinto() on _blockingreader since pickle is picky.
Wed, Aug 26, 12:35 PM
martinvonz updated the summary of D8928: worker: don't expose readinto() on _blockingreader since pickle is picky.
Wed, Aug 26, 12:33 PM

Mon, Aug 24

martinvonz closed D8932: commit: clear mergestate also with --amend (issue6304).
Mon, Aug 24, 5:12 AM
martinvonz committed rHG6ba7190ff863: commit: clear mergestate also with --amend (issue6304).
commit: clear mergestate also with --amend (issue6304)
Mon, Aug 24, 5:12 AM
martinvonz closed D8931: tests: add test showing that merge state is not cleared by amend.
Mon, Aug 24, 5:12 AM
martinvonz committed rHGcf21cda4281f: tests: add test showing that merge state is not cleared by amend.
tests: add test showing that merge state is not cleared by amend
Mon, Aug 24, 5:12 AM

Sat, Aug 22

martinvonz closed D8934: hgweb: let staticfile() look up path from default location unless provided.
Sat, Aug 22, 7:32 PM
martinvonz closed D8936: hgweb: minimize scope of a try-block in staticfile().
Sat, Aug 22, 7:32 PM
martinvonz committed rHGf0735f2ce542: hgweb: minimize scope of a try-block in staticfile().
hgweb: minimize scope of a try-block in staticfile()
Sat, Aug 22, 7:32 PM
martinvonz closed D8935: hgweb: ignore web.templates config when guessing mime type for static content.
Sat, Aug 22, 7:32 PM
martinvonz closed D8933: hgweb: handle None from templatedir() equally bad in webcommands.py.
Sat, Aug 22, 7:32 PM
martinvonz committed rHGec2fc4d038c2: hgweb: ignore web.templates config when guessing mime type for static content.
hgweb: ignore web.templates config when guessing mime type for static content
Sat, Aug 22, 7:32 PM
martinvonz committed rHGdc9fe90bdbd5: hgweb: let staticfile() look up path from default location unless provided.
hgweb: let staticfile() look up path from default location unless provided
Sat, Aug 22, 7:32 PM
martinvonz committed rHGda3b7c80aa34: hgweb: handle None from templatedir() equally bad in webcommands.py.
hgweb: handle None from templatedir() equally bad in webcommands.py
Sat, Aug 22, 7:32 PM