Evolve website documentation repo?
Is there a repo (or other mechanism) for updating the pages here? https://www.mercurial-scm.org/doc/evolution The front page looks like it was updated recently, but the other pages are about a year and a half old, still reference old vocabulary and temporary amend commits, etc. I don't mind taking a stab at it (though I don't know how the diagrams were generated). ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH STABLE] inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)
On Sat, 27 Apr 2019 00:25:45 -0400, Gregory Szorc wrote: On Fri, Apr 26, 2019 at 9:10 PM Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1556337169 14400 # Fri Apr 26 23:52:49 2019 -0400 # Branch stable # Node ID 723ed44028963db5a657578ac358acd07e546daa # Parent 14589f1989e91a455597cee754ae8587f3725394 inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043) Queued for stable, thanks. The Windows packaging code copied what was being done in the wild by current package maintainers, hence why keyring is present in the Inno installer but not WiX. We should definitely talk about consolidating behavior. To what I'm not sure: I'm not sure why various dependencies are included... I know I asked the Weeds2000 (who builds the macOS installer for TortoiseHg) to include this so that mercurial_keyring would work with `--config extensions.mercurial_keyring=/path/to/repo` type setups. (He went one further and bundled the extension too.) It seems that if it isn't installed into the bundled python, it isn't available to mercurial_keyring at all. I assume that's what's going on here. I haven't used the WiX installer in an environment where I need keyring, so IDK if it's broke. I use the thg installer than bundles it and the extension at work. (As an aside, I kinda wish we would bundle the extension with the installer, or even vendor it in hgext3rd. But it sounds like maintaining it is a bit of a pain.) ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH STABLE] inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)
On Fri, Apr 26, 2019 at 9:10 PM Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1556337169 14400 > # Fri Apr 26 23:52:49 2019 -0400 > # Branch stable > # Node ID 723ed44028963db5a657578ac358acd07e546daa > # Parent 14589f1989e91a455597cee754ae8587f3725394 > inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043) > Queued for stable, thanks. The Windows packaging code copied what was being done in the wild by current package maintainers, hence why keyring is present in the Inno installer but not WiX. We should definitely talk about consolidating behavior. To what I'm not sure: I'm not sure why various dependencies are included... > > The error seems to be harmless, because it happens after closing the > connection. > For whatever reason, this isn't bundled with the Wix installer. > > https://github.com/jaraco/keyring/issues/386 > > https://bitbucket.org/Mekk/mercurial_keyring/issues/63/attributeerror-during-process-finish-with > > diff --git a/contrib/packaging/inno/requirements.txt > b/contrib/packaging/inno/requirements.txt > --- a/contrib/packaging/inno/requirements.txt > +++ b/contrib/packaging/inno/requirements.txt > @@ -22,9 +22,9 @@ entrypoints==0.3 \ > > > --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 > \ > > > --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 > \ > # via keyring > -keyring==18.0.0 \ > - > --hash=sha256:12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d > \ > - > --hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c > +keyring==18.0.1 \ > + > --hash=sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838 > \ > + > --hash=sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6 > pygments==2.3.1 \ > > > --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a > \ > > > --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d > ___ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH STABLE] inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043)
# HG changeset patch # User Matt Harbison # Date 1556337169 14400 # Fri Apr 26 23:52:49 2019 -0400 # Branch stable # Node ID 723ed44028963db5a657578ac358acd07e546daa # Parent 14589f1989e91a455597cee754ae8587f3725394 inno: bump keyring to 18.0.1 to avoid AttributeError (issue6043) The error seems to be harmless, because it happens after closing the connection. For whatever reason, this isn't bundled with the Wix installer. https://github.com/jaraco/keyring/issues/386 https://bitbucket.org/Mekk/mercurial_keyring/issues/63/attributeerror-during-process-finish-with diff --git a/contrib/packaging/inno/requirements.txt b/contrib/packaging/inno/requirements.txt --- a/contrib/packaging/inno/requirements.txt +++ b/contrib/packaging/inno/requirements.txt @@ -22,9 +22,9 @@ entrypoints==0.3 \ --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 \ --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 \ # via keyring -keyring==18.0.0 \ - --hash=sha256:12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d \ - --hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c +keyring==18.0.1 \ + --hash=sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838 \ + --hash=sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6 pygments==2.3.1 \ --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a \ --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6313: remotefilelog: add missing argument to hg.verify wrapper
hooper created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6313 AFFECTED FILES hgext/remotefilelog/__init__.py CHANGE DETAILS diff --git a/hgext/remotefilelog/__init__.py b/hgext/remotefilelog/__init__.py --- a/hgext/remotefilelog/__init__.py +++ b/hgext/remotefilelog/__init__.py @@ -653,7 +653,7 @@ # Prevent verify from processing files # a stub for mercurial.hg.verify() -def _verify(orig, repo): +def _verify(orig, repo, level=None): lock = repo.lock() try: return shallowverifier.shallowverifier(repo).verify() To: hooper, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH 1 of 5 "] updatecaches: also warm revbranchcache for filtered revisions
On 3/11/19 11:30 PM, Pulkit Goyal wrote: On Mon, Mar 11, 2019 at 2:54 PM Pierre-Yves David mailto:pierre-yves.da...@ens-lyon.org>> wrote: # HG changeset patch # User Pierre-Yves David mailto:pierre-yves.da...@octobus.net>> # Date 1552267941 -3600 # Mon Mar 11 02:32:21 2019 +0100 # Node ID c081522ea066709de26be0b61c5553f095b1fd6d # Parent e82c932c01e30121a10580e5caaeca78fec34008 # EXP-Topic fnodecache # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r c081522ea066 updatecaches: also warm revbranchcache for filtered revisions We are in the "full" case, so we better warm everything we can. Queued 1 and 2. Many thanks! I don't see patch 1 and 2 in the main mercurial repository. Did anything happened to them ? Also: what about Patches 3-5 ? -- Pierre-Yves David ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6312: branchcache: update the filteredhash if we update the tiprev
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We update the tiprev and in next if statement we check whether the branchcache is valid or not. If the update of tiprev happens, then definitely self.validfor() will return False because filteredhash is old now. Let's update the filteredhash if we update the tiprev also. This prevents us from entering the loop where we iter all the heads, and find the tiprev. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6312 AFFECTED FILES mercurial/branchmap.py CHANGE DETAILS diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -411,6 +411,7 @@ if ntiprev > self.tiprev: self.tiprev = ntiprev self.tipnode = cl.node(ntiprev) +self.filteredhash = scmutil.filteredhash(repo, self.tiprev) if not self.validfor(repo): # cache key are not valid anymore To: pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6311: branchcache: store the maximum tip in a variable inside for loop
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Instead of assigning self.tiprev multiple times in the for loop, and calling cl.node() on it, let's store that in a temporary variable and assign it in the end of loop. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6311 AFFECTED FILES mercurial/branchmap.py CHANGE DETAILS diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -378,6 +378,10 @@ # fetch current topological heads to speed up filtering topoheads = set(cl.headrevs()) +# new tip revision which we found after iterating items from new +# branches +ntiprev = self.tiprev + # if older branchheads are reachable from new ones, they aren't # really branchheads. Note checking parents is insufficient: # 1 (branch a) -> 2 (branch b) -> 3 (branch a) @@ -401,9 +405,12 @@ bheadrevs = sorted(bheadset) self[branch] = [cl.node(rev) for rev in bheadrevs] tiprev = bheadrevs[-1] -if tiprev > self.tiprev: -self.tipnode = cl.node(tiprev) -self.tiprev = tiprev +if tiprev > ntiprev: +ntiprev = tiprev + +if ntiprev > self.tiprev: +self.tiprev = ntiprev +self.tipnode = cl.node(ntiprev) if not self.validfor(repo): # cache key are not valid anymore To: pulkit, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in narrowbundle2.py:34 > I am not sure if we want to do that. @martinvonz do we? Would make sense to me. "narrowhg" was the name of the extension. We changed most places to "narrow" when we moved it into core. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6310 To: pulkit, durin42, martinvonz, #hg-reviewers Cc: indygreg, idlsoft, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)
pulkit added inline comments. INLINE COMMENTS > idlsoft wrote in narrowbundle2.py:34 > If we plan to change this to `narrowacl` at some point, perhaps now is the > time, since it's a major version change. I am not sure if we want to do that. @martinvonz do we? > idlsoft wrote in narrowbundle2.py:36 > I thought this would have an uppercase letter to make it mandatory? It's only required when we add the part to bundle2. See changes in exchange.py below. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6310 To: pulkit, durin42, martinvonz, #hg-reviewers Cc: indygreg, idlsoft, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@42203: 10 new changesets
10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/0da689a60163 changeset: 42194:0da689a60163 parent: 42190:7c0ece3cd3ee user:Danny Hooper date:Thu Mar 21 18:32:45 2019 -0700 summary: fix: allow fixer tools to return metadata in addition to the file content https://www.mercurial-scm.org/repo/hg/rev/7edff8dd46a7 changeset: 42195:7edff8dd46a7 user:Martin von Zweigbergk date:Tue Apr 23 08:39:26 2019 -0700 summary: match: remove unused match.__iter__ implementation (API) https://www.mercurial-scm.org/repo/hg/rev/94e2f8437f6b changeset: 42196:94e2f8437f6b user:Joerg Sonnenberger date:Fri Apr 19 20:06:37 2019 +0200 summary: unionrepo: sync with repository API https://www.mercurial-scm.org/repo/hg/rev/c96507f6875c changeset: 42197:c96507f6875c user:Martin von Zweigbergk date:Wed Apr 24 10:47:40 2019 -0700 summary: tests: demonstrate `hg log -r . ` linkrev bug https://www.mercurial-scm.org/repo/hg/rev/d49ab47be8a6 changeset: 42198:d49ab47be8a6 user:Ian Moody date:Sat Apr 20 16:01:47 2019 +0100 summary: phabricator: include branch in the diffproperty metadata https://www.mercurial-scm.org/repo/hg/rev/6dd454e5b123 changeset: 42199:6dd454e5b123 user:Ian Moody date:Sat Apr 20 17:22:35 2019 +0100 summary: phabricator: don't assume the existence of properties of local:commits https://www.mercurial-scm.org/repo/hg/rev/c4d96f4761d3 changeset: 42200:c4d96f4761d3 user:Ian Moody date:Sat Apr 20 17:27:24 2019 +0100 summary: phabricator: read more metadata from local:commits https://www.mercurial-scm.org/repo/hg/rev/258821f2d465 changeset: 42201:258821f2d465 user:Sushil khanchi date:Tue Apr 16 01:19:58 2019 +0530 summary: branch: add tests which shows branch can be closed from a non-branchhead cset https://www.mercurial-scm.org/repo/hg/rev/8d14d91584f1 changeset: 42202:8d14d91584f1 user:Sushil khanchi date:Tue Apr 16 02:06:20 2019 +0530 summary: branch: abort if closing branch from a non-branchhead cset https://www.mercurial-scm.org/repo/hg/rev/5997eabc7b85 changeset: 42203:5997eabc7b85 bookmark:@ tag: tip user:Taapas Agrawal date:Fri Mar 01 05:56:18 2019 +0530 summary: push: added clear warning message when pushing closed branches(issue6080) -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D6282: branch: abort if closing branch from a non-branchhead cset
On 4/19/19 9:49 AM, khanchi97 (Sushil khanchi) wrote:
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch make sure that we abort if the user is trying to
close a branch from a cset which is not a branch head.
Changes in test file reflect the fixed behaviour.
Is there a way to override this ? There can be situation where the
changeset is not a local head but could be a remote head.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6282
AFFECTED FILES
mercurial/commands.py
tests/test-branches.t
CHANGE DETAILS
diff --git a/tests/test-branches.t b/tests/test-branches.t
--- a/tests/test-branches.t
+++ b/tests/test-branches.t
@@ -956,19 +956,16 @@
trying to close branch from a cset which is not a branch head
it should abort:
-XXX: it should have aborted here
$ hg ci -m "closing branch" --close-branch
- created new head
+ abort: can only close branch heads
+ [255]
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -GT "{rev}: {node|short} {desc|firstline}\n\t{branch}\n\n"
- _ 3: 006876ddd20e closing branch
+ o 2: 155349b645be added c
| default
|
- | o 2: 155349b645be added c
- |/ default
- |
o 1: 5f6d8a4bf34a added b
| default
|
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1675,6 +1675,8 @@
if not bheads:
raise error.Abort(_('can only close branch heads'))
+elif branch == repo['.'].branch() and repo['.'].node() not in bheads:
+raise error.Abort(_('can only close branch heads'))
elif opts.get('amend'):
if (repo['.'].p1().branch() != branch and
repo['.'].p2().branch() != branch):
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
--
Pierre-Yves David
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
