Feed All Stories

Yesterday

yuja added a comment to D6169: unshelve: disable unshelve during merge (issue5123).
As stated in the issue5123, unshelve can destroy the second parent of
the context when tried to unshelve with an uncommitted merge. This
patch makes unshelve to abort when called with an uncommitted merge.
Mon, Mar 25, 6:29 PM
JordiGH committed rHG00c1ee0f746a: shelve: add --keep to list of allowables.
shelve: add --keep to list of allowables
Mon, Mar 25, 6:29 PM
yuja added a comment to D6027: mq: make unshelve to apply on modified mq patch (issue4318).
    • a/hgext/mq.py +++ b/hgext/mq.py @@ -3518,7 +3518,10 @@ delattr(self.unfiltered(), r'mq')

      def abortifwdirpatched(self, errmsg, force=False):
  • if self.mq.applied and self.mq.checkapplied and not force: + shelveinprogress = any('shelvedstate' in state + for state in cmdutil.unfinishedstates) + if (self.mq.applied and self.mq.checkapplied and not force and + not shelveinprogress):
Mon, Mar 25, 6:29 PM
durin42 added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

No, because I have some stuff which (out of tragic necessity at the moment) isn't pip installable, and I have to install it into the virtualenv by banging some rocks together. :(

Bleh. So you do need the power of a full script here.

Mon, Mar 25, 2:58 PM
indygreg added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

No, because I have some stuff which (out of tragic necessity at the moment) isn't pip installable, and I have to install it into the virtualenv by banging some rocks together. :(

Mon, Mar 25, 1:14 PM
durin42 added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

Mon, Mar 25, 12:37 PM
indygreg added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.
Mon, Mar 25, 12:25 PM
durin42 added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.

I like the flexibility. But I'm not super keen about the interface here. Using a script to inject custom options seems like it could be useful. But as it is currently implemented, the script simply prints out \0 delimited package names. So one UI wart is --extra-prebuild-script being a somewhat generic name but that script only emits package names. --extra-packages-script would be a better name.

Mon, Mar 25, 12:09 PM
marmoute committed rHG5a1e621b8186: perf: introduce a `perf.run-limits` options.
perf: introduce a `perf.run-limits` options
Mon, Mar 25, 11:48 AM
marmoute committed rHG87066cf5ec0f: perf: more flexible implementation for checking stop conditions.
perf: more flexible implementation for checking stop conditions
Mon, Mar 25, 11:48 AM
marmoute committed rHG0e6422942c84: perf: pass limits as a function argument.
perf: pass limits as a function argument
Mon, Mar 25, 11:48 AM
marmoute committed rHGb900b392c1cc: perf: document perfparents.
perf: document perfparents
Mon, Mar 25, 11:48 AM
marmoute committed rHGd93436e2ca6b: tests: use "perf" as a the extension name in test-contrib-perf.t.
tests: use "perf" as a the extension name in test-contrib-perf.t
Mon, Mar 25, 11:48 AM
marmoute committed rHGdbca2e5563c3: perf: document config options.
perf: document config options
Mon, Mar 25, 11:48 AM
navaneeth.suresh created D6169: unshelve: disable unshelve during merge (issue5123).
Mon, Mar 25, 3:17 AM

Sun, Mar 24

navaneeth.suresh added a comment to D6027: mq: make unshelve to apply on modified mq patch (issue4318).

Gentle ping for review.

Sun, Mar 24, 2:09 PM
navaneeth.suresh added a comment to D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727).

Gentle ping for review.

Sun, Mar 24, 2:08 PM

Sat, Mar 23

yuja added a comment to D6156: branchcache: add attributes to track which nodes are verified.

@@ -231,8 +235,10 @@

    raise ValueError(
        r'node %s does not exist' % pycompat.sysstr(hex(node)))
self._entries.setdefault(label, []).append(node)

+ self._verifiedbranches.add(label)

