Re: Mercurial only supports encoded strings

Halcón at Tuta.io via Mercurial writes: > I found the thread "Is mercurial ready for Python 3?" > > So, hgweb is not yet ready for python 3? > > If I prepend 'b' to make the 'faulty' string a bytes object, as said Detlev > Offenbach in that thread [1], I get > TypeError: 'bytes' object is

mercurial@45273: 3 new changesets (3 on stable)

3 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/7fc3c5fbc65f changeset: 45271:7fc3c5fbc65f branch: stable tag: 5.5 parent: 45253:9b5723784aac user:Pulkit Goyal <7895pul...@gmail.com> date:Sat Aug 01 18:39:28 2020 +0530

Re: dulwich on Windows 7 (not)

On Mon, Aug 3, 2020 at 2:21 PM Ernie Rael wrote: > > To clarify. On windows, the only place that hg will find dulwich is > %APPDATA%/Python/Python27/site-packages. > > Neither global site-packages nor PYTHONUSERBASE, nor some randomly > specified location (e.g. through environment variable) can

Re: Mercurial only supports encoded strings

I found the thread "Is mercurial ready for Python 3?" So, hgweb is not yet ready for python 3? If I prepend 'b' to make the 'faulty' string a bytes object, as said Detlev Offenbach in that thread [1], I get TypeError: 'bytes' object is not callable Changing my /var/hg/hgweb_uwsgi.py to the

Re: GUI diff/merge tool?

On 01/08/2020 18:29, Victor Sudakov wrote: What graphical merge/diff tool are you using with Mercurial under Linux/FreeBSD? I'm especially interested in a graphical diff tool. I've tried Kdiff3 and Meld, but have not found a mode to display only differences (like the CLI diff tools does).

Re: Mercurial only supports encoded strings

Aug 4, 2020, 01:40 by hal...@tuta.io: >   File "./hgweb_uwsgi.py", line 7, in >     application = hgweb(config) > In that code that I posted, it's line 6. I removed an empty line while posting. -- Best regards, halcón ___ Mercurial mailing list

Mercurial only supports encoded strings

Hi, I need help in moving my hgweb installation from flup to uwsgi. I have these files: /var/hg/hgweb.python.ini [uwsgi] chdir = /var/hg module = hgweb_uwsgi:application plugins-dir = /usr/lib64/uwsgi/ plugins = python37 /var/hg/hgweb_uwsgi.py #!/usr/bin/python3.7 config =

Re: dulwich on Windows 7 (not)

To clarify. On windows, the only place that hg will find dulwich is %APPDATA%/Python/Python27/site-packages. Neither global site-packages nor PYTHONUSERBASE, nor some randomly specified location (e.g. through environment variable) can be used; I've tried the first two. My "C drive" is

mercurial@45270: 19 new changesets (2 on stable)

19 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/20d110e6eea6 changeset: 45252:20d110e6eea6 branch: stable parent: 45240:53a6febafc66 user:Gregory Szorc date:Sun Jul 26 12:46:04 2020 -0700 summary: clonebundles: document

Mercurial 5.5 tagged.

Please update your package builds, thanks. ___ Mercurial-packaging mailing list Mercurial-packaging@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-packaging

Re: [PATCH] mergestate: fix BC breakage introduced because of removal of a merge record

queued for stable, thanks > On Aug 1, 2020, at 09:09, Pulkit Goyal <7895pul...@gmail.com> wrote: > > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1596287368 -19800 > # Sat Aug 01 18:39:28 2020 +0530 > # Branch stable > # Node ID

Evolve 10.0.1 released

We pushed a new release for the evolve extension: 10.0.1. As usual, the release is available on PyPI and upgrade is recommended. This version introduces support for Mercurial 5.5 and comes with a variety of improvements and bugfixes. Check the changelog for details. The most notable change is:

Re: Website: add a blog?

On Mon, Aug 3, 2020 at 9:23 PM Raphaël Gomès wrote: > > > On 03/08/2020 17:39, Augie Fackler wrote: > > Oh, and if we wanted to take this as an opportunity to try and move to a > > more common static-site-generator rather than a custom flask app, I'd be in > > favor of that too... ;) > + 1 > >>

Re: GUI diff/merge tool?

On Sat, Aug 1, 2020 at 7:31 PM Victor Sudakov wrote: > > Dear Colleagues, > > What graphical merge/diff tool are you using with Mercurial under > Linux/FreeBSD? > > I'm especially interested in a graphical diff tool. I've tried Kdiff3 > and Meld, but have not found a mode to display only

