[PATCH] httppeer: fix make_peer static - fixed for url-path argument. It has migrated to url-object, but legacy code passed just string
# HG changeset patch # User alexrayne # Date 1687465008 -10800 # Thu Jun 22 23:16:48 2023 +0300 # Node ID f0da5dd7a1d6274b62b7852dc05ac56b57381820 # Parent 68c4f8f3c9f43ae3773ed1dcfe7ed8cd0334bb27 httppeer: fix make_peer static - fixed for url-path argument. It has migrated to url-object, but legacy code passed just string diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py --- a/mercurial/httppeer.py +++ b/mercurial/httppeer.py @@ -663,8 +663,10 @@ return inst except error.RepoError as httpexception: try: -r = statichttprepo.make_peer(ui, b"static-" + path.loc, create) ui.note(_(b'(falling back to static-http)\n')) +# path.url.scheme = b"static-" + path.url.scheme; +spath = urlutil.path(ui, None, rawloc=b"static-"+path.rawloc, validate_path=False) +r = statichttprepo.make_peer(ui, spath, create) return r except error.RepoError: raise httpexception # use the original http RepoError instead ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6824] New: Provide a more meaningful context during conflicts.
https://bz.mercurial-scm.org/show_bug.cgi?id=6824
Bug ID: 6824
Summary: Provide a more meaningful context during conflicts.
Product: Mercurial
Version: unspecified
Hardware: PC
OS: All
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: jar...@jaraco.com
CC: mercurial-de...@mercurial-scm.org
Python Version: ---
We're finding that our users are consistently confused by the messaging when
resolving conflicts for binary files.
The message looks like this:
```
no tool found to merge file
file 'file' needs to be resolved.
You can keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved.
What do you want to do?
```
But in many contexts, the user is unaware of the internal implementation of a
particular command like "sync", which rebases changes, so "dest" and "source"
aren't intuitive.
On the other hand, if a merge tool is invoked, a helpful context is emitted
before the merge tool is run.
```
Running merge tool for foo ('some/tool'):
- local (working copy): 984e1e5d Appending a different byte tip
- base (common ancestor): 104fe963 Adding a binary file
-other (merge rev): 14655abc Appending another byte
```
The short hashes and commit messages provides a meaningful context to the user
to be able to rapidly choose a winner, independent of how the two parents were
ordered.
This feature proposes to provide that context prior to prompting the user to
resolve any conflicts.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@50722: 4 new changesets (4 on stable)
4 new changesets (4 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/9a4db474ef1a changeset: 50719:9a4db474ef1a branch: stable parent: 50717:41b9eb302d95 parent: 50718:0ab3956540a6 user:Raphaël Gomès date:Thu Jun 22 11:36:37 2023 +0200 summary: branching: merge default into stable for 6.5rc0 https://www.mercurial-scm.org/repo/hg/rev/bb42988c7e15 changeset: 50720:bb42988c7e15 branch: stable tag: 6.5rc0 user:Raphaël Gomès date:Thu Jun 22 12:36:49 2023 +0200 summary: relnotes: add 6.5rc0 https://www.mercurial-scm.org/repo/hg/rev/3455059a17aa changeset: 50721:3455059a17aa branch: stable user:Raphaël Gomès date:Thu Jun 22 14:24:21 2023 +0200 summary: Added tag 6.5rc0 for changeset bb42988c7e15 https://www.mercurial-scm.org/repo/hg/rev/42f761e97dec changeset: 50722:42f761e97dec branch: stable tag: tip user:Raphaël Gomès date:Thu Jun 22 14:24:45 2023 +0200 summary: Added signature for changeset bb42988c7e15 -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@50718: new changeset
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/0ab3956540a6 changeset: 50718:0ab3956540a6 tag: tip parent: 50714:e5c1e7aec973 parent: 50717:41b9eb302d95 user:Raphaël Gomès date:Thu Jun 22 11:28:17 2023 +0200 summary: branching: merge stable into default -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@50717: 3 new changesets (3 on stable)
3 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/271a4ab29605 changeset: 50715:271a4ab29605 branch: stable tag: 6.4.5 parent: 50694:e9c676ad18f1 user:Raphaël Gomès date:Thu Jun 22 11:17:40 2023 +0200 summary: relnotes: add 6.4.5 https://www.mercurial-scm.org/repo/hg/rev/841f36187347 changeset: 50716:841f36187347 branch: stable user:Raphaël Gomès date:Thu Jun 22 11:18:27 2023 +0200 summary: Added tag 6.4.5 for changeset 271a4ab29605 https://www.mercurial-scm.org/repo/hg/rev/41b9eb302d95 changeset: 50717:41b9eb302d95 branch: stable tag: tip user:Raphaël Gomès date:Thu Jun 22 11:18:47 2023 +0200 summary: Added signature for changeset 271a4ab29605 -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@50714: new changeset
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/e5c1e7aec973 changeset: 50714:e5c1e7aec973 tag: tip user:Jason R. Coombs date:Wed Jun 21 14:00:50 2023 -0400 summary: narrow: indicated the default of 'Yes' when confirming auto-remove-includes -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
