D3212: patch: implement a new worddiff algorithm

dhduvall added a comment. I can't really tell what's going on there, frankly, unlike with the dim case, where it make sense, but I can always change the colors myself. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3212 To: quark, #hg-reviewers, durin42, yuja

D3212: patch: implement a new worddiff algorithm

dhduvall added inline comments. INLINE COMMENTS > quark wrote in color.py:94 > There are not many choices - dim, 16/256 colors, or bold. We ended up with > 16/256 colors internally for wider support (ex. tmux). But I'd like to > express my (strong) options that: > > - diff.inserted.changed

D2391: sshpeer: factor out code for creating peers from pipes

dhduvall added inline comments. INLINE COMMENTS > sshpeer.py:537 > + > +``path`` and ``path`` are stored on the eventual peer instance and may > +not be used for anything meaningful. That second `path` should be `proc`? REPOSITORY rHG Mercurial REVISION DETAIL

Re: Accessing hidden commits by hash (directaccess extension)

This is great. I've been hitting my head against this ever since I started using evolve, and I'll be thrilled to have this functionality. A couple of questions: - If a revision range is given that ends (or begins, I suppose) with a hidden changeset, will any intervening hidden changesets

Re: D219: morestatus: move fb extension to core by plugging to `hg status --verbose`

durin42 (Augie Fackler) wrote: > I've heard no objections, but also the suggestion that --terse be > something like --terse-dirs or similar so it's obviously not the antonym > of --verbose. Maybe --collapse? I think that's what you do when you've got a directory tree in a GUI and you rotate

[PATCH] tests: tell pip not to check for a newer version

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1497994553 25200 # Tue Jun 20 14:35:53 2017 -0700 # Node ID 657e3a53dff24205ebeaffa72a378103ba8338d5 # Parent 404b6acfa192b630fab3c371da072eb8b713d4c1 tests: tell pip not to check for a newer version pip will

Re: [PATCH] tests: redirect virtualenv stderr to same file as stdout

Danek Duvall wrote: > Augie Fackler wrote: > > > > > > On Jun 20, 2017, at 16:53, Augie Fackler <r...@durin42.com> wrote: > > > > > > # HG changeset patch > > > # User Augie Fackler <au...@google.com> > > > # Date 1497991

Re: [PATCH] tests: redirect virtualenv stderr to same file as stdout

Augie Fackler wrote: > > > On Jun 20, 2017, at 16:53, Augie Fackler wrote: > > > > # HG changeset patch > > # User Augie Fackler > > # Date 1497991974 14400 > > # Tue Jun 20 16:52:54 2017 -0400 > > # Node ID ff3964f237d601e7c375c10fbf93029b5db39307 > >

[PATCH] tests: don't touch the network when using virtualenv

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1497913700 25200 # Mon Jun 19 16:08:20 2017 -0700 # Node ID c129491ce55e703b50d39fb30ae6da6aa50fc78e # Parent 661025fd3e1cd5d5e2dee12b7f64312d6cd48a0b tests: don't touch the network when using virtualenv diff

Re: [PATCH 3 of 3 v2 pip-fix] tests: add a test for installing hg with pip in a virtualenv

Danek Duvall wrote: > Augie Fackler wrote: > > > > > > On Jun 19, 2017, at 18:13, Donald Stufft <don...@stufft.io> wrote: > > > > > >>> Any thoughts on what to do here? The ping command has a different > > >>

Re: [PATCH 3 of 3 v2 pip-fix] tests: add a test for installing hg with pip in a virtualenv

Donald Stufft wrote: > > > On Jun 19, 2017, at 6:15 PM, Augie Fackler wrote: > > > > > >> On Jun 19, 2017, at 18:13, Donald Stufft wrote: > >> > Any thoughts on what to do here? The ping command has a different > interface on Solaris than on

Re: [PATCH 3 of 3 v2 pip-fix] tests: add a test for installing hg with pip in a virtualenv

