Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
linkrev: fix issue with annotate of working copy
authorMatt Mackall <mpm@selenic.com>
Thu, 16 Apr 2015 18:30:08 -0500
changeset 24776 52628cd73d3e
parent 24775 36993b52d016
child 24777 077683371b7b
linkrev: fix issue with annotate of working copy The introrev was appearing as None in new annotate tests, which the code from the stable branch wasn't expecting.
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Thu Apr 16 17:30:01 2015 -0500
+++ b/mercurial/context.py	Thu Apr 16 18:30:08 2015 -0500
@@ -908,7 +908,7 @@
         introrev = self.introrev()
         if self.rev() != introrev:
             base = self.filectx(self.filenode(), changeid=introrev)
-        if getattr(base, '_ancestrycontext', None) is None:
+        if introrev and getattr(base, '_ancestrycontext', None) is None:
             ac = self._repo.changelog.ancestors([introrev], inclusive=True)
             base._ancestrycontext = ac
hg-stable