Show More
@@ -66,6 +66,7 b' from mercurial import (' | |||||
66 | mdiff, |
|
66 | mdiff, | |
67 | merge, |
|
67 | merge, | |
68 | obsolete, |
|
68 | obsolete, | |
|
69 | pycompat, | |||
69 | registrar, |
|
70 | registrar, | |
70 | scmutil, |
|
71 | scmutil, | |
71 | util, |
|
72 | util, | |
@@ -126,6 +127,7 b' def fix(ui, repo, *pats, **opts):' | |||||
126 | revisions are not forgotten in later ones. The --base flag can be used to |
|
127 | revisions are not forgotten in later ones. The --base flag can be used to | |
127 | override this default behavior, though it is not usually desirable to do so. |
|
128 | override this default behavior, though it is not usually desirable to do so. | |
128 | """ |
|
129 | """ | |
|
130 | opts = pycompat.byteskwargs(opts) | |||
129 | if opts['all']: |
|
131 | if opts['all']: | |
130 | if opts['rev']: |
|
132 | if opts['rev']: | |
131 | raise error.Abort(_('cannot specify both "--rev" and "--all"')) |
|
133 | raise error.Abort(_('cannot specify both "--rev" and "--all"')) | |
@@ -513,7 +515,8 b' def getfixers(ui):' | |||||
513 | result[name] = Fixer() |
|
515 | result[name] = Fixer() | |
514 | attrs = ui.configsuboptions('fix', name)[1] |
|
516 | attrs = ui.configsuboptions('fix', name)[1] | |
515 | for key in FIXER_ATTRS: |
|
517 | for key in FIXER_ATTRS: | |
516 |
setattr(result[name], '_' + key, |
|
518 | setattr(result[name], pycompat.sysstr('_' + key), | |
|
519 | attrs.get(key, '')) | |||
517 | return result |
|
520 | return result | |
518 |
|
521 | |||
519 | def fixernames(ui): |
|
522 | def fixernames(ui): |
General Comments 0
You need to be logged in to leave comments.
Login now