Augie Fackler wrote: > > > On Jun 19, 2017, at 18:13, Donald Stufft wrote: > > > >>> Any thoughts on what to do here? The ping command has a different > >>> interface on Solaris than on Linux, so trying to simply ping > >>> pypi.python.org (assuming we can rely on pip always

Re: [PATCH V2] status: add a flag to terse the output (issue4119)

I'd like to see some text in the help output that talks about -t and its arguments -- what are they, what do they mean, what it means to combine them, how to disable them. Pulkit Goyal wrote: > @@ -4804,16 +4806,28 @@ > show = [k for k in states if opts.get(k)] > if opts.get('all'): >

Re: [PATCH 3 of 3 v2 pip-fix] tests: add a test for installing hg with pip in a virtualenv

I've been running into problems with this. It's not a Solaris issue, but because I'm running inside a non-transparent firewall. http_proxy is being stripped from the environment of each test, but in order to do a pip install, I need that environment variable in order to connect outside. I also

Re: [PATCH RFC WIP] status: add an option to see terse status (WIP)

Pulkit Goyal wrote: > On Sun, May 28, 2017 at 11:30 PM, Augie Fackler wrote: > > > >> On May 26, 2017, at 5:18 PM, Pulkit Goyal <7895pul...@gmail.com> wrote: > >> > >> # HG changeset patch > >> # User Pulkit Goyal <7895pul...@gmail.com> > >> # Date 1495832891 -19800 > >> #

Re: [PATCH] solaris: solaris grep doesn't have -A; reimplement with awk

Augie Fackler wrote: > > I'm happy to add the check, though, if folks think it's the right path > > forward. I assume that -B and -C should come along for the ride? > > Yep, (I’m assuming since you asked solaris grep is also sad about those > flags.) Solaris grep is sad about many flags.

Re: [PATCH] solaris: solaris grep doesn't have -A; reimplement with awk

Pierre-Yves David wrote: > > > On 06/03/2017 01:20 AM, danek.duv...@oracle.com wrote: > ># HG changeset patch > ># User Danek Duvall <danek.duv...@oracle.com> > ># Date 1496445527 25200 > ># Fri Jun 02 16:18:47 2017 -0700 > ># Node ID d41ec8a

[PATCH] debugbundle: add --part-type flag to emit only named part types

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1496704781 25200 # Mon Jun 05 16:19:41 2017 -0700 # Node ID 67209fdbca98cf2a38b05cb06f093dc376803590 # Parent e696f597d02f971eeed1217096b8f200ddb903d2 debugbundle: add --part-type flag to emit only named part

[PATCH] solaris: solaris grep doesn't have -A; reimplement with awk

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1496445527 25200 # Fri Jun 02 16:18:47 2017 -0700 # Node ID d41ec8a079648101eae94a25e05c6d7a7b26b653 # Parent e6ff007e107e434b35eb881711f459c7a75c91b2 solaris: solaris grep doesn't have -A; reimplement with awk

Re: San Francisco Meetup

Sean Farley wrote: > Just a quick followup to my suggestion of a mini hackathon in San > Francisco (hopefully in a somewhat frequent manner). I was thinking of > testing it out this Saturday for coffee / brunch: > > https://www.meetup.com/Bay-Area-Mercurial-Meetup/events/239870170/ > > It's a

Re: [PATCH stable] tests: pass only one file at a time to tail(1)

Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1492954690 14400 > # Sun Apr 23 09:38:10 2017 -0400 > # Branch stable > # Node ID 6db2667e46e8831772e38639088e39932355336e > # Parent f82cdd5ee57e468c3801cd340691e9b2497a49b2 > tests: pass only

Re: [PATCH 3 of 6] tests: add tests for poorly behaving HTTP server

Gregory Szorc wrote: > +Failure to accept() socket should result in connection related error message > + > + $ hg --config badserver.closebeforeaccept=true serve -p $HGPORT -d > --pid-file=hg.pid > + $ cat hg.pid > $DAEMON_PIDS > + > + $ hg clone http://localhost:$HGPORT/ clone > + abort:

Re: stable ordering of test output

Augie Fackler wrote: > On Thu, Apr 13, 2017 at 3:55 PM, Augie Fackler wrote: > > On Wed, Mar 8, 2017 at 10:44 AM, Yuya Nishihara wrote: > >> On Tue, 7 Mar 2017 17:56:58 +0100, Pierre-Yves David wrote: > >>> On the other hand, this is probably not so bundle2

Re: [PATCH 3 of 3 V2] url: support auth.cookiefile for adding cookies to HTTP requests

Gregory Szorc wrote: > +The following options apply to all hosts. > + > +``cookiefile`` > +Path to a file containing HTTP cookie lines. Cookies matching a > +host will be sent automatically. > + > +The file format uses the Mozilla cookies.txt or libwww-perl "Set-Cookie3" > +

Re: hg-git and round-tripping (and file copies?)

Sean Farley wrote: > Danek Duvall <danek.duv...@oracle.com> writes: > > > Mike Hommey wrote: > > > >> If your goal trying to round-trip between mercurial and git is to > >> provide developers with the possibility to use mercurial or git as they > >

Re: hg-git and round-tripping (and file copies?)

Mike Hommey wrote: > If your goal trying to round-trip between mercurial and git is to > provide developers with the possibility to use mercurial or git as they > like, and somehow make it work with developers pushing on both ends, you > should instead use a single source of truth (mercurial or

Re: hg-git and round-tripping (and file copies?)

Gregory Szorc wrote: > It is effectively impossible to round-trip between Git and Mercurial when > file copies are involved. This is because Mercurial's filelog hashes > include copy metadata and the parent nodes. Git's blob hashes, by contrast, > are effectively content only. When you convert

Re: stable ordering of test output

Pierre-Yves David wrote: > >>It's also a problem on the FreeBSD buildbot. I don't know enough about > >>the bundle2 code to understand how to fix it, but maybe we can figure > >>out a way to get marmoute an account on a machine taht would help him > >>diagnose? Danek, do you have a solaris

stable ordering of test output

I frequently get failures like this: --- .../mercurial.hg/tests/test-bundle2-exchange.t +++ .../mercurial.hg/tests/test-bundle2-exchange.t.err @@ -1042,11 +1042,11 @@ $ hg --config devel.legacy.exchange=bundle1 clone ssh://user@dummy/bundle2onlyserver not-bundle2-ssh

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Durham Goode wrote: > On 2/27/17 11:09 AM, Danek Duvall wrote: > >Durham Goode wrote: > > > >>On 2/24/17 4:10 PM, Danek Duvall wrote: > >> > >>>Is that the central issue? That is, you want to run a tool once over all > >>>unresolved f

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Durham Goode wrote: > On 2/24/17 4:10 PM, Danek Duvall wrote: > > >Is that the central issue? That is, you want to run a tool once over all > >unresolved files, rather than one at a time? > > > >It seems like perhaps a new config option for merge-tools could indi

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Durham Goode wrote: > > > On 2/24/17 3:25 PM, Jun Wu wrote: > >Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800: > >>On 2/23/17 2:57 PM, Jun Wu wrote: > >>>Congratulations on your first patch to the list! > >>> > >>>But I think we have better ways to achieve the same goal that

Re: [PATCH 1 of 8 ipv6] runtests: export HGIPV6 to hint test scripts whether to use IPv6

Jun Wu wrote: > With all the changes, it'll be easy to switch between v4 and v6 (by changing > "useipv6" in run-tests.py). I think we can add a new command line flag to > run-tests.py so people can choose whether they want to test v4 or v6. Or both? Would it be useful consider one to be primary

Re: [PATCH 1 of 8 ipv6] runtests: export HGIPV6 to hint test scripts whether to use IPv6

Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1487221422 28800 > # Wed Feb 15 21:03:42 2017 -0800 > # Node ID f2743873dfbd6adedcd3aa1777b651ce5bd6f6ed > # Parent a70e11929c63cd9245812f3db8091a449cd1273e > # Available At https://bitbucket.org/quark-zju/hg-draft

Re: [PATCH] merge: print status message before launching external merge tool

Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1486661545 28800 > # Thu Feb 09 09:32:25 2017 -0800 > # Node ID 93d94750f3abee5b9798c41160a2102c61936133 > # Parent

[PATCH STABLE] tests: account for different newline behavior between Solaris and GNU grep

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1485722456 28800 # Sun Jan 29 12:40:56 2017 -0800 # Branch stable # Node ID 24d82f28412d67323d13ac2b9f8c7c489c171ee0 # Parent 7bfe02b57695900ef996989286c1fdc2a13aec82 tests: account for different newline be

Re: [PATCH 3 of 3 V2] revset: add a changes(file, fromline, toline[, rev]) revset

Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1480086890 -3600 > # Fri Nov 25 16:14:50 2016 +0100 > # Node ID 5e5ec2ade2cfc829cffba145193da5801c5b20e7 > # Parent c8dfd10c5865cfe882a00595743f3f709f41317f > # EXP-Topic

Re: [PATCH] tests: make test-convert-git.t reproducible

Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1482601208 25200 > # Sat Dec 24 10:40:08 2016 -0700 > # Node ID ee1c5cef44af3163e95858f23730b6bd1d035595 > # Parent b2be4ccaff1d89356cbd9637aa9191e8048012b6 > tests: make test-convert-git.t

Re: [PATCH] convert: config option for git rename limit

I got this in my test run last night: --- .../tests/test-convert-git.t +++ .../tests/test-convert-git.t.err @@ -397,7 +397,7 @@ A bar-copy0 bar A bar-copy1 -bar +bar-copied2 Haven't tracked it down yet, but I thought I'd make a note in case it

Re: more symlink woes

Danek Duvall wrote: > I got this with last night's bits. I'm not sure what would be causing it, > though. What would be causing it is the remnants of a patch I had backing out one of the previous symlink changes. Clearing that up fixes everything. Sorry for the false alarm.

Re: more symlink woes

Augie Fackler wrote: > On Tue, Dec 6, 2016 at 12:35 PM, Danek Duvall <danek.duv...@oracle.com> wrote: > > I got this with last night's bits. I'm not sure what would be causing it, > > though. > > This on some flavor of Solaris? Yep. Danek > > > >

more symlink woes

I got this with last night's bits. I'm not sure what would be causing it, though. --- .../tests/test-symlink-os-yes-fs-no.py.out +++ .../tests/test-symlink-os-yes-fs-no.py.err @@ -5,6 +5,8 @@ added 1 changesets with 4 changes to 4 files updating to branch default 4

Re: [PATCH 1 of 2] tests: use cp -R instead of cp -r

Jun Wu wrote: > Excerpts from Danek Duvall's message of 2016-11-30 09:51:11 -0800: > > Jun Wu wrote: > > > > > # HG changeset patch > > > # User Jun Wu > > > # Date 1480526736 0 > > > # Wed Nov 30 17:25:36 2016 + > > > # Node ID a4f46a03e5f8e33f32c36326c6b14b84d9cb03b4 >

Re: [PATCH 1 of 2] tests: use cp -R instead of cp -r

Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1480526736 0 > # Wed Nov 30 17:25:36 2016 + > # Node ID a4f46a03e5f8e33f32c36326c6b14b84d9cb03b4 > # Parent 9e29d4e4e08b5996adda49cdd0b497d89e2b16ee > # Available At https://bitbucket.org/quark-zju/hg-draft > #

Re: [PATCH 5 of 5] posix: give checklink a fast path that cache the check file and is read only

Danek Duvall wrote: > I tried adding "delete=(cachedir is None)" (or the equivalent) to the > NamedTemporaryFile call, and that cleared up all the cp -r errors, but left > behind three tests failing due to the files left behind. At least two of > them are straightforward

Re: [PATCH 5 of 5] posix: give checklink a fast path that cache the check file and is read only

Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich > # Date 1421194526 -3600 > # Wed Jan 14 01:15:26 2015 +0100 > # Node ID 73b671fbed41d82a5dd46e485c61ddb8afe42faf > # Parent 5409e0c5e6c0764e802360a3912f7719885ba2b5 > posix: give checklink a fast path

Re: [PATCH] zstd: fix compilation with Solaris Studio

Gregory Szorc wrote: > > Cool. FWIW, the mercurial build didn't fail when I got this failure, which > > I found a bit surprising. I get the desire to make sure that the zstd > > support isn't critical, but if I hadn't known to go look for this, I would > > have missed it entirely until at some

Re: [PATCH] zstd: fix compilation with Solaris Studio

Gregory Szorc wrote: > On Tue, Nov 22, 2016 at 1:34 PM, <danek.duv...@oracle.com> wrote: > > > # HG changeset patch > > # User Danek Duvall <danek.duv...@oracle.com> > > # Date 1479850325 28800 > > # Tue Nov 22 13:32:05 2016 -0800 > > #

[PATCH] zstd: fix compilation with Solaris Studio

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1479850325 28800 # Tue Nov 22 13:32:05 2016 -0800 # Node ID b09fb7f66e9e680358b8fb359be24a14fd6b3cfb # Parent 8836f13e3c5b8eae765372708b659c55a044cbb4 zstd: fix compilation with Solaris Studio Without these c

Re: [PATCH STABLE] tests: run "cwd was removed" test only if cwd can actually be removed

Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1477489806 -32400 > # Wed Oct 26 22:50:06 2016 +0900 > # Branch stable > # Node ID d389b88b942adb330819437ef46d1b9acb4392d7 > # Parent b9f7b0c10027764cee77f9c6d61877fcffea837f > tests: run "cwd was

Re: [PATCH V5] update: warn if cwd was deleted

Stanislau Hlebik wrote: > diff --git a/tests/test-rebase-scenario-global.t > b/tests/test-rebase-scenario-global.t > --- a/tests/test-rebase-scenario-global.t > +++ b/tests/test-rebase-scenario-global.t > @@ -758,6 +758,8 @@ >$ hg commit -m 'second source with subdir' >$ hg rebase -b .

[PATCH] color: add some documentation for custom terminfo codes

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1476568874 25200 # Sat Oct 15 15:01:14 2016 -0700 # Node ID 42f5a2db9e7f9d66058a7d77bc8c0c263272a8de # Parent c59334b806a8f10c80c2ea196eba5f4b1b86b229 color: add some documentation for custom terminfo codes diff

Re: [PATCH 3 of 3] color: debugcolor should emit the user-defined colors

Yuya Nishihara wrote: > On Thu, 13 Oct 2016 13:27:35 -0700, danek.duv...@oracle.com wrote: > > # HG changeset patch > > # User Danek Duvall <danek.duv...@oracle.com> > > # Date 1476389401 25200 > > # Thu Oct 13 13:10:01 2016 -0700 > > # Node ID c

Re: [PATCH 1 of 3] color: allow for user-configurable terminfo codes for effects

Yuya Nishihara wrote: > On Thu, 13 Oct 2016 13:27:33 -0700, danek.duv...@oracle.com wrote: > > # HG changeset patch > > # User Danek Duvall <danek.duv...@oracle.com> > > # Date 1476384497 25200 > > # Thu Oct 13 11:48:17 2016 -0700 > > # Node ID 6

[PATCH 1 of 3] color: allow for user-configurable terminfo codes for effects

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1476384497 25200 # Thu Oct 13 11:48:17 2016 -0700 # Node ID 61e74a19770c2ce80c0cedc429915112261e5c1b # Parent 4d93d73b8aecb2436bbfe9248cdfe0ef21582baf color: allow for user-configurable terminfo codes for e

[PATCH 3 of 3] color: debugcolor should emit the user-defined colors

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1476389401 25200 # Thu Oct 13 13:10:01 2016 -0700 # Node ID c59334b806a8f10c80c2ea196eba5f4b1b86b229 # Parent 333e875ce30da3760c8655e303d9bea554efe7e4 color: debugcolor should emit the user-defined colors Thi

Re: [PATCH] color: replace "purple_background" by "magenta_background"

Pierre-Yves David wrote: > > > On 10/11/2016 11:39 AM, Denis Laxalde wrote: > ># HG changeset patch > ># User Denis Laxalde > ># Date 1476176128 -7200 > ># Tue Oct 11 10:55:28 2016 +0200 > ># Node ID 1cf20c1c54cb8172816604de5e1d98d3cd62d711 > ># Parent

[PATCH 2 of 3] color: ignore effects missing from terminfo

# HG changeset patch # User Danek Duvall <danek.duv...@oracle.com> # Date 1476385301 25200 # Thu Oct 13 12:01:41 2016 -0700 # Node ID 333e875ce30da3760c8655e303d9bea554efe7e4 # Parent 61e74a19770c2ce80c0cedc429915112261e5c1b color: ignore effects missing from terminfo If terminf

Re: [PATCH 2 of 3] test-gpg: start gpg-agent under control of the test runner

Yuya Nishihara wrote: > > I got an error here: > > > > --- test-gpg.t 2016-08-26 20:00:15.146215645 -0700 > > +++ test-gpg.t.err 2016-08-26 20:06:43.142508667 -0700 > > @@ -17,6 +17,8 @@ > > #if gpg2 > >$ gpg-connect-agent -q --subst /serverpid '/echo ${get