Re: Interest in integrating hg-git into Mercurial

2019-08-01 Thread Gregory Szorc
On Thu, Aug 1, 2019 at 10:38 AM Augie Fackler wrote: > > > > On Aug 1, 2019, at 13:01, Gregory Szorc wrote: > > > > Is there any interest in integrating hg-git (or hg-git functionality) > into the Mercurial distribution as an officially supported extension? > > > > Given the popularity of Git an

Re: Interest in integrating hg-git into Mercurial

2019-08-01 Thread Jordi GutiƩrrez Hermoso
On Thu, 2019-08-01 at 10:01 -0700, Gregory Szorc wrote: > Is there any interest in integrating hg-git (or hg-git > functionality) into the Mercurial distribution as an officially > supported extension? I know at least one person who was interested in using hg but was thwarted by hg-git and never a

D6705: relnotes: copy "next" to "5.1" and clear "next"

2019-08-01 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To avoid merge conflicts, we want to avoid modifying the file on multiple branches in parallel. This patch is therefore meant to be applied to the s

Re: [PATCH 3 of 3 STABLE] bookmarks: actual fix for race condition deleting bookmark

2019-08-01 Thread Augie Fackler
queued for stable, thanks > On Aug 1, 2019, at 13:55, Pierre-Yves David > wrote: > > # HG changeset patch > # User Pierre-Yves David > # Date 1561081840 -7200 > # Fri Jun 21 03:50:40 2019 +0200 > # Branch stable > # Node ID 56f34aeebffda197bacd77cc2345386d9dd1f073 > # Parent df77a77a8b17

D6704: config: add defaultvalue template keyword

2019-08-01 Thread navaneeth.suresh (Navaneeth Suresh)
Closed by commit rHG51a2e3102db2: config: add defaultvalue template keyword (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https:

D6440: fix: let fixer tools inherit hg's cwd so they can look at the working copy

2019-08-01 Thread hooper (Danny Hooper)
Closed by commit rHG74b4cd091e0d: fix: run fixer tools in the repo root as cwd so they can use the working copy (authored by hooper). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGE

D6440: fix: let fixer tools inherit hg's cwd so they can look at the working copy

2019-08-01 Thread durin42 (Augie Fackler)
durin42 added a comment. Queued with updated log message. Thanks! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6440/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6440 To: hooper, #hg-reviewers Cc: martinvonz, durin42, mercurial-devel __

D6704: config: add defaultvalue template keyword

2019-08-01 Thread durin42 (Augie Fackler)
durin42 added a comment. I like the feature, I'll go ahead and queue it with the str/bytestr thing fixed in flight. Thanks! INLINE COMMENTS > commands.py:1875 > value = pycompat.bytestr(value) > +defaultvalue = str(ui.configdefault(section, name)) > if fm.isplain():

D6522: tracing: add many more timedcm() calls throughout the codebase

2019-08-01 Thread durin42 (Augie Fackler)
durin42 updated this revision to Diff 16102. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6522?vs=15601&id=16102 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6522/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6522 AFFECTED FILES

D6659: graft: split graft code into seperate functions

2019-08-01 Thread durin42 (Augie Fackler)
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. I agree with Martin's request for changes here. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.

D6694: unshelve: delete shelvedstate after a successful unshelve --continue

2019-08-01 Thread durin42 (Augie Fackler)
This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. needs rebased REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6694/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6694 To: navan

[PATCH 3 of 3 STABLE] bookmarks: actual fix for race condition deleting bookmark

2019-08-01 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1561081840 -7200 # Fri Jun 21 03:50:40 2019 +0200 # Branch stable # Node ID 56f34aeebffda197bacd77cc2345386d9dd1f073 # Parent df77a77a8b1744d93de9823fb8ac2d5c5d8c07d8 # EXP-Topic debug-book # Available At https://bitbucket.org/octobus/merc

[PATCH 2 of 3 STABLE] strip: access bookmark before getting a reference to changelog

2019-08-01 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1564669367 -7200 # Thu Aug 01 16:22:47 2019 +0200 # Branch stable # Node ID df77a77a8b1744d93de9823fb8ac2d5c5d8c07d8 # Parent 309dee8dfbce8fb1b3e96535e167da107727c178 # EXP-Topic debug-book # Available At https://bitbucket.org/octobus/merc

[PATCH 1 of 3 STABLE] test: use a more verbose output in the test

2019-08-01 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1564667992 -7200 # Thu Aug 01 15:59:52 2019 +0200 # Branch stable # Node ID 309dee8dfbce8fb1b3e96535e167da107727c178 # Parent ce52377102dbeab2f1ad2cef533635574afbcbbc # EXP-Topic debug-book # Available At https://bitbucket.org/octobus/merc

D6704: config: add defaultvalue template keyword

2019-08-01 Thread navaneeth.suresh (Navaneeth Suresh)
navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch tries to fix one of the issues mentioned in issue6014. This adds a new `defaultvalue` template keyword to be used with `hg showconfig` to get

D6659: graft: split graft code into seperate functions

2019-08-01 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. I just found a comment I wrote a while ago and forgot to submit. Sorry. INLINE COMMENTS > cmdutil.py:3495-3508 > +def continuegraftstate(repo, graftstate, opts): > +"""updates opts based on the interrupted graftstate once > +'--continue' flag is called."""

Re: Interest in integrating hg-git into Mercurial

2019-08-01 Thread Augie Fackler
> On Aug 1, 2019, at 13:01, Gregory Szorc wrote: > > Is there any interest in integrating hg-git (or hg-git functionality) into > the Mercurial distribution as an officially supported extension? > > Given the popularity of Git and the difficulty of installing semi-complex > Python software l

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

2019-08-01 Thread Mercurial Commits
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/a218850cd52c changeset: 42664:a218850cd52c branch: stable parent: 42661:e91930d712e8 user:Augie Fackler date:Thu Aug 01 12:14:50 2019 -0400 summary: Added tag 5.1 for changeset e

Interest in integrating hg-git into Mercurial

2019-08-01 Thread Gregory Szorc
Is there any interest in integrating hg-git (or hg-git functionality) into the Mercurial distribution as an officially supported extension? Given the popularity of Git and the difficulty of installing semi-complex Python software like hg-git, I was thinking it would be beneficial to end-users for