This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9929

churn: count lines that look like diff headers but are not
ClosedPublic

Authored by aayjaychan on Jan 30 2021, 8:48 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb84c3d43ff2e: churn: count lines that look like diff headers but are not
Summary

Previously, churn cannot count added lines that start with "++ " or removed
lines that start with "-- ".

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

aayjaychan created this revision.Jan 30 2021, 8:48 AM
pulkit accepted this revision.Jan 31 2021, 2:47 PM
This revision is now accepted and ready to land.Jan 31 2021, 2:47 PM

Revision Contents
Changeset List

PathPackages
Mhgext/churn.py (9 lines)
Mtests/test-churn.t (19 lines)

Diff 25417

hgext/churn.py

# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
def changedlines(ui, repo, ctx1, ctx2, fmatch): def changedlines(ui, repo, ctx1, ctx2, fmatch):
added, removed = 0, 0 added, removed = 0, 0
diff = b''.join(patch.diff(repo, ctx1.node(), ctx2.node(), fmatch)) diff = b''.join(patch.diff(repo, ctx1.node(), ctx2.node(), fmatch))
inhunk = False
for l in diff.split(b'\n'): for l in diff.split(b'\n'):
if l.startswith(b"+") and not l.startswith(b"+++ "): if inhunk and l.startswith(b"+"):
added += 1 added += 1
elif l.startswith(b"-") and not l.startswith(b"--- "): elif inhunk and l.startswith(b"-"):
removed += 1 removed += 1
elif l.startswith(b"@"):
inhunk = True
elif l.startswith(b"d"):
inhunk = False
return (added, removed) return (added, removed)
def countrate(ui, repo, amap, *pats, **opts): def countrate(ui, repo, amap, *pats, **opts):
"""Calculate stats""" """Calculate stats"""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'dateformat'): if opts.get(b'dateformat'):

tests/test-churn.t

0 0
user4 0 user4 0
$ hg churn -t 'alltogether' $ hg churn -t 'alltogether'
alltogether 11 ********************************************************* alltogether 11 *********************************************************
$ hg churn -T 'alltogether' $ hg churn -T 'alltogether'
alltogether 11 ********************************************************* alltogether 11 *********************************************************
$ cd .. $ cd ..
count lines that look like headings but are not
$ hg init not-headers
$ cd not-headers
$ cat > a <<EOF
> diff
> @@ -195,3 +195,21 @@
> -- a/tests/test-churn.t
> ++ b/tests/test-churn.t
> EOF
$ hg ci -Am adda -u user1
adding a
$ hg churn --diffstat
user1 +4/-0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
$ hg rm a
$ hg ci -Am removea -u user1
$ hg churn --diffstat
user1 +4/-4 +++++++++++++++++++++++++++---------------------------