Re: GUI diff/merge tool?

I use DiffMerge https://sourcegear.com/diffmerge/ on all three platforms. (I find kdiff3 to have an extremely poor/confusing UI. Whenever I’m on a system where it pops up to handle a merge I just abort as I can’t tell what the heck it is doing.) > On Aug 3,

Re: Website: add a blog?

On 03/08/2020 17:39, Augie Fackler wrote: Oh, and if we wanted to take this as an opportunity to try and move to a more common static-site-generator rather than a custom flask app, I'd be in favor of that too... ;) + 1 On Aug 3, 2020, at 11:37, Augie Fackler wrote: Howdy folks, I've been

Re: Website: add a blog?

Oh, and if we wanted to take this as an opportunity to try and move to a more common static-site-generator rather than a custom flask app, I'd be in favor of that too... ;) > On Aug 3, 2020, at 11:37, Augie Fackler wrote: > > Howdy folks, > > I've been (slowly) working with conservancy on

Website: add a blog?

Howdy folks, I've been (slowly) working with conservancy on some various things, and one thing they suggested that I agree with is that we should probably have some kind of dev-blog on mercurial-scm.org where we can talk about neat things in Mercurial etc. I'm happy to write for it, but I lack

D8872: rhg: make output of `files` relative to the current directory and the root

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This matches the behavior of `hg files`. The util is added in `hg-core` instead of `rhg` because this operation could be useful for other external tools. (this

D8873: rhg: add harness tests for rhg files

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8873 AFFECTED FILES tests/test-rhg.t CHANGE DETAILS diff --git a/tests/test-rhg.t

D8868: rhg: add a `Files` `Command` to prepare the `rhg files` subcommand

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8868 AFFECTED FILES rust/hg-core/src/lib.rs rust/rhg/src/commands.rs

D8871: rhg: handle broken pipe error for stderr

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8871 AFFECTED FILES rust/rhg/src/ui.rs CHANGE DETAILS diff --git

D8870: rhg: extract function handle_stdout_error

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Avoid repeating the logic of handling stdout write errors. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8870

D8865: rhg: ask the error message from `CommandError`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Avoid repeating the display of the same error messages in different commands. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8869: rhg: add a limited `rhg files` subcommand

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8869 AFFECTED FILES rust/rhg/src/main.rs CHANGE DETAILS diff --git

D8867: rhg: simply `FindRootError` handling

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8867 AFFECTED FILES rust/rhg/src/commands/root.rs rust/rhg/src/error.rs CHANGE

D8862: hg-core: remove the `Operation` trait

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There is no way to currently define a trait which can both return references to `self` and to passed data, which is what we would need. Generic Associated

D8866: rhg: add buffered stdout writing possibility

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Improve batch stdout writing performance. At some point line buffered output should be introduced. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D8864: rhg: Do not return error when when we really mean ok in commands

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Before when a command was successfull `Err(CommandErrorKind::Ok.into())` was returned which is an oxymoron. Using `Ok(())` when everything is ok seems more

D8863: hg-core: define a `ListTrackedFiles` `Operation`

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY List files under Mercurial control in the working directory. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8863

D8861: hg-core: make parse_dirstate return references rather than update hashmaps

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Returing a vec is faster than updating a hashmap when the hashmap is not needed like in `hg files` which just list tracked files. Returning references

Re: GUI diff/merge tool?

On 01/08/2020 19.29, Victor Sudakov wrote: What graphical merge/diff tool are you using with Mercurial under Linux/FreeBSD? Emacs + Ediff ___ Mercurial mailing list Mercurial@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial

D8860: rhg: add harness tests for rhg files

acezar created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8860 AFFECTED FILES tests/test-rhg.t CHANGE DETAILS diff --git a/tests/test-rhg.t

Re: GUI diff/merge tool?

> What graphical merge/diff tool are you using with Mercurial under > Linux/FreeBSD? I use kdiff3, and I am happy with it (except some unncessary popups). IMHO this is right approach – simultaneous access to common base, both merged versions, and final output. It also happens to be smarter than

Re: update https://www.mercurial-scm.org/wiki/DeveloperRepos | bitbucket?

>>> "AF" == Augie Fackler writes: > The only thing that was on bitbucket was the i18n repository, which > hasn't seen traffic in years. If someone wants to drive the i18n > effort again I'm happy to set up a new repo for that on > mercurial-scm.org, but for now there's no replacement planned.