##// END OF EJS Templates
status: make use of output labeling
Brodie Rao -
r10817:2096496b default
parent child Browse files
Show More
@@ -2613,7 +2613,9 b' def resolve(ui, repo, *pats, **opts):'
2613 if nostatus:
2613 if nostatus:
2614 ui.write("%s\n" % f)
2614 ui.write("%s\n" % f)
2615 else:
2615 else:
2616 ui.write("%s %s\n" % (ms[f].upper(), f))
2616 ui.write("%s %s\n" % (ms[f].upper(), f),
2617 label='resolve.' +
2618 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
2617 elif mark:
2619 elif mark:
2618 ms.mark(f, "r")
2620 ms.mark(f, "r")
2619 elif unmark:
2621 elif unmark:
@@ -3052,9 +3054,11 b' def status(ui, repo, *pats, **opts):'
3052 format = "%%s%s" % end
3054 format = "%%s%s" % end
3053
3055
3054 for f in files:
3056 for f in files:
3055 ui.write(format % repo.pathto(f, cwd))
3057 ui.write(format % repo.pathto(f, cwd),
3058 label='status.' + state)
3056 if f in copy:
3059 if f in copy:
3057 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
3060 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3061 label='status.copied')
3058
3062
3059 def summary(ui, repo, **opts):
3063 def summary(ui, repo, **opts):
3060 """summarize working directory state
3064 """summarize working directory state
General Comments 0
You need to be logged in to leave comments. Login now