D8976: registrar: fix a documentation typo

2020-09-01 Thread mharbison72 (Matt Harbison)
mharbison72 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/D8976 AFFECTED FILES mercurial/registrar.py CHANGE DETAILS diff --git

Re: [PATCH stable] tests: fix test-demandimport.py on Python 3.9

2020-09-01 Thread Augie Fackler
queued for stable, thanks > On Sep 1, 2020, at 19:32, Manuel Jacob wrote: > > # HG changeset patch > # User Manuel Jacob > # Date 1599003056 -7200 > # Wed Sep 02 01:30:56 2020 +0200 > # Branch stable > # Node ID 386d7621b725560face484f963f2a96fead521d3 > # Parent

[PATCH stable] tests: fix test-demandimport.py on Python 3.9

2020-09-01 Thread Manuel Jacob
# HG changeset patch # User Manuel Jacob # Date 1599003056 -7200 # Wed Sep 02 01:30:56 2020 +0200 # Branch stable # Node ID 386d7621b725560face484f963f2a96fead521d3 # Parent 42202492a3b9aed0b2810560dfae1feb56a8bea4 # EXP-Topic python3.9 tests: fix test-demandimport.py on Python 3.9

RE: hg revert fails?

2020-09-01 Thread Becker, Mischa J
> -Original Message- > From: Uwe Brauer > Sent: Tuesday, September 1, 2020 9:19 AM > Subject: Re: hg revert fails? > > >>> "MK" == Marcin Kasperski writes: > > > Malcolm Matalka writes: > >> > hg revert foo.txt -r 2 > >> > foo.txt: no such file in rev 959ff53f09d5 > > >> There is no

[Bug 6401] New: Add Python 3.9 to Python version options

2020-09-01 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6401 Bug ID: 6401 Summary: Add Python 3.9 to Python version options Product: Mercurial project Version: unspecified Hardware: All OS: All Status: UNCONFIRMED

Re: hg revert fails?

2020-09-01 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: > Malcolm Matalka writes: >> > hg revert foo.txt -r 2 >> > foo.txt: no such file in rev 959ff53f09d5 >> There is no foo.txt in the uwe branch. > Funny. > Untested, but my bet is that >hg cat -r 2 foo.txt > foo.txt > should work You are not going to

Re: Installing extensions on Windows

2020-09-01 Thread Marcin Kasperski
For simple single-file extensions it usually works to `pip install` them using your own python, then enable extension giving full path to the installed file. Some more complicated support similar tricks¹. I am not sure about evolve but one can try. ¹ For my extensions (and some general

Re: hg revert fails?

2020-09-01 Thread Marcin Kasperski
Malcolm Matalka writes: > > hg revert foo.txt -r 2 > > foo.txt: no such file in rev 959ff53f09d5 > There is no foo.txt in the uwe branch. Funny. Untested, but my bet is that hg cat -r 2 foo.txt > foo.txt should work ___ Mercurial mailing list

D8975: genosxversion: don't give up if we can't find a path to hg libraries

2020-09-01 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This doesn't work if you have a PyOxidized hg on $PATH, but everything is fine if you just ignore that problem. REPOSITORY rHG Mercurial BRANCH stable

mercurial@45394: 2 new changesets (2 on stable)

2020-09-01 Thread Mercurial Commits
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ce131084c976 changeset: 45393:ce131084c976 branch: stable parent: 45389:f62bb5d07848 user:Pulkit Goyal <7895pul...@gmail.com> date:Tue Sep 01 16:27:18 2020 +0530 summary: Added

[PATCH 3 of 3] extdiff: move single file handling inside `not per-file` conditional

2020-09-01 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691918 -19800 # Sat Aug 29 14:35:18 2020 +0530 # Node ID c1f593d4d608fe9180c3e7b2c4cb8eb179d1c468 # Parent 28e81de5f83624341454eea6ef5973cd7db10675 # EXP-Topic extdiff-refactor extdiff: move single file handling

[PATCH 2 of 3] extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()

2020-09-01 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691746 -19800 # Sat Aug 29 14:32:26 2020 +0530 # Node ID 28e81de5f83624341454eea6ef5973cd7db10675 # Parent e49d6016a24ce0ead59e32db68489de6c18c779d # EXP-Topic extdiff-refactor extdiff: remove dir2root and pass full

[PATCH 1 of 3] extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`

2020-09-01 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1598691514 -19800 # Sat Aug 29 14:28:34 2020 +0530 # Node ID e49d6016a24ce0ead59e32db68489de6c18c779d # Parent c25efc468a4939682031d2a16a3c897cf59f0fb9 # EXP-Topic extdiff-refactor extdiff: pass full paths of `dir1a` and

D8974: merge: add `ACTION_KEEP_DELETED` to represent files we want to keep deleted

2020-09-01 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY There are files which were deleted/not present in working copy parent but were present on other side of merge. On merge, we might decide to keep them deleted.