This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`
ClosedPublic

Authored by martinvonz on Sep 16 2021, 8:06 PM.

Download Raw Diff

Details

Reviewers

marmoute
Alphare

Group Reviewers

hg-reviewers

Commits

rHG2018753014be: dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`

Summary

Since https://phab.mercurial-scm.org/D11387 (i.e. the same patch as
mentioned in my previous patch), Clang has also started warning about
dirstate_item_set_possibly_dirty() missing an explicit return, and
about its use of the result of an assignment as a condition without
using parentheses. This patch fixes that.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 16 2021, 8:06 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 16 2021, 8:06 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

@marmoute You should have a look at this (also pinging to fix the CI today for the minisprint)

We should just drop the if :

self->flags |= dirstate_flag_possibly_dirty;
Py_RETURN_NONE

marmoute requested changes to this revision.Sep 17 2021, 8:39 AM

This revision now requires changes to proceed.Sep 17 2021, 8:39 AM

martinvonz edited the summary of this revision. (Show Details)Sep 17 2021, 10:55 AM

martinvonz updated this revision to Diff 30288.

In D11445#175503, @marmoute wrote:
We should just drop the if :
self->flags |= dirstate_flag_possibly_dirty;
Py_RETURN_NONE

Done

Thanks

Thanks for catching this.

This revision is now accepted and ready to land.Sep 17 2021, 11:00 AM

martinvonz added a commit: rHG2018753014be: dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`.Sep 17 2021, 11:16 AM

Closed by commit rHG2018753014be: dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()` (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cext/parsers.c (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30283		Sep 16 2021, 8:06 PM	★	★
Diff 2	30288		Sep 17 2021, 10:55 AM	★	★
Diff 3	30290	rHG2018753014becef7df8d01aef5ef0733b7eb5c3e	Sep 16 2021, 7:42 PM	★	★

	Status	Author	Revision
	Closed	martinvonz	D11445 dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`
	Closed	martinvonz	D11444 dirstate: make dirstate flags char be unsigned

Diff 30290

mercurial/cext/parsers.c

	t->mtime = mtime;			t->mtime = mtime;
	return (PyObject *)t;			return (PyObject *)t;
	};			};

	/* This means the next status call will have to actually check its content			/* This means the next status call will have to actually check its content
	to make sure it is correct. */			to make sure it is correct. */
	static PyObject dirstate_item_set_possibly_dirty(dirstateItemObject self)			static PyObject dirstate_item_set_possibly_dirty(dirstateItemObject self)
	{			{
	if (self->flags \|= dirstate_flag_possibly_dirty) {			self->flags \|= dirstate_flag_possibly_dirty;
	Py_RETURN_NONE;			Py_RETURN_NONE;
	}			}
	}

	/* See docstring of the python implementation for details */			/* See docstring of the python implementation for details */
	static PyObject dirstate_item_set_clean(dirstateItemObject self,			static PyObject dirstate_item_set_clean(dirstateItemObject self,
	PyObject *args)			PyObject *args)
	{			{
	int size, mode, mtime;			int size, mode, mtime;
	if (!PyArg_ParseTuple(args, "iii", &mode, &size, &mtime)) {			if (!PyArg_ParseTuple(args, "iii", &mode, &size, &mtime)) {
	return NULL;			return NULL;