Review: Approve code
Diff comments:
>
> === modified file 'lib/lp/code/model/gitref.py'
> --- lib/lp/code/model/gitref.py 2016-05-24 06:35:12 +0000
> +++ lib/lp/code/model/gitref.py 2016-05-24 07:02:50 +0000
> @@ -259,6 +259,19 @@
> enable_memcache = not getFeatureFlag(
> u"code.git.log.disable_memcache")
> path = self.repository.getInternalPath()
> +<<<<<<< TREE
> +=======
> + if (union_repository is not None and
> + union_repository != self.repository):
> + path = "%s:%s" % (union_repository.getInternalPath(), path)
These variable numbers of : are going to result in an ambiguity at some point.
> + memcache_key = "%s:git-log:%s:%s" % (config.instance_name, path,
> start)
> + if limit is not None:
> + memcache_key += ":limit=%s" % limit
> + if stop is not None:
> + memcache_key += ":stop=%s" % stop
> + if isinstance(memcache_key, unicode):
> + memcache_key = memcache_key.encode("UTF-8")
> +>>>>>>> MERGE-SOURCE
> log = None
> if enable_memcache:
> memcache_client = getUtility(IMemcacheClient)
--
https://code.launchpad.net/~cjwatson/launchpad/git-cross-repository-logs/+merge/295549
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
