Submitter | Yuya Nishihara |
---|---|
Date | April 25, 2015, 8:58 a.m. |
Message ID | <1f3991a11e1ecf5082b0.1429952290@mimosa> |
Download | mbox | patch |
Permalink | /patch/8788/ |
State | Accepted |
Headers | show |
Comments
On Sat, 2015-04-25 at 17:58 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara <yuya@tcha.org> > # Date 1429943886 -32400 > # Sat Apr 25 15:38:06 2015 +0900 > # Branch stable > # Node ID 1f3991a11e1ecf5082b01585a7f9a6ace11e001c > # Parent 8015a3cf13805a307b43f22d821cad4824d094ea > annotate: always adjust linkrev before walking down to parents (issue4623) Queued for stable, thanks.
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -887,6 +887,11 @@ class basefilectx(object): getlog = util.lrucachefunc(lambda x: self._repo.file(x)) def parents(f): + # Cut _descendantrev here to mitigate the penalty of lazy linkrev + # adjustment. Otherwise, p._adjustlinkrev() would walk changelog + # from the topmost introrev (= srcrev) down to p.linkrev() if it + # isn't an ancestor of the srcrev. + f._changeid pl = f.parents() # Don't return renamed parents if we aren't following.