diff options
author | Vincent Ambo <mail@tazj.in> | 2020-06-24T01·32+0100 |
---|---|---|
committer | tazjin <mail@tazj.in> | 2020-06-24T01·33+0000 |
commit | 8dedf9d0be823d99481505c52f3e101a54dc8a85 (patch) | |
tree | 1254cdc119e5df9062efeb9131f59938659781fe /users/lukegb/hgext | |
parent | 14317eea79fe8ea799a263542f126b59f4361d5c (diff) |
chore: Update 'master -> canon' in various places r/1073
Change-Id: I901c023f707a0223af673c217c65434e26e2ab1f Reviewed-on: https://cl.tvl.fyi/c/depot/+/568 Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'users/lukegb/hgext')
-rw-r--r-- | users/lukegb/hgext/gerrithook.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/lukegb/hgext/gerrithook.py b/users/lukegb/hgext/gerrithook.py index 8b24f7bd71ad..ef02126ba0f8 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 |