Mercurial > hg
view tests/test-contrib-check-commit.t @ 28240:1ac8ce137377
changegroup: fix treemanifests on merges
The current code for generating treemanifest revisions takes the list
of files in the changeset and finds the directories from them. This
does not work for merges, since a merge may pick file A from one side
and file B from another and neither of them would appear in the
changeset's "files" list, but the manifest would still change.
Fix this by instead walking the root manifest log for all needed
revisions, storing all needed file and subdirectory revisions, then
recursively visiting the subdirectories. This also turns out to be
faster: cloning a version of hg core converted to treemanifests went
from ~28s to ~19s (timing somewhat unfair: before this patch, timed
until crash; after this patch, timed until manifests complete).
The new algorithm is used only on treemanifest repos. Although it
works equally well on flat manifests, we leave the iteration over
files in the changeset for flat manifests for now.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 12 Feb 2016 23:09:09 -0800 |
parents | e529b5f1b9e3 |
children | 2fb3ae89e4e1 |
line wrap: on
line source
Test the 'check-commit' script ============================== A fine patch: $ cat > patch-with-long-header.diff << EOF > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1448911706 0 > # Mon Nov 30 19:28:26 2015 +0000 > # Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88 > # Parent 42aa0e570eaa364a622bc4443b0bcb79b1100a58 > # ClownJoke This is a veryly long header that should not be warned about because its not the description > bundle2: use Oxford comma (issue123) (BC) > > diff --git a/hgext/transplant.py b/hgext/transplant.py > --- a/hgext/transplant.py > +++ b/hgext/transplant.py > @@ -599,7 +599,7 @@ > return > if not (opts.get('source') or revs or > opts.get('merge') or opts.get('branch')): > - raise error.Abort(_('no source URL, branch revision or revision ' > + raise error.Abort(_('no source URL, branch revision, or revision ' > 'list provided')) > if opts.get('all'): > > + def blahblah(x): > + pass > EOF $ cat patch-with-long-header.diff | $TESTDIR/../contrib/check-commit A patch with lots of errors: $ cat > patch-with-long-header.diff << EOF > # HG changeset patch > # User timeless > # Date 1448911706 0 > # Mon Nov 30 19:28:26 2015 +0000 > # Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88 > # Parent 42aa0e570eaa364a622bc4443b0bcb79b1100a58 > # ClownJoke This is a veryly long header that should not be warned about because its not the description > transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) > > diff --git a/hgext/transplant.py b/hgext/transplant.py > --- a/hgext/transplant.py > +++ b/hgext/transplant.py > @@ -599,7 +599,7 @@ > return > if not (opts.get('source') or revs or > opts.get('merge') or opts.get('branch')): > - raise error.Abort(_('no source URL, branch revision or revision ' > + raise error.Abort(_('no source URL, branch revision, or revision ' > 'list provided')) > if opts.get('all'): > EOF $ cat patch-with-long-header.diff | $TESTDIR/../contrib/check-commit 1: username is not an email address # User timeless 7: summary keyword should be most user-relevant one-word command or topic transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) 7: (BC) needs to be uppercase transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) 7: use (issueDDDD) instead of bug transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) 7: no space allowed between issue and number transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) 7: summary line too long (limit is 78) transplant/foo: this summary is way too long use Oxford comma (bc) (bug123) (issue 244) [1] A patch with other errors: $ cat > patch-with-long-header.diff << EOF > # HG changeset patch > # User timeless > # Date 1448911706 0 > # Mon Nov 30 19:28:26 2015 +0000 > # Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88 > # Parent 42aa0e570eaa364a622bc4443b0bcb79b1100a58 > # ClownJoke This is a veryly long header that should not be warned about because its not the description > This has no topic and ends with a period. > > diff --git a/hgext/transplant.py b/hgext/transplant.py > --- a/hgext/transplant.py > +++ b/hgext/transplant.py > @@ -599,7 +599,7 @@ > if opts.get('all'): > > > + > + some = otherjunk > + > + > + def blah_blah(x): > + pass > + > > EOF $ cat patch-with-long-header.diff | $TESTDIR/../contrib/check-commit 1: username is not an email address # User timeless 7: don't capitalize summary lines This has no topic and ends with a period. 7: summary line doesn't start with 'topic: ' This has no topic and ends with a period. 7: don't add trailing period on summary line This has no topic and ends with a period. 19: adds double empty line + 20: adds a function with foo_bar naming + def blah_blah(x): 23: adds double empty line + [1]