[Bug 6076] New: Merge driver needs documentation

https://bz.mercurial-scm.org/show_bug.cgi?id=6076 Bug ID: 6076 Summary: Merge driver needs documentation Product: Mercurial Version: 4.8 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

Re: Google Summer of Code 2019.

We have two mentors right now. It will be great if we can have 2 more mentors so that each student has 2 different mentors. This time project ideas are nice and involves good amount of work. So having more mentors will help. Let me know if you want to help a student contribute to open source and

Re: Google Summer of Code 2019.

Thanks Sangeet and Sushil for stepping up and offering to help. It's great to see a kind of culture being developed where old summer of code students mentor new ones. On Wed, Feb 6, 2019 at 12:14 AM Sushil Khanchi wrote: > Hi, > > As I was Google Summer of Code student last year I know how much

D5941: config.txt: Add better documentation for ui.tweakdefault(issue6000)***config.txt: Add better documentation for ui.tweakdefault(issue6000)

akshjain.jain74 updated this revision to Diff 14038. akshjain.jain74 retitled this revision from "config.txt: Add better documentation for ui.tweakdefault (issue6000)" to "config.txt: Add better documentation for ui.tweakdefault (issue6000) *** config.txt: Add better documentation for

D5941: config.txt: Add better documentation for ui.tweakdefault(issue6000)

akshjain.jain74 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/D5941 AFFECTED FILES mercurial/help/config.txt CHANGE DETAILS diff --git

D5940: uncommit: add -f/--force when possibly hiding data (issue5977)

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The behaviour of uncommit may confuse a new user. Although it never destroys the data, it can hide instead. I added a `-f/--force` flag when the

Re: Auto-formatting with yapf (was: Re: Auto-formatting code with black - object now if you have a strong opinion)

> On Feb 11, 2019, at 13:21, Gregory Szorc wrote: > > I'm reviving this thread because I want us to commit to something. > > I *really* want us to mass reformat the repo, mainly so we can make the > source code Python 3 native (so we can do away with our custom source > transforming module

Re: Auto-formatting with yapf (was: Re: Auto-formatting code with black - object now if you have a strong opinion)

I'm reviving this thread because I want us to commit to something. I *really* want us to mass reformat the repo, mainly so we can make the source code Python 3 native (so we can do away with our custom source transforming module importer) ASAP. I'm not sure if it has been proposed yet, but have

D5936: addremove: respect ui.relative-paths

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I previously changed these code paths while trying to not change any behavior to avoid inconsistencies between them in the intermediate commits. They're now

D5938: resolve: slightly simplify join expression by joining with empty strings

martinvonz 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/D5938 AFFECTED FILES mercurial/commands.py CHANGE DETAILS diff --git a/mercurial/commands.py

D5937: resolve: respect ui.relative-paths also for warning messages

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I guess this should have been part of https://phab.mercurial-scm.org/rHG72a9aacff645ae286c56a4cee325579cacd37855 (resolve: respect ui.relative-paths,

D5939: commit: respect ui.relative-paths

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The command usually doesn't print any paths, but there are some warnings and verbose messages that includes paths. REPOSITORY rHG Mercurial REVISION DETAIL

D5935: windows: use util.localpath for repo-relative paths in getuipathfn()

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now that we have a single place that translates from internal path representation (slash-separated) to UI representation (i.e. scmutil.getuipathfn()), let's

D5907: copy: respect ui.relative-paths in copy/rename

martinvonz added a comment. In https://phab.mercurial-scm.org/D5907#86706, @yuja wrote: > > `getuipathfn()` uses `repo.pathto()` when a relative path was requested (including by setting `legacyrelativevalue=True` or `forcerelativevalue=True`), so I think there shouldn't be much change

D5934: phabricator: make user searches case-insensitive

jcristau created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY User names in conduit are case insensitive, but when looking for "FOO" it would return "foo" instead and we'd think the user didn't exist. So lower case both

D5813: revset: add expect to check the size of a set

navaneeth.suresh updated this revision to Diff 14029. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5813?vs=14013=14029 REVISION DETAIL https://phab.mercurial-scm.org/D5813 AFFECTED FILES mercurial/revset.py tests/test-revset.t CHANGE DETAILS

D5930: match: delete unused root and cwd arguments from {always, never, exact}() (API)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0531dff73d0b: match: delete unused root and cwd arguments from {always,never,exact}() (API) (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5929: match: delete unused root and cwd arguments to constructors (API)

This revision was automatically updated to reflect the committed changes. Closed by commit rHGddbebce94665: match: delete unused root and cwd arguments to constructors (API) (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5932: branchmap: decode a label only once

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9d0d8793e847: branchmap: decode a label only once (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5932?vs=14022=14028

D5931: branchmap: move __init__ up in branchcache class

This revision was automatically updated to reflect the committed changes. Closed by commit rHGbfc49f1df615: branchmap: move __init__ up in branchcache class (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5928: dirstate: call and cache os.getcwd() in constructor

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe178b131906a: dirstate: call and cache os.getcwd() in constructor (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5907: copy: respect ui.relative-paths in copy/rename

yuja added a comment. > `getuipathfn()` uses `repo.pathto()` when a relative path was requested (including by setting `legacyrelativevalue=True` or `forcerelativevalue=True`), so I think there shouldn't be much change in behavior with that commit. But the default of `hg status` is

Re: D5907: copy: respect ui.relative-paths in copy/rename

> `getuipathfn()` uses `repo.pathto()` when a relative path was requested > (including by setting `legacyrelativevalue=True` or > `forcerelativevalue=True`), so I think there shouldn't be much change in > behavior with that commit. But the default of `hg status` is `relative=False`, so the

D5813: revset: add expect to check the size of a set

yuja added a comment. > nit-pick is resolved. `getintrange()` will throw a `ParseError` on setting size to one of `min:`, `:max` or `:`. In ideal case, on calling from `expectsize()` it shouldn't fail. So you need to pass in the default min/max values to `getintrange()`. The default

Re: D5813: revset: add expect to check the size of a set

> nit-pick is resolved. `getintrange()` will throw a `ParseError` on setting > size to one of `min:`, `:max` or `:`. In ideal case, on calling from > `expectsize()` it shouldn't fail. So you need to pass in the default min/max values to `getintrange()`. The default min can be just `0`. The

D5933: branchmap: improve doc about BranchMapCache class

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It was confusing that we are having two different branchcache and BranchMapCache classes. The doc in BranchMapCache class was not much helpful to understand the

D5932: branchmap: decode a label only once

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This moves decoding of a label out of for loop. Minor speed up expected in cases when one branch has multiple heads. For example: someone using bookmarks as

D5931: branchmap: move __init__ up in branchcache class

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Making __init__ the first function defined helps understanding the class much better. REPOSITORY rHG Mercurial REVISION DETAIL

mercurial@41653: 8 new changesets

8 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d4c9eebdd72d changeset: 41646:d4c9eebdd72d user:Martin von Zweigbergk date:Wed Feb 06 23:12:56 2019 -0800 summary: patch: replace "prefix" and "relroot" arguments by "pathfn" (API)

D5927: cleanup: prefer matchmod.{always, never}() over accessing matchers directly

This revision was automatically updated to reflect the committed changes. Closed by commit rHG1db5ae4b0dda: cleanup: prefer matchmod.{always,never}() over accessing matchers directly (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5926: match: allow passing in badfn to always() and never()

This revision was automatically updated to reflect the committed changes. Closed by commit rHGc302218a2528: match: allow passing in badfn to always() and never() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE