Mercurial > hg
comparison mercurial/commands.py @ 24455:16961d43dc89
diff: rename --relative option to --root
The diff output format is unable to express files outside the directory so it
makes sense to name this option --root instead of --relative.
author | Sean Farley <sean@farley.io> |
---|---|
date | Wed, 25 Mar 2015 11:55:15 -0700 |
parents | e22248f6d257 |
children | a05c6b400616 |
comparison
equal
deleted
inserted
replaced
24454:59904edf0a5e | 24455:16961d43dc89 |
---|---|
146 ('', 'reverse', None, _('produce a diff that undoes the changes')), | 146 ('', 'reverse', None, _('produce a diff that undoes the changes')), |
147 ] + diffwsopts + [ | 147 ] + diffwsopts + [ |
148 ('U', 'unified', '', | 148 ('U', 'unified', '', |
149 _('number of lines of context to show'), _('NUM')), | 149 _('number of lines of context to show'), _('NUM')), |
150 ('', 'stat', None, _('output diffstat-style summary of changes')), | 150 ('', 'stat', None, _('output diffstat-style summary of changes')), |
151 ('', 'relative', '', _('produce diffs relative to subdirectory'), _('DIR')), | 151 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')), |
152 ] | 152 ] |
153 | 153 |
154 mergetoolopts = [ | 154 mergetoolopts = [ |
155 ('t', 'tool', '', _('specify merge tool')), | 155 ('t', 'tool', '', _('specify merge tool')), |
156 ] | 156 ] |
3169 | 3169 |
3170 diffopts = patch.diffallopts(ui, opts) | 3170 diffopts = patch.diffallopts(ui, opts) |
3171 m = scmutil.match(repo[node2], pats, opts) | 3171 m = scmutil.match(repo[node2], pats, opts) |
3172 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | 3172 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
3173 listsubrepos=opts.get('subrepos'), | 3173 listsubrepos=opts.get('subrepos'), |
3174 relative=opts.get('relative')) | 3174 root=opts.get('root')) |
3175 | 3175 |
3176 @command('^export', | 3176 @command('^export', |
3177 [('o', 'output', '', | 3177 [('o', 'output', '', |
3178 _('print output to file with formatted name'), _('FORMAT')), | 3178 _('print output to file with formatted name'), _('FORMAT')), |
3179 ('', 'switch-parent', None, _('diff against the second parent')), | 3179 ('', 'switch-parent', None, _('diff against the second parent')), |