Sat, Mar 23, 9:26 PM
yuja added a comment to D6151: branchmap: remove the dict interface from the branchcache class (API).
def copy(self):
    """return an deep copy of the branchcache object"""
  • return type(self)(
  • self, self.tipnode, self.tiprev, self.filteredhash, + return branchcache( + self.entries, self.tipnode, self.tiprev, self.filteredhash, self._closednodes)
Sat, Mar 23, 9:10 PM
JordiGH committed rHG50d5e64ec561: shelve: do not update when keeping changes, just move the dirstate.
shelve: do not update when keeping changes, just move the dirstate
Sat, Mar 23, 9:10 PM
JordiGH committed rHG9b78bbb76111: shelve: refactor _shelvecreatedcommit's match object into calling site.
shelve: refactor _shelvecreatedcommit's match object into calling site
Sat, Mar 23, 9:10 PM
JordiGH committed rHG22278dae287c: shelve: new keep option.
shelve: new keep option
Sat, Mar 23, 9:10 PM
mharbison72 committed rHGdb26dbbee74d: diff: support diffing explicit files in subrepos.
diff: support diffing explicit files in subrepos
Sat, Mar 23, 9:10 PM
indygreg added a comment to D6142: automation: perform tasks on remote machines.

I don't know anything about PowerShell or AWS, but this series looks nice for making Windows easier to deal with.

What was the problem with python3 tests? I've been able to run them locally (though a bunch fail with py3 issues).

Sat, Mar 23, 12:03 PM
hooper closed D6165: fix: allow fixing untracked files when given as arguments.
Sat, Mar 23, 11:46 AM
hooper committed rHG8f427f7c1f71: fix: make the order of the work queue deterministic.
fix: make the order of the work queue deterministic
Sat, Mar 23, 11:46 AM
hooper committed rHG7f6b375a8903: fix: allow fixing untracked files when given as arguments.
fix: allow fixing untracked files when given as arguments
Sat, Mar 23, 11:46 AM
hooper closed D6166: fix: make the order of the work queue deterministic.
Sat, Mar 23, 11:46 AM
pulkit committed rHG111de135fc76: branchcache: add attributes to track which nodes are verified.
branchcache: add attributes to track which nodes are verified
Sat, Mar 23, 11:42 AM
pulkit committed rHGb5511845f9d5: branchcache: have a hasnode function to validate nodes.
branchcache: have a hasnode function to validate nodes
Sat, Mar 23, 11:42 AM
pulkit closed D6157: branchcache: have a hasnode function to validate nodes.
Sat, Mar 23, 11:42 AM
pulkit closed D6156: branchcache: add attributes to track which nodes are verified.
Sat, Mar 23, 11:42 AM
pulkit closed D6152: branchcache: rename itervalues() to iterheads().
Sat, Mar 23, 11:40 AM
pulkit closed D6154: branchcache: introduce hasbranch().
Sat, Mar 23, 11:40 AM
pulkit committed rHGb137a6793c51: branchcache: make entries a private attribute.
branchcache: make entries a private attribute
Sat, Mar 23, 11:40 AM
pulkit committed rHG0bd730fbcc2b: branchcache: introduce hasbranch().
branchcache: introduce hasbranch()
Sat, Mar 23, 11:40 AM
pulkit closed D6151: branchmap: remove the dict interface from the branchcache class (API).
Sat, Mar 23, 11:40 AM
pulkit closed D6155: branchcache: make entries a private attribute.
Sat, Mar 23, 11:40 AM
pulkit committed rHG7546bf46bfcd: branchmap: drop branchcache.setdefault() (API).
branchmap: drop branchcache.setdefault() (API)
Sat, Mar 23, 11:40 AM
pulkit closed D6153: branchmap: drop branchcache.setdefault() (API).
Sat, Mar 23, 11:40 AM
pulkit committed rHG662ffdde5adf: branchcache: rename itervalues() to iterheads().
branchcache: rename itervalues() to iterheads()
Sat, Mar 23, 11:39 AM
pulkit committed rHG624d6683c705: branchmap: remove the dict interface from the branchcache class (API).
branchmap: remove the dict interface from the branchcache class (API)
Sat, Mar 23, 11:39 AM
yuja committed rHGa66965406528: test-template: fix stdio mode on Windows.
test-template: fix stdio mode on Windows
Sat, Mar 23, 11:25 AM
indygreg added a comment to D6164: wix: add a hook for a prebuild script to inject extra libraries.

I like the flexibility. But I'm not super keen about the interface here. Using a script to inject custom options seems like it could be useful. But as it is currently implemented, the script simply prints out \0 delimited package names. So one UI wart is --extra-prebuild-script being a somewhat generic name but that script only emits package names. --extra-packages-script would be a better name.

Sat, Mar 23, 11:04 AM
martinvonz abandoned D6140: revset: add new contiguous(x) function for "x::x".
Sat, Mar 23, 12:18 AM

Fri, Mar 22

yuja added a comment to D6168: readline: provide styled prompt to readline (issue6070).
Oh, right... I saw that and that was part of why I didn't mail earlier :D  I think this is just an "expected" difference in behavior,
Fri, Mar 22, 10:01 PM
martinvonz added a reviewer for D6168: readline: provide styled prompt to readline (issue6070): yuja.
Fri, Mar 22, 3:42 PM
spectral added a comment to D6168: readline: provide styled prompt to readline (issue6070).

Except that test-command-server.t fails like this:

@@ -776,11 +776,9 @@
   message: '\xa3DdataJpassword: Hpassword\xf5DtypeFprompt'
   1234
   *** runcommand debugprompt --config ui.interactive=True
-  message: '\xa3DdataGprompt:GdefaultAyDtypeFprompt'
-   5678
+  prompt: 5678
   *** runcommand debugpromptchoice --config ui.interactive=True
-  message: '\xa4Gchoices\x82\x82AyCYes\x82AnBNoDdataTpromptchoice (y/n)? GdefaultAyDtypeFprompt'
-   1
+  promptchoice (y/n)?  1

 bad message encoding:

@spectral, any idea how to fix?

Fri, Mar 22, 3:40 PM
martinvonz added a comment to D6168: readline: provide styled prompt to readline (issue6070).
In D6168#89872, @jeffpc wrote:

FWIW, I tested this on both Unleashed (an illumos fork) and FreeBSD. It fixes the issue for me on both.

Thanks for testing, Jeff. I'll queue based on that.

Fri, Mar 22, 2:30 PM
martinvonz added a comment to D6168: readline: provide styled prompt to readline (issue6070).
In D6168#89872, @jeffpc wrote:

FWIW, I tested this on both Unleashed (an illumos fork) and FreeBSD. It fixes the issue for me on both.

Fri, Mar 22, 2:27 PM
jeffpc accepted D6168: readline: provide styled prompt to readline (issue6070).

FWIW, I tested this on both Unleashed (an illumos fork) and FreeBSD. It fixes the issue for me on both.

Fri, Mar 22, 2:19 PM
JordiGH committed rHGba064f95175e: samplehgrcs: update the list of suggested extensions.
samplehgrcs: update the list of suggested extensions
Fri, Mar 22, 1:45 PM
JordiGH committed rHG018acb7a3490: samplehgrcs: clarify which lines should be uncommented.
samplehgrcs: clarify which lines should be uncommented
Fri, Mar 22, 1:45 PM
yuja committed rHG77ef3498ceb3: template: add CBOR output format.
template: add CBOR output format
Fri, Mar 22, 1:05 PM
yuja committed rHG4df7c4b70e03: templatefilters: add {x|cbor} filter for custom CBOR output.
templatefilters: add {x|cbor} filter for custom CBOR output
Fri, Mar 22, 1:05 PM
durin42 updated subscribers of D6168: readline: provide styled prompt to readline (issue6070).

FYI @spectral I uploaded this.

Fri, Mar 22, 11:07 AM
durin42 added a comment to D6168: readline: provide styled prompt to readline (issue6070).

This is Kyle's patch from https://bz.mercurial-scm.org/show_bug.cgi?id=6070 - it feels regrettable but necessary, and anecdotally it seems to work. I'd give it an LGTM stamp here, but I can't since I uploaded it.

Fri, Mar 22, 11:07 AM
durin42 created D6168: readline: provide styled prompt to readline (issue6070).
Fri, Mar 22, 11:06 AM
lothiraldan updated subscribers of D6122: tests: add a file listing all the flaky tests.
In D6122#89819, @av6 wrote:

@av6 is a --no-flaky-tests flag what you had in mind?

Something like that, yes. I suggested that flag seeing how this change introduces a quite specific file with just one line. And I thought "if it's important, let's integrate it deeper into the test runner".

But a flag for run-tests.py is not the only alternative. Now that I think about #require, can ‚Äčtest-remotefilelog-bgprefetch.t be marked with #require not-an-exotic-fs-inside-docker (or whatever the actual thing that causes flakiness if it's known)? hghave.py already checks various filesystem features, why not make it check for the cause of issue6083?

Fri, Mar 22, 5:22 AM

Thu, Mar 21

hooper abandoned D5516: fix: add some arguments to facilitate extensions.

See D6167 for a newer approach.

Thu, Mar 21, 10:58 PM
hooper created D6167: fix: allow fixer tools to return metadata in addition to the file content.
Thu, Mar 21, 10:57 PM
hooper added a dependent revision for D6166: fix: make the order of the work queue deterministic: D6167: fix: allow fixer tools to return metadata in addition to the file content.
Thu, Mar 21, 10:57 PM
hooper created D6165: fix: allow fixing untracked files when given as arguments.
Thu, Mar 21, 10:57 PM
hooper created D6166: fix: make the order of the work queue deterministic.
Thu, Mar 21, 10:57 PM
hooper added a dependent revision for D6165: fix: allow fixing untracked files when given as arguments: D6166: fix: make the order of the work queue deterministic.
Thu, Mar 21, 10:57 PM
martinvonz closed D6158: memctx: rename constructor argument "copied" to "copysource" (API).
Thu, Mar 21, 7:26 PM
martinvonz closed D6159: memfilectx: override copysource() instead of using dummy nodeid.
Thu, Mar 21, 7:25 PM
martinvonz committed rHG550a172a603b: memctx: rename constructor argument "copied" to "copysource" (API).
memctx: rename constructor argument "copied" to "copysource" (API)
Thu, Mar 21, 7:25 PM
martinvonz committed rHG6fef387af1da: memfilectx: override copysource() instead of using dummy nodeid.
memfilectx: override copysource() instead of using dummy nodeid
Thu, Mar 21, 7:25 PM
durin42 created D6164: wix: add a hook for a prebuild script to inject extra libraries.
Thu, Mar 21, 8:55 AM
av6 added a comment to D6122: tests: add a file listing all the flaky tests.

@av6 is a --no-flaky-tests flag what you had in mind?

Thu, Mar 21, 8:31 AM
lothiraldan added a comment to D6122: tests: add a file listing all the flaky tests.

The big difference between #require slow and #require flaky is that we don't want to run the slow tests by default but we want to run the flaky test by default if not specified otherwise. I don't know enough about the test runner to evaluate the amount of work need to support a --no-flaky-tests flag,

Thu, Mar 21, 7:52 AM
mharbison72 added a comment to D6140: revset: add new contiguous(x) function for "x::x".

Josef 'Jeff' Sipek <jeffpc@josefsipek.net> sent this to mercurial-devel. I'm adding it here for reference.

I read this doc string and the patch intro several times, and every time I
concluded that this function was useless. Only after reading some of the
other replies, did I realize that "x" here can be a set.

The docstring does say "in the set" :) But I agree that it's not very clear. I copied the pattern from other functions. I would probably have said "in the input set" otherwise. Do you think that would have been clearer? We could make that change to all the existing cases of plain "set" referring to the input.

Thu, Mar 21, 12:16 AM

Wed, Mar 20

martinvonz added inline comments to D6163: copies: extract function for deciding whether to use changeset-centric algos.
Wed, Mar 20, 3:17 PM
pulkit added inline comments to D6163: copies: extract function for deciding whether to use changeset-centric algos.
Wed, Mar 20, 3:11 PM
martinvonz created D6163: copies: extract function for deciding whether to use changeset-centric algos.
Wed, Mar 20, 3:03 PM
martinvonz created D6162: getrenamedfn: get copy data from context object if configured.
Wed, Mar 20, 3:03 PM
martinvonz added a dependent revision for D6162: getrenamedfn: get copy data from context object if configured: D6163: copies: extract function for deciding whether to use changeset-centric algos.
Wed, Mar 20, 3:03 PM
spectral closed D6131: crecord: redraw the screen when starting up chunkselector.
Wed, Mar 20, 2:08 PM
spectral closed D6129: crecord: completely redraw screen when coming back from editor.
Wed, Mar 20, 2:08 PM
spectral closed D6130: crecord: redraw the screen on ctrl-L.
Wed, Mar 20, 2:08 PM
spectral committed rHGcde5827d09a7: crecord: redraw the screen when starting up chunkselector.
crecord: redraw the screen when starting up chunkselector
Wed, Mar 20, 2:08 PM
spectral committed rHGfa3b0ca9d74f: crecord: redraw the screen on ctrl-L.
crecord: redraw the screen on ctrl-L
Wed, Mar 20, 2:08 PM
spectral committed rHG3f467db023a2: crecord: completely redraw screen when coming back from editor.
crecord: completely redraw screen when coming back from editor
Wed, Mar 20, 2:08 PM
pulkit closed D6161: tests: glob seconds in test-upgrade-repo.t.
Wed, Mar 20, 2:07 PM
pulkit committed rHG22ed63869835: tests: glob seconds in test-upgrade-repo.t.
tests: glob seconds in test-upgrade-repo.t
Wed, Mar 20, 2:07 PM
pulkit closed D6160: store: recommend using `hg debugrebuildfncache` if fncache is corrupted.
Wed, Mar 20, 2:07 PM
pulkit committed rHG3e7cfa17df5d: store: recommend using `hg debugrebuildfncache` is fncache is corrupted.
store: recommend using `hg debugrebuildfncache` is fncache is corrupted
Wed, Mar 20, 2:07 PM
pulkit committed rHGf9344d04909e: debugsparse: abort if the repository is not sparse instead of ui.status().
debugsparse: abort if the repository is not sparse instead of ui.status()
Wed, Mar 20, 2:07 PM
pulkit closed D6149: debugsparse: abort if the repository is not sparse instead of ui.status().
Wed, Mar 20, 2:07 PM
pulkit retitled D6160: store: recommend using `hg debugrebuildfncache` if fncache is corrupted from store: recommend using `hg debugrebuildfncache` is fncache is corrupted to store: recommend using `hg debugrebuildfncache` if fncache is corrupted.
Wed, Mar 20, 1:47 PM
pulkit created D6161: tests: glob seconds in test-upgrade-repo.t.
Wed, Mar 20, 1:43 PM
pulkit created D6160: store: recommend using `hg debugrebuildfncache` if fncache is corrupted.
Wed, Mar 20, 1:40 PM
martinvonz added a comment to D6140: revset: add new contiguous(x) function for "x::x".

