From 8dedf9d0be823d99481505c52f3e101a54dc8a85 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 24 Jun 2020 02:32:35 +0100
Subject: [PATCH] chore: Update 'master -> canon' in various places

Change-Id: I901c023f707a0223af673c217c65434e26e2ab1f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/568
Reviewed-by: lukegb <lukegb@tvl.fyi>
---
 docs/REVIEWS.md                  | 6 +++---
 ops/kontemplate/default.nix      | 2 +-
 ops/kontemplate/release.nix      | 2 +-
 users/lukegb/hgext/gerrithook.py | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/REVIEWS.md b/docs/REVIEWS.md
index 5be81acbe..3f0036456 100644
--- a/docs/REVIEWS.md
+++ b/docs/REVIEWS.md
@@ -49,13 +49,13 @@ and all development happens at `HEAD`.
 Every time you create a new commit the change hook will insert a unique
 `Change-Id` tag into the commit message. Once you are satisfied with the state
 of your commit and want to submit it for review, you push it to a git ref called
-`refs/for/master`. This designates the commits as changelists (CLs) targeted for
-the `master` branch.
+`refs/for/canon`. This designates the commits as changelists (CLs) targeted for
+the `canon` branch.
 
 ```
 Example:
 git commit -m 'docs(REVIEWS): Fixed all the errors in the reviews docs'
-git push origin HEAD:refs/for/master
+git push origin HEAD:refs/for/canon
 ```
 
 TIP: Every individual commit will become a separate change. We do not merge
diff --git a/ops/kontemplate/default.nix b/ops/kontemplate/default.nix
index 9085f31c3..eb1290687 100644
--- a/ops/kontemplate/default.nix
+++ b/ops/kontemplate/default.nix
@@ -14,7 +14,7 @@
 
 with depot.third_party; buildGoPackage rec {
   name = "kontemplate-${version}";
-  version = "master";
+  version = "canon";
   src = ./.;
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps = ./deps.nix;
diff --git a/ops/kontemplate/release.nix b/ops/kontemplate/release.nix
index 4af08f50c..8a0410952 100644
--- a/ops/kontemplate/release.nix
+++ b/ops/kontemplate/release.nix
@@ -18,7 +18,7 @@ let pkgs = import ((import <nixpkgs> {}).fetchFromGitHub {
 }) {};
 in with pkgs; buildGoPackage rec {
   name = "kontemplate-${version}";
-  version = "master";
+  version = "canon";
   src = ./.;
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps = ./deps.nix;
diff --git a/users/lukegb/hgext/gerrithook.py b/users/lukegb/hgext/gerrithook.py
index 8b24f7bd7..ef02126ba 100644
--- a/users/lukegb/hgext/gerrithook.py
+++ b/users/lukegb/hgext/gerrithook.py
@@ -48,11 +48,11 @@ def gerritobsolete(ui, repo, **opts):
     if not drafts:
         return
     publicparent = next(repo.set(
-        b'ancestor((public() and bookmark("master")), %s)' % (
+        b'ancestor((public() and bookmark("canon")), %s)' % (
             b', '.join(x.hex() for x in drafts))))
     megare = b're:(?ms)^Change-Id: (%s)$' % (b'|'.join(changesets.keys()),)
     markers = []
-    for public in repo.set('(%s..(public() and master)) and desc(%s)', publicparent, megare):
+    for public in repo.set('(%s..(public() and canon)) and desc(%s)', publicparent, megare):
         match = _changeid_regex.search(public.description())
         if not match:
             continue