Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__init__: show some internationalization love
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 21 Mar 2018 17:03:55 +0530
changeset 3583 944a8c27d27b
parent 3582 8d93f76aa04d
child 3588 382ea8cd8b66
child 3596 c965692c0f5e
__init__: show some internationalization love
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Wed Mar 21 17:04:41 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Wed Mar 21 17:03:55 2018 +0530
@@ -960,10 +960,10 @@
 
 def _prevupdate(repo, displayer, target, bookmark, dryrun):
     if dryrun:
-        repo.ui.write(('hg update %s;\n' % target))
+        repo.ui.write(_('hg update %s;\n') % target)
         if bookmark is not None:
-            repo.ui.write(('hg bookmark %s -r %s;\n'
-                           % (bookmark, target)))
+            repo.ui.write(_('hg bookmark %s -r %s;\n')
+                          % (bookmark, target))
     else:
         ret = hg.update(repo, target.rev())
         if not ret:
@@ -1040,7 +1040,7 @@
         wkctx = repo[None]
         wparents = wkctx.parents()
         if len(wparents) != 1:
-            raise error.Abort('merge in progress')
+            raise error.Abort(_('merge in progress'))
         if not opts['merge']:
             try:
                 cmdutil.bailifchanged(repo)
@@ -1094,7 +1094,7 @@
         wkctx = repo[None]
         wparents = wkctx.parents()
         if len(wparents) != 1:
-            raise error.Abort('merge in progress')
+            raise error.Abort(_('merge in progress'))
         if not opts['merge']:
             try:
                 cmdutil.bailifchanged(repo)
@@ -1182,9 +1182,9 @@
     bm = repo._activebookmark
     shouldmove = opts.get('move_bookmark') and bm is not None
     if opts.get('dry_run'):
-        ui.write(('hg update %s;\n' % children))
+        ui.write(_('hg update %s;\n') % children)
         if shouldmove:
-            ui.write(('hg bookmark %s -r %s;\n' % (bm, children)))
+            ui.write(_('hg bookmark %s -r %s;\n') % (bm, children))
     else:
         ret = hg.update(repo, children)
         if not ret:
evolve