From 8dedf9d0be823d99481505c52f3e101a54dc8a85 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 24 Jun 2020 02:32:35 +0100 Subject: chore: Update 'master -> canon' in various places Change-Id: I901c023f707a0223af673c217c65434e26e2ab1f Reviewed-on: https://cl.tvl.fyi/c/depot/+/568 Reviewed-by: lukegb --- users/lukegb/hgext/gerrithook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'users') diff --git a/users/lukegb/hgext/gerrithook.py b/users/lukegb/hgext/gerrithook.py index 8b24f7bd71..ef02126ba0 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 -- cgit 1.4.1