[PATCH 1 of 2] keyword: in kwdemo inform user which default keywordset is used

Christian Ebert blacktrash at gmx.net
Thu Jan 20 04:54:22 CST 2011


# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1295458669 -3600
# Node ID 7fd6f66774ccffeac63ae59bc957be91b4f7bf47
# Parent  9f707b297b0f52278acc6c4a4f7c6d801001acb7
keyword: in kwdemo inform user which default keywordset is used

diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -362,7 +362,10 @@
         if uikwmaps:
             ui.status(_('\textending current template maps\n'))
         if opts.get('default') or not uikwmaps:
-            ui.status(_('\toverriding default template maps\n'))
+            if ui.configbool('keywordset', 'svn'):
+                ui.status(_('\toverriding default svn [keywordset]\n'))
+            else:
+                ui.status(_('\toverriding default cvs [keywordset]\n'))
         if opts.get('rcfile'):
             ui.readconfig(opts.get('rcfile'))
         if args:
@@ -374,7 +377,10 @@
             ui.readconfig(repo.join('hgrc'))
         kwmaps = dict(ui.configitems('keywordmaps'))
     elif opts.get('default'):
-        ui.status(_('\n\tconfiguration using default keyword template maps\n'))
+        if ui.configbool('keywordset', 'svn'):
+            ui.status(_('\n\tconfiguration using default svn [keywordset]\n'))
+        else:
+            ui.status(_('\n\tconfiguration using default cvs [keywordset]\n'))
         kwmaps = _defaultkwmaps(ui)
         if uikwmaps:
             ui.status(_('\tdisabling current template maps\n'))


More information about the Mercurial-devel mailing list