mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update 'master -> canon' in various places

Browse source 
Change-Id: I901c023f707a0223af673c217c65434e26e2ab1f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/568
Reviewed-by: lukegb <lukegb@tvl.fyi>
This commit is contained in:
Vincent Ambo 2020-06-24 02:32:35 +01:00 committed by tazjin
parent 14317eea79
commit 8dedf9d0be
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/REVIEWS.md
View file

@ -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

2
ops/kontemplate/default.nix
View file

@ -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;

2
ops/kontemplate/release.nix
View file

@ -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;

4
users/lukegb/hgext/gerrithook.py
View file

@ -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