martinvonz (Martin von Zweigbergk)
User

Projects

User Details

User Since
Jun 28 2017, 5:28 PM (46 w, 6 d)

Recent Activity

Yesterday

martinvonz added a comment to D3579: state: write the version number in plain text on top of state files.
In D3579#57298, @yuja wrote:

mercurial/state.py:65: undefined name 'iv'
mercurial/state.py:73: local variable 'version' is assigned to but never used

Queued the fixes.

Tue, May 22, 11:26 AM

Mon, May 21

martinvonz accepted D3579: state: write the version number in plain text on top of state files.
Mon, May 21, 12:00 PM
martinvonz accepted D3578: state: set canonical=True to write deterministically.
Mon, May 21, 11:59 AM
martinvonz accepted D3572: state: don't have a dict like interface for cmdstate class.
Mon, May 21, 11:59 AM
martinvonz accepted D2591: state: import the file to write state files from evolve extension.
Mon, May 21, 11:59 AM

Fri, May 18

martinvonz requested changes to D3579: state: write the version number in plain text on top of state files.
Fri, May 18, 5:12 PM
martinvonz closed D3575: narrow: filter set of files to check for case-folding to core.
Fri, May 18, 10:24 AM
martinvonz closed D3574: narrow: filter merge actions in core.
Fri, May 18, 10:24 AM
martinvonz closed D3576: narrow: filter copies in core.
Fri, May 18, 10:24 AM
martinvonz committed rHGee7b6fa52d9d: narrow: filter copies in core.
narrow: filter copies in core
Fri, May 18, 10:24 AM
martinvonz committed rHG18e6ea9ba81d: narrow: filter set of files to check for case-folding to core.
narrow: filter set of files to check for case-folding to core
Fri, May 18, 10:24 AM
martinvonz committed rHG8f37b5fc5abf: narrow: filter merge actions in core.
narrow: filter merge actions in core
Fri, May 18, 10:24 AM

Thu, May 17

martinvonz created D3575: narrow: filter set of files to check for case-folding to core.
Thu, May 17, 6:48 PM
martinvonz created D3576: narrow: filter copies in core.
Thu, May 17, 6:47 PM
martinvonz created D3574: narrow: filter merge actions in core.
Thu, May 17, 6:47 PM
martinvonz added a dependent revision for D3575: narrow: filter set of files to check for case-folding to core: D3576: narrow: filter copies in core.
Thu, May 17, 6:47 PM
martinvonz added a dependent revision for D3574: narrow: filter merge actions in core: D3575: narrow: filter set of files to check for case-folding to core.
Thu, May 17, 6:47 PM
martinvonz added inline comments to D2591: state: import the file to write state files from evolve extension.
Thu, May 17, 12:48 PM
martinvonz added inline comments to D3572: state: don't have a dict like interface for cmdstate class.
Thu, May 17, 12:47 PM
martinvonz closed D3570: tests: update py3 test since json fields are now sorted.
Thu, May 17, 8:12 AM
martinvonz committed rHG1b8238f67bf2: tests: update py3 test since json fields are now sorted.
tests: update py3 test since json fields are now sorted
Thu, May 17, 8:12 AM
martinvonz committed rHGf5a1aa8c6987: json: reject unicode on py2 as well.
json: reject unicode on py2 as well
Thu, May 17, 8:12 AM
martinvonz closed D3536: json: reject unicode on py2 as well.
Thu, May 17, 8:12 AM

Wed, May 16

martinvonz updated the diff for D3536: json: reject unicode on py2 as well.
Wed, May 16, 1:49 PM
martinvonz added a comment to D3536: json: reject unicode on py2 as well.
In D3536#56051, @yuja wrote:
  • elif isinstance(obj, str):
  • # This branch is unreachable on Python 2, because bytes == str
  • # and we'll return in the next-earlier block in the elif
  • # ladder. On Python 3, this helps us catch bugs before they
  • # hurt someone. + elif isinstance(obj, (str, pycompat.unicode)): + # On Python 2, we'll only get here if obj is unicode, because + # str == bytes, so str is handled above.

Doh, I never thought we already had pycompat.unicode to be imported
automagically by the code transformer, and it's unavailable on Python 2!
Since we'll eventually ditch the transformer, we'll have to add
unicode = __builtin__.unicode to the py2 side of pycompat.

