In D5586#82915, @indygreg wrote:

This new config knob defaults to off and we're therefore changing the behavior to not warn when watchman is unavailable. This is a bit concerning to me because someone could have fsmonitor enabled and I don't think they'd ever get an error if watchman isn't working correctly.

I support introducing the config knob. But I don't like silently suppressing watchman errors that could lead to false user expectations.

Nice! Let's install docutils on Python 3 on buildbot too.

This one does not apply anymore on tip of default branch.

It's weird that print works as a function too in Python 2.

In D5599#82802, @pulkit wrote:

Let's use pycompat.queue() for consistency.

Let's use pycompat.queue() for consistency.

In D5531#82608, @martinvonz wrote:

Btw, I've sent a patch for evolve: https://bitbucket.org/octobus/evolve-devel/commits/3e07c1eea61d2fe6bc80d75d0062d34e53b40577. Other extension authors should be able to copy that.

This one removes clearbackup() while restorebackup() and savebackup() are still there. Does that means that we are sure that we won't need to manually clear the backup from store?

Sorry for bumping on this now, can you add tests for this as follow-up?

If you couldn't follow those steps, you can simply check the diffs here:

test's diff: https://pastebin.com/Z4LRg4vx
diff used by hg diff: https://pastebin.com/qanQEsiA

In D5495#81562, @yuja wrote:

+@predicate('merge(*withbranch)', safe=True)

def merge(repo, subset, x):

• """Changeset is a merge changeset. + """Changeset is a merge changeset + + All merge revisions are returned by default. If one or more "withbranch" + names are provided only merges with those branches (i.e. whose + second parent belongs to one of those branches) will be returned.

I understand this will be useful in a certain branch strategy, but the
proposed syntax is hardly extensible. Maybe it can be a non-wildcard argument
of stringmatcher type so we can at least add another option later.

Any thoughts? Do anyone love this feature?

Thanks for the quick follow-up. Yuya did it better and I pushed his patches which can be found at https://www.mercurial-scm.org/repo/hg-committed/rev/b153a4aa06f8 and https://www.mercurial-scm.org/repo/hg-committed/rev/cffa8e0ba77a. This one can be abandoned.

Ping for review!

Queueing this, many thanks!

Is this meant for stable?

Nice work! Can you update description of this patch with details in commit message about behavior of the new config option and how it solves the given issue?

I am not sure whether this change is correct or not, but please add more description to your commit message explaining what this patch is doing, what the issue is about and how it fixes that.

In D5491#81291, @taapas1128 wrote:

no the date is updated in 2560. So below that it wont work

Nice! I left an inline comment.

The patch is going in a good direction. We now need to make sure that we don't amend if date is the only thing which has changed.

Hi, thanks for the patch.

In D5477#81242, @navaneeth.suresh wrote:

@yuja Can this be closed?

It turned out to be important optimization for us. Since it's holiday in US, I updated this with Yuya's comment.

Didn't looked at the code in detail yet, but this patch needs tests.

In D5475#81060, @yuja wrote:

_('set branch name even if it shadows an existing branch')),
('C', 'clean', None, _('reset branch name to parent branch name')),
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),

+ ('s', 'show', None, _('show branch name of the given rev'))

],
_('[-fC] [NAME]'),
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)

@@ -1097,6 +1098,11 @@

ui.write("%s\n" % repo.dirstate.branch())
return

+ elif opts.get('show') and label:
+ ctx = scmutil.revsingle(repo, label)
+ ui.write("%s\n" % ctx.branch())
+ return

How about adding the -r/--rev option to the branches command instead?

I came to this idea while working on the issue4505, tag sorting. I haven't sent
the patch yet because I noticed we would also want to sort tags
lexicographically, which can't be achieved by the revset. But at least, tags,
branches, and bookmarks can be filtered by the -r/--rev option.

https://bz.mercurial-scm.org/show_bug.cgi?id=4505

branch, tag, and bookmark (without -l) are basically the commands to mutate
the repository, and the -r option of the branch command is highly experimental.
IIRC, @pulkit regrets of adding branch -r.