diff options
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 |