Wed, May 16, 1:49 PM
martinvonz created D3570: tests: update py3 test since json fields are now sorted.
Wed, May 16, 1:34 PM
martinvonz abandoned D3561: dispatch: drop redundant setting of "ret" to -1.
Wed, May 16, 12:26 PM
martinvonz added a comment to D3561: dispatch: drop redundant setting of "ret" to -1.
In D3561#56386, @yuja wrote:

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py

    • a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -230,7 +230,6 @@ except IOError as inst: if inst.errno != errno.EPIPE: raise
  • ret = -1 finally: duration = util.timer() - starttime req.ui.flush()

Let's hold this. I plan to change the ret to be initialized to 1.

Wed, May 16, 12:26 PM
martinvonz closed D3560: tests: test failure reporting in blackbox code.
Wed, May 16, 7:42 AM
martinvonz committed rHG81ca0fd348e3: tests: test failure reporting in blackbox code.
tests: test failure reporting in blackbox code
Wed, May 16, 7:41 AM

Tue, May 15

martinvonz committed rFBHGX9b7811f724c8: commitextras: delete now that it's in the core repo.
commitextras: delete now that it's in the core repo
Tue, May 15, 8:23 PM
martinvonz closed D3566: commitextras: delete now that it's in the core repo.
Tue, May 15, 8:23 PM
martinvonz created D3565: sparse: delete now that it's in the core repo.
Tue, May 15, 8:01 PM
martinvonz created D3566: commitextras: delete now that it's in the core repo.
Tue, May 15, 8:01 PM
martinvonz added a dependent revision for D3565: sparse: delete now that it's in the core repo: D3566: commitextras: delete now that it's in the core repo.
Tue, May 15, 8:01 PM
martinvonz created D3561: dispatch: drop redundant setting of "ret" to -1.
Tue, May 15, 1:34 PM
martinvonz created D3560: tests: test failure reporting in blackbox code.
Tue, May 15, 1:33 PM
martinvonz added a dependent revision for D3560: tests: test failure reporting in blackbox code: D3561: dispatch: drop redundant setting of "ret" to -1.
Tue, May 15, 1:33 PM
martinvonz closed D3558: revlog: handle errors from index_node() in nt_insert() and index_slice_del().
Tue, May 15, 8:51 AM
martinvonz committed rHG514605777244: revlog: handle errors from index_node() in nt_insert() and index_slice_del().
revlog: handle errors from index_node() in nt_insert() and index_slice_del()
Tue, May 15, 8:51 AM

Mon, May 14

martinvonz created D3558: revlog: handle errors from index_node() in nt_insert() and index_slice_del().
Mon, May 14, 1:32 PM

Sat, May 12

martinvonz added a comment to D3536: json: reject unicode on py2 as well.

unicode is not a type on Python 3. I think this should be changed to (str, pycompat.unicode). That will evaluate to (str, unicode) on Python 2 and (str, str) on Python 3. If you go this route, please rephrase the comment to denote the Python 2 behavior only triggering on unicode because of str == bytes.

Sat, May 12, 2:13 AM
martinvonz updated the diff for D3536: json: reject unicode on py2 as well.
Sat, May 12, 2:13 AM
martinvonz created D3536: json: reject unicode on py2 as well.
Sat, May 12, 12:35 AM

Fri, May 11

martinvonz closed D3531: shortest: avoid magic number "41".
Fri, May 11, 10:54 PM
martinvonz committed rHG5ac72e07692a: shortest: avoid magic number "41".
shortest: avoid magic number "41"
Fri, May 11, 10:54 PM
martinvonz closed D3530: revlog: handle error from node lookup.
Fri, May 11, 10:54 PM
martinvonz committed rHG312d7d14d44e: revlog: handle error from node lookup.
revlog: handle error from node lookup
Fri, May 11, 10:54 PM
martinvonz added inline comments to D3532: wireprotov2: define and implement "rawstorefile" command.
Fri, May 11, 8:21 PM
martinvonz closed D3502: shortest: move revnum-disambiguation out of revlog.
Fri, May 11, 3:32 PM
martinvonz closed D3499: revlog: use node tree (native code) for shortest() calculation.
Fri, May 11, 3:32 PM
martinvonz closed D3501: shortest: remove unnecessary check for revnum in isvalid().
Fri, May 11, 3:32 PM
martinvonz committed rHG3ac950cd5978: shortest: move revnum-disambiguation out of revlog.
shortest: move revnum-disambiguation out of revlog
Fri, May 11, 3:32 PM
martinvonz closed D3500: shortest: make pure code also disambigute against revnums at end.
Fri, May 11, 3:32 PM
martinvonz committed rHG76e933e0ccc9: shortest: remove unnecessary check for revnum in isvalid().
shortest: remove unnecessary check for revnum in isvalid()
Fri, May 11, 3:32 PM
martinvonz closed D3517: shelve: reduce scope of merge tool config override.
Fri, May 11, 3:32 PM
martinvonz committed rHG0db7fe7c34d3: shortest: make pure code also disambigute against revnums at end.
shortest: make pure code also disambigute against revnums at end
Fri, May 11, 3:32 PM
martinvonz committed rHG0304f22497fa: revlog: use node tree (native code) for shortest() calculation.
revlog: use node tree (native code) for shortest() calculation
Fri, May 11, 3:32 PM
martinvonz committed rHG7932be8b0559: shelve: reduce scope of merge tool config override.
shelve: reduce scope of merge tool config override
Fri, May 11, 3:32 PM
martinvonz created D3531: shortest: avoid magic number "41".
Fri, May 11, 3:32 PM
martinvonz updated the diff for D3530: revlog: handle error from node lookup.
Fri, May 11, 3:32 PM
martinvonz created D3530: revlog: handle error from node lookup.
Fri, May 11, 3:32 PM
martinvonz added a comment to D3499: revlog: use node tree (native code) for shortest() calculation.
In D3499#55925, @yuja wrote:

+static int nt_shortest(indexObject *self, const char *node)
+{
+ int level, off;
+
+ if (nt_init(self) == -1)
+ return -3;
+ if (nt_populate(self) == -1)
+ return -3;
+
+ for (level = off = 0; level < 40; level++) {
+ int k, v;
+ nodetree *n = &self->nt[off];
+ k = nt_level(node, level);
+ v = n->children[k];
+ if (v < 0) {
+ v = -(v + 1);
+ const char *n = index_node(self, v);

Perhaps we should check if n == NULL. index_node_existing() might be more
appropriate.

Fri, May 11, 3:31 PM

Thu, May 10

martinvonz updated the diff for D3502: shortest: move revnum-disambiguation out of revlog.
Thu, May 10, 12:02 PM
martinvonz updated the diff for D3499: revlog: use node tree (native code) for shortest() calculation.
Thu, May 10, 12:02 PM
martinvonz added a comment to D3499: revlog: use node tree (native code) for shortest() calculation.
In D3499#55772, @yuja wrote:

Looks generally good, but can you fix your editor to not do Google indent?

Thu, May 10, 12:01 PM
martinvonz updated the summary of D3517: shelve: reduce scope of merge tool config override.
Thu, May 10, 11:22 AM
martinvonz added a comment to D3517: shelve: reduce scope of merge tool config override.
In D3517#55774, @yuja wrote:

+ shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
+ basename, pctx, tmpwctx,
+ shelvectx, branchtorestore,
+ activebookmark)

overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'unshelve'):

Maybe I'm wrong, but doesn't rebase do merge?

Thu, May 10, 11:20 AM
martinvonz closed D3498: revlog: use literal -1 instead of variable that always has that value.
Thu, May 10, 9:05 AM
martinvonz committed rHG892592475094: revlog: use literal -1 instead of variable that always has that value.
revlog: use literal -1 instead of variable that always has that value
Thu, May 10, 9:05 AM
martinvonz closed D3497: revlog: extract function for fully populating the radix tree.
Thu, May 10, 9:05 AM
martinvonz committed rHG9c6d1d41b3e6: revlog: extract function for fully populating the radix tree.
revlog: extract function for fully populating the radix tree
Thu, May 10, 9:04 AM
martinvonz closed D3479: update: print warning about hidden changeset after update.
Thu, May 10, 6:43 AM
martinvonz committed rHGea63a2004d09: update: print warning about hidden changeset after update.
update: print warning about hidden changeset after update
Thu, May 10, 6:42 AM
martinvonz closed D3516: tweakdefaults: remove "bisect" from commands.status.skipstates.
Thu, May 10, 6:41 AM
martinvonz committed rHGc6904da6ab15: tweakdefaults: remove "bisect" from commands.status.skipstates.
tweakdefaults: remove "bisect" from commands.status.skipstates
Thu, May 10, 6:41 AM

Wed, May 9

martinvonz created D3517: shelve: reduce scope of merge tool config override.
Wed, May 9, 8:14 PM
martinvonz added a comment to D3454: Assign to result from block..

This doesn't apply. Looks like it's based on a version where exit code is 1 (line 193), but our main.rs seems to have always have had it set to 255.

Wed, May 9, 5:16 PM
martinvonz created D3516: tweakdefaults: remove "bisect" from commands.status.skipstates.
Wed, May 9, 5:16 PM
martinvonz added inline comments to D2806: tweakdefaults: add commands.status.verbose to tweakefaults.
Wed, May 9, 4:42 PM

Tue, May 8

martinvonz added a comment to D3479: update: print warning about hidden changeset after update.

Does it means that someone that try to update to a hidden changeset with a dirty conflicting workdir will first need to solve the conflict before seeing that the changeset is hidden and that it could be potentially the source of the conflict?

Tue, May 8, 2:19 PM
martinvonz updated the diff for D3479: update: print warning about hidden changeset after update.
Tue, May 8, 2:19 PM
martinvonz created D3502: shortest: move revnum-disambiguation out of revlog.
Tue, May 8, 2:07 PM
martinvonz created D3501: shortest: remove unnecessary check for revnum in isvalid().
Tue, May 8, 2:07 PM
martinvonz created D3500: shortest: make pure code also disambigute against revnums at end.
Tue, May 8, 2:07 PM
martinvonz created D3499: revlog: use node tree (native code) for shortest() calculation.
Tue, May 8, 2:07 PM
martinvonz added a dependent revision for D3501: shortest: remove unnecessary check for revnum in isvalid(): D3502: shortest: move revnum-disambiguation out of revlog.
Tue, May 8, 2:07 PM
martinvonz added a dependent revision for D3500: shortest: make pure code also disambigute against revnums at end: D3501: shortest: remove unnecessary check for revnum in isvalid().
Tue, May 8, 2:07 PM
martinvonz added a dependent revision for D3499: revlog: use node tree (native code) for shortest() calculation: D3500: shortest: make pure code also disambigute against revnums at end.
Tue, May 8, 2:07 PM
martinvonz created D3498: revlog: use literal -1 instead of variable that always has that value.
Tue, May 8, 2:07 PM
martinvonz added a dependent revision for D3498: revlog: use literal -1 instead of variable that always has that value: D3499: revlog: use node tree (native code) for shortest() calculation.
Tue, May 8, 2:07 PM
martinvonz added a dependent revision for D3497: revlog: extract function for fully populating the radix tree: D3498: revlog: use literal -1 instead of variable that always has that value.
Tue, May 8, 2:07 PM
martinvonz created D3497: revlog: extract function for fully populating the radix tree.
Tue, May 8, 2:07 PM
martinvonz closed D3311: revset: use resolvehexnodeidprefix() in id() predicate (BC).
Tue, May 8, 8:47 AM
martinvonz closed D3461: shortest: don't keep checking for longer prefix if node doesn't exist (API).
Tue, May 8, 8:47 AM
martinvonz closed D3462: revset: make id() an empty set for ambiguous nodeid (BC).
Tue, May 8, 8:47 AM
martinvonz committed rHG69de3c3de036: directaccess: use resolvehexnodeidprefix() instead of _partialmatch().
directaccess: use resolvehexnodeidprefix() instead of _partialmatch()
Tue, May 8, 8:47 AM
martinvonz committed rHG0a79fb64118e: revset: use resolvehexnodeidprefix() in id() predicate (BC).
revset: use resolvehexnodeidprefix() in id() predicate (BC)
Tue, May 8, 8:47 AM
martinvonz closed D3463: directaccess: use resolvehexnodeidprefix() instead of _partialmatch().
Tue, May 8, 8:47 AM
martinvonz committed rHG37e7ae332e90: revset: make id() an empty set for ambiguous nodeid (BC).
revset: make id() an empty set for ambiguous nodeid (BC)
Tue, May 8, 8:47 AM