diff options
| author | joshua stein <jcs@cvs.openbsd.org> | 2013-06-03 17:04:36 +0000 |
|---|---|---|
| committer | joshua stein <jcs@cvs.openbsd.org> | 2013-06-03 17:04:36 +0000 |
| commit | 9bc707c5e3dc97ec7aa797448b0e5937c04ac8f8 (patch) | |
| tree | ed35b0aa6111197d8cbe1258e858c76bc80aef5f /usr.bin/rcs/rlog.c | |
| parent | f15f6c4513b67c7eb106dc978be0bad8b700befe (diff) | |
properly handle commitid tokens found in rcs files
ok deraadt
Diffstat (limited to 'usr.bin/rcs/rlog.c')
| -rw-r--r-- | usr.bin/rcs/rlog.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c index 0b95059453d..0eec9389239 100644 --- a/usr.bin/rcs/rlog.c +++ b/usr.bin/rcs/rlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlog.c,v 1.65 2011/07/14 16:38:39 sobrado Exp $ */ +/* $OpenBSD: rlog.c,v 1.66 2013/06/03 17:04:35 jcs Exp $ */ /* * Copyright (c) 2005, 2009 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -541,10 +541,14 @@ rlog_rev_print(struct rcs_delta *rdp) rcs_delta_stats(nrdp, &added, &removed); if (RCSNUM_ISBRANCHREV(rdp->rd_num)) - printf(" lines: +%d -%d", added, removed); + printf(" lines: +%d -%d;", added, removed); else - printf(" lines: +%d -%d", removed, added); + printf(" lines: +%d -%d;", removed, added); } + + if (rdp->rd_commitid != NULL) + printf(" commitid: %s;", rdp->rd_commitid); + printf("\n"); if (!TAILQ_EMPTY(&(rdp->rd_branches))) { |