[PATCH 1 of 2] purge: renamed the abort-on-error option to continue-on-errors

Emanuele Aina em at nerd.ocracy.org
Wed May 7 07:19:35 CDT 2008


# HG changeset patch
# User Emanuele Aina <em at nerd.ocracy.org>
# Date 1209989797 -7200
# Node ID 1e2c67f598ebb7bd756646880abc67a4408a3bc3
# Parent  626cb86a6523c9e8b453719314dd31fa4d61ced3
purge: renamed the abort-on-error option to continue-on-errors

diff -r 626cb86a6523 -r 1e2c67f598eb hgext/purge.py
--- a/hgext/purge.py	Thu Apr 24 17:16:02 2008 +0200
+++ b/hgext/purge.py	Mon May 05 14:16:37 2008 +0200
@@ -32,13 +32,13 @@
 import os
 
 def dopurge(ui, repo, dirs=None, act=True, ignored=False,
-            abort_on_err=False, eol='\n',
+            continue_on_errors=False, eol='\n',
             force=False, include=None, exclude=None):
     def error(msg):
-        if abort_on_err:
+        if continue_on_errors:
+            ui.warn(_('warning: %s\n') % msg)
+        else:
             raise util.Abort(msg)
-        else:
-            ui.warn(_('warning: %s\n') % msg)
 
     def remove(remove_func, name):
         if act:
@@ -126,7 +126,7 @@
     '''
     act = not opts['print']
     ignored = bool(opts['all'])
-    abort_on_err = bool(opts['abort_on_err'])
+    continue_on_errors = bool(opts['continue_on_errors'])
     eol = opts['print0'] and '\0' or '\n'
     if eol == '\0':
         # --print0 implies --print
@@ -134,14 +134,14 @@
     force = bool(opts['force'])
     include = opts['include']
     exclude = opts['exclude']
-    dopurge(ui, repo, dirs, act, ignored, abort_on_err,
+    dopurge(ui, repo, dirs, act, ignored, continue_on_errors,
             eol, force, include, exclude)
 
 
 cmdtable = {
     'purge|clean':
         (purge,
-         [('a', 'abort-on-err', None, _('abort if an error occurs')),
+         [('c', 'continue-on-errors', None, _('continue even if some error occurred')),
           ('',  'all', None, _('purge ignored files too')),
           ('f', 'force', None, _('purge even when there are uncommitted changes')),
           ('p', 'print', None, _('print the file names instead of deleting them')),




More information about the Mercurial-devel mailing list