equal
deleted
inserted
replaced
6978 pycompat.iterbytestr(b'MAR!?IC'), |
6978 pycompat.iterbytestr(b'MAR!?IC'), |
6979 [getattr(stat, s.decode('utf8')) for s in states], |
6979 [getattr(stat, s.decode('utf8')) for s in states], |
6980 ) |
6980 ) |
6981 |
6981 |
6982 copy = {} |
6982 copy = {} |
6983 if ( |
6983 show_copies = ui.configbool(b'ui', b'statuscopies') |
6984 opts.get(b'all') |
6984 if opts.get(b'copies') is not None: |
6985 or opts.get(b'copies') |
6985 show_copies = opts.get(b'copies') |
6986 or ui.configbool(b'ui', b'statuscopies') |
6986 show_copies = (show_copies or opts.get(b'all')) and not opts.get( |
6987 ) and not opts.get(b'no_status'): |
6987 b'no_status' |
|
6988 ) |
|
6989 if show_copies: |
6988 copy = copies.pathcopies(ctx1, ctx2, m) |
6990 copy = copies.pathcopies(ctx1, ctx2, m) |
6989 |
6991 |
6990 morestatus = None |
6992 morestatus = None |
6991 if ( |
6993 if ( |
6992 (ui.verbose or ui.configbool(b'commands', b'status.verbose')) |
6994 (ui.verbose or ui.configbool(b'commands', b'status.verbose')) |