[PATCH 2 of 2] summary: don't indicate a clean wdir() with deleted files (issue5549)
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Mon Jul 3 11:40:54 EDT 2017
At Mon, 3 Jul 2017 22:59:38 +0900,
Yuya Nishihara wrote:
>
> On Sun, 02 Jul 2017 22:50:21 -0400, Matt Harbison wrote:
> > # HG changeset patch
> > # User Matt Harbison <matt_harbison at yahoo.com>
> > # Date 1498705338 14400
> > # Wed Jun 28 23:02:18 2017 -0400
> > # Node ID fcbab9a85517f363a9c0bdfa80362b88843258ac
> > # Parent 0fcbcb681899ad44a33380788750ea375aa70864
> > summary: don't indicate a clean wdir() with deleted files (issue5549)
> >
> > It wasn't a BC when copy/rename was added (997ab9af81df), or when subrepos were
> > added (c4347e48b0d0).
>
> (This changes the existing behavior, so should be marked as BC, I think.)
>
> >
> > diff --git a/mercurial/commands.py b/mercurial/commands.py
> > --- a/mercurial/commands.py
> > +++ b/mercurial/commands.py
> > @@ -4870,8 +4870,8 @@
> > elif (parents[0].closesbranch() and
> > pnode in repo.branchheads(branch, closed=True)):
> > t += _(' (head closed)')
> > - elif not (status.modified or status.added or status.removed or renamed or
> > - copied or subs):
> > + elif not (status.modified or status.added or status.removed or
> > + status.deleted or renamed or copied or subs):
> > t += _(' (clean)')
> > cleanworkdir = True
>
> This seemed better to me, but I guess the original intent was to show whether
> new commit could be made (=not clean) or not (=clean).
Is there any short phrase corresponding to "new commit could be made" ?
It seems better than "clean" in this case.
> > @@ -35,7 +35,7 @@
> > parent: 3:cb66ec850af7 tip
> > add b
> > branch: default
> > - commit: 1 deleted (clean)
> > + commit: 1 deleted
>
> Probably that's why this field is called "commit".
>
> Thoughts?
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
--
----------------------------------------------------------------------
[FUJIWARA Katsunori] foozy at lares.dti.ne.jp
More information about the Mercurial-devel
mailing list