Mercurial > hg-stable
changeset 12355:2935cb0ab4e9
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 20 Sep 2010 16:56:57 -0500 |
| parents | 9f7f58afc131 (current diff) 0c2c969e032b (diff) |
| children | dbca8f134f00 |
| files | hgext/mq.py |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Sep 20 16:56:44 2010 -0500 +++ b/hgext/mq.py Mon Sep 20 16:56:57 2010 -0500 @@ -2376,7 +2376,7 @@ def restore(ui, repo, rev, **opts): """restore the queue state saved by a revision (DEPRECATED) - This command is deprecated, use rebase --mq instead.""" + This command is deprecated, use :hg:`rebase` instead.""" rev = repo.lookup(rev) q = repo.mq q.restore(repo, rev, delete=opts.get('delete'), @@ -2387,7 +2387,7 @@ def save(ui, repo, **opts): """save current queue state (DEPRECATED) - This command is deprecated, use rebase --mq instead.""" + This command is deprecated, use :hg:`rebase` instead.""" q = repo.mq message = cmdutil.logmessage(opts) ret = q.save(repo, msg=message)
--- a/mercurial/templates/static/style-gitweb.css Mon Sep 20 16:56:44 2010 -0500 +++ b/mercurial/templates/static/style-gitweb.css Mon Sep 20 16:56:57 2010 -0500 @@ -33,6 +33,7 @@ tr.dark, .parity1 { background-color:#f6f6f0; } tr.dark:hover, .parity1:hover { background-color:#edece6; } td { padding:2px 5px; font-size:12px; vertical-align:top; } +td.closed { background-color: #99f; } td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } td.indexlinks { white-space: nowrap; } td.indexlinks a {
--- a/mercurial/templates/static/style-monoblue.css Mon Sep 20 16:56:44 2010 -0500 +++ b/mercurial/templates/static/style-monoblue.css Mon Sep 20 16:56:57 2010 -0500 @@ -204,6 +204,9 @@ table tr td.nowrap { white-space: nowrap; } +table tr td.closed { + background-color: #99f; +} /* table tr.parity0:hover, table tr.parity1:hover {