5e6492d4bfc7 — Aurelien Campeas 1 year, 11 months ago 
baseline: add an `ignoremaster` flag, true by default

This is an annoying artifact from hg-git
usage that we do not want to capture.
patch browse 
1 files changed, 4 insertions(+), 2 deletions(-)

M hgext3rd/confman/commands.py

M hgext3rd/confman/commands.py +4 -2
@@ 74,7 74,8 @@ def ensureconf(ui, repo, *args, **opts):
 @command('cfbaseline',
          DEFAULTOPTS + [
              ('', 'force-hgconf', False, 'force the generation of an .hgconf file'),
-             ('', 'propagate', False, 'edit inner configuration also')])
+             ('', 'propagate', False, 'edit inner configuration also'),
+             ('Z', 'ignoremaster', True, 'ignore the <origin>/master tag')])
 def baseline(ui, repo, *args, **opts):
     """update the track attributes with cset hashes or matching tags
 

          
@@ 105,7 106,8 @@ def baseline(ui, repo, *args, **opts):
             continue
 
         ctx = managed.workingctx()
-        if ctx.tag:
+        ignoretag = ctx.tag and opts.get('ignoremaster') and ctx.tag.endswith('/master')
+        if ctx.tag and not ignoretag:
             if track != ctx.tag:
                 tagmap[section] = ctx.tag
         else: