Show More
@@ -2949,6 +2949,7 b' def summary(ui, repo, **opts):' | |||||
2949 | t.append(l % len(s)) |
|
2949 | t.append(l % len(s)) | |
2950 |
|
2950 | |||
2951 | t = ', '.join(t) |
|
2951 | t = ', '.join(t) | |
|
2952 | cleanworkdir = False | |||
2952 |
|
2953 | |||
2953 | if len(parents) > 1: |
|
2954 | if len(parents) > 1: | |
2954 | t += _(' (merge)') |
|
2955 | t += _(' (merge)') | |
@@ -2956,10 +2957,11 b' def summary(ui, repo, **opts):' | |||||
2956 | t += _(' (new branch)') |
|
2957 | t += _(' (new branch)') | |
2957 | elif (not st[0] and not st[1] and not st[2]): |
|
2958 | elif (not st[0] and not st[1] and not st[2]): | |
2958 | t += _(' (clean)') |
|
2959 | t += _(' (clean)') | |
|
2960 | cleanworkdir = True | |||
2959 | elif pnode not in bheads: |
|
2961 | elif pnode not in bheads: | |
2960 | t += _(' (new branch head)') |
|
2962 | t += _(' (new branch head)') | |
2961 |
|
2963 | |||
2962 |
if |
|
2964 | if cleanworkdir: | |
2963 | ui.status(_('commit: %s\n') % t.strip()) |
|
2965 | ui.status(_('commit: %s\n') % t.strip()) | |
2964 | else: |
|
2966 | else: | |
2965 | ui.write(_('commit: %s\n') % t.strip()) |
|
2967 | ui.write(_('commit: %s\n') % t.strip()) |
General Comments 0
You need to be logged in to leave comments.
Login now