Show More
@@ -5,8 +5,8 b'' | |||||
5 | ;; Author: Bryan O'Sullivan <bos@serpentine.com> |
|
5 | ;; Author: Bryan O'Sullivan <bos@serpentine.com> | |
6 |
|
6 | |||
7 | ;; mercurial.el is free software; you can redistribute it and/or |
|
7 | ;; mercurial.el is free software; you can redistribute it and/or | |
8 |
;; modify it under the terms of the GNU General Public License o |
|
8 | ;; modify it under the terms of the GNU General Public License version | |
9 | ;; later version. |
|
9 | ;; 2 or any later version. | |
10 |
|
10 | |||
11 | ;; mercurial.el is distributed in the hope that it will be useful, but |
|
11 | ;; mercurial.el is distributed in the hope that it will be useful, but | |
12 | ;; WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 | ;; WITHOUT ANY WARRANTY; without even the implied warranty of |
@@ -2944,6 +2944,7 b' def summary(ui, repo, **opts):' | |||||
2944 | t.append(l % len(s)) |
|
2944 | t.append(l % len(s)) | |
2945 |
|
2945 | |||
2946 | t = ', '.join(t) |
|
2946 | t = ', '.join(t) | |
|
2947 | cleanworkdir = False | |||
2947 |
|
2948 | |||
2948 | if len(parents) > 1: |
|
2949 | if len(parents) > 1: | |
2949 | t += _(' (merge)') |
|
2950 | t += _(' (merge)') | |
@@ -2951,10 +2952,11 b' def summary(ui, repo, **opts):' | |||||
2951 | t += _(' (new branch)') |
|
2952 | t += _(' (new branch)') | |
2952 | elif (not st[0] and not st[1] and not st[2]): |
|
2953 | elif (not st[0] and not st[1] and not st[2]): | |
2953 | t += _(' (clean)') |
|
2954 | t += _(' (clean)') | |
|
2955 | cleanworkdir = True | |||
2954 | elif pnode not in bheads: |
|
2956 | elif pnode not in bheads: | |
2955 | t += _(' (new branch head)') |
|
2957 | t += _(' (new branch head)') | |
2956 |
|
2958 | |||
2957 |
if |
|
2959 | if cleanworkdir: | |
2958 | ui.status(_('commit: %s\n') % t.strip()) |
|
2960 | ui.status(_('commit: %s\n') % t.strip()) | |
2959 | else: |
|
2961 | else: | |
2960 | ui.write(_('commit: %s\n') % t.strip()) |
|
2962 | ui.write(_('commit: %s\n') % t.strip()) |
General Comments 0
You need to be logged in to leave comments.
Login now