Josef 'Jeff' Sipek <jeffpc@josefsipek.net> sent this to mercurial-devel. I'm adding it here for reference.

"x::x" is a useful trick for making a range contiguous, but it gets
annoying if "x" is a long expression. Let's provide a simple function
that helps with that. It also makes it the trick more discoverable.

...

+@predicate('contiguous(set)', safe=True, takeorder=True)
+def contiguous(repo, subset, x, order):
+ """Changesets that have both ancestors and descendants in the set. This
+ effectively fills in gaps in the set to make it contiguous, without adding
+ new common ancestors or common descendants.
+
+ "contiguous(x)" is identical to "x::x".

I read this doc string and the patch intro several times, and every time I
concluded that this function was useless. Only after reading some of the
other replies, did I realize that "x" here can be a set.

Wed, Mar 20, 1:28 PM
martinvonz added a comment to D6140: revset: add new contiguous(x) function for "x::x".

Josef 'Jeff' Sipek <jeffpc@josefsipek.net> sent this to mercurial-devel. I'm adding it here for reference.

Wed, Mar 20, 1:24 PM
martinvonz added a comment to D6140: revset: add new contiguous(x) function for "x::x".

I've only used X::X where X was trivial, so I'm still trying to get my mind around this. Out of curiosity, what are the scenarios where a nontrivial X is useful?

Wed, Mar 20, 1:21 PM
martinvonz added a comment to D5991: copies: do copy tracing based on ctx.p[12]copies() if configured.

When the test suite is run with --extra-config-opt to use the new copy
tracing, all tests pass, besides test-copies.t (which fails in the
same way as you can see in this patch).

Wed, Mar 20, 2:36 AM
martinvonz created D6158: memctx: rename constructor argument "copied" to "copysource" (API).
Wed, Mar 20, 2:16 AM
martinvonz created D6159: memfilectx: override copysource() instead of using dummy nodeid.
Wed, Mar 20, 2:15 AM
martinvonz added a dependent revision for D6158: memctx: rename constructor argument "copied" to "copysource" (API): D6159: memfilectx: override copysource() instead of using dummy nodeid.
Wed, Mar 20, 2:15 AM