Show More
@@ -5845,7 +5845,8 b' def status(ui, repo, *pats, **opts):' | |||||
5845 | opts.get('subrepos')) |
|
5845 | opts.get('subrepos')) | |
5846 | changestates = zip(states, 'MAR!?IC', stat) |
|
5846 | changestates = zip(states, 'MAR!?IC', stat) | |
5847 |
|
5847 | |||
5848 |
if (opts.get('all') or opts.get('copies') |
|
5848 | if (opts.get('all') or opts.get('copies') | |
|
5849 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |||
5849 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5850 | copy = copies.pathcopies(repo[node1], repo[node2]) | |
5850 |
|
5851 | |||
5851 | fm = ui.formatter('status', opts) |
|
5852 | fm = ui.formatter('status', opts) |
@@ -1432,6 +1432,9 b' User interface controls.' | |||||
1432 | backslash character (``\``)). |
|
1432 | backslash character (``\``)). | |
1433 | Default is False. |
|
1433 | Default is False. | |
1434 |
|
1434 | |||
|
1435 | ``statuscopies`` | |||
|
1436 | Display copies in the status command. | |||
|
1437 | ||||
1435 | ``ssh`` |
|
1438 | ``ssh`` | |
1436 | command to use for SSH connections. Default is ``ssh``. |
|
1439 | command to use for SSH connections. Default is ``ssh``. | |
1437 |
|
1440 |
@@ -158,7 +158,7 b' class ui(object):' | |||||
158 |
|
158 | |||
159 | if self.plain(): |
|
159 | if self.plain(): | |
160 | for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
|
160 | for k in ('debug', 'fallbackencoding', 'quiet', 'slash', | |
161 | 'logtemplate', 'style', |
|
161 | 'logtemplate', 'statuscopies', 'style', | |
162 | 'traceback', 'verbose'): |
|
162 | 'traceback', 'verbose'): | |
163 | if k in cfg['ui']: |
|
163 | if k in cfg['ui']: | |
164 | del cfg['ui'][k] |
|
164 | del cfg['ui'][k] |
@@ -438,6 +438,15 b' without force' | |||||
438 | b |
|
438 | b | |
439 | R b |
|
439 | R b | |
440 |
|
440 | |||
|
441 | using ui.statuscopies setting | |||
|
442 | $ hg st --config ui.statuscopies=true | |||
|
443 | M a | |||
|
444 | b | |||
|
445 | R b | |||
|
446 | $ hg st --config ui.statuscopies=false | |||
|
447 | M a | |||
|
448 | R b | |||
|
449 | ||||
441 | Other "bug" highlight, the revision status does not report the copy information. |
|
450 | Other "bug" highlight, the revision status does not report the copy information. | |
442 | This is buggy behavior. |
|
451 | This is buggy behavior. | |
443 |
|
452 |
General Comments 0
You need to be logged in to leave comments.
Login now