Show More
@@ -1402,7 +1402,7 def _chisteditmain(repo, rules, stdscr): | |||||
1402 | maxy, maxx = win.getmaxyx() |
|
1402 | maxy, maxx = win.getmaxyx() | |
1403 | length = maxx - 3 |
|
1403 | length = maxx - 3 | |
1404 |
|
1404 | |||
1405 | line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()) |
|
1405 | line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12]) | |
1406 | win.addstr(1, 1, line[:length]) |
|
1406 | win.addstr(1, 1, line[:length]) | |
1407 |
|
1407 | |||
1408 | line = b"user: %s" % ctx.user() |
|
1408 | line = b"user: %s" % ctx.user() | |
@@ -1432,7 +1432,7 def _chisteditmain(repo, rules, stdscr): | |||||
1432 |
|
1432 | |||
1433 | conflicts = rule.conflicts |
|
1433 | conflicts = rule.conflicts | |
1434 | if len(conflicts) > 0: |
|
1434 | if len(conflicts) > 0: | |
1435 | conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) |
|
1435 | conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts)) | |
1436 | conflictstr = b"changed files overlap with %s" % conflictstr |
|
1436 | conflictstr = b"changed files overlap with %s" % conflictstr | |
1437 | else: |
|
1437 | else: | |
1438 | conflictstr = b'no overlap' |
|
1438 | conflictstr = b'no overlap' |
General Comments 0
You need to be logged in to leave comments.
Login now