configwizard: shorten and colourise 'wip' output (bug 1319097); r?gps draft
authorbyron jones <glob@mozilla.com>
Tue, 22 Nov 2016 14:03:08 +0800
changeset 9938 911714962c6d0affe31258f0d33187b23f7ff9cd
parent 9937 ca9d5d84469bccd92478ebdee7f60bea69f62b0e
push id1386
push userbjones@mozilla.com
push dateTue, 22 Nov 2016 06:52:43 +0000
reviewersgps
bugs1319097
configwizard: shorten and colourise 'wip' output (bug 1319097); r?gps Fix test-wip.t MozReview-Commit-ID: KVVccTeqqhw
hgext/configwizard/tests/test-wip.t
--- a/hgext/configwizard/tests/test-wip.t
+++ b/hgext/configwizard/tests/test-wip.t
@@ -15,24 +15,26 @@ Rejecting wip doesn't install it
    <RETURN>
   It is common to want a quick view of changesets that are in progress.
   
   The ``hg wip`` command provides such a view.
   
   Example Usage:
   
     $ hg wip
-    o   4084:fcfa34d0387b dminor @
-    |  mozreview: use repository name when displaying treeherder results (bug 1230548) r=mcote
-    | @   4083:786baf6d476a gps
-    | |  mozreview: create child review requests from batch API
-    | o   4082:3f100fa4a94f gps
-    | |  mozreview: copy more read-only processing code; r?smacleod
-    | o   4081:939417680cbe gps
-    |/   mozreview: add web API to submit an entire series of commits (bug 1229468); r?smacleod
+    @  5887 armenzg tip @ Bug 1313661 - Bump pushlog_client to 0.6.0. r=me
+    : o  5885 glob mozreview: Improve the error message when pushing to a submitted/discarded review request (bug 1240725) r?smacleod
+    : o  5884 glob hgext: Support line breaks in hgrb error messages (bug 1240725) r?gps
+    :/
+    o  5883 mars mozreview: add py.test and demonstration tests to mozreview (bug 1312875) r=smacleod
+    : o  5881 glob autoland: log mercurial commands to autoland.log (bug 1313300) r?smacleod
+    :/
+    o  5250 gps ansible/docker-hg-web: set USER variable in httpd process
+    |
+    ~
   
   (Not shown are the colors that help denote the state each changeset
   is in.)
   
   (Relevant config options: alias.wip, revsetalias.wip, templates.wip)
   
   Would you like to install the `hg wip` alias (Yn)?  n
 
@@ -48,52 +50,76 @@ wip enabled when requested
    <RETURN>
   It is common to want a quick view of changesets that are in progress.
   
   The ``hg wip`` command provides such a view.
   
   Example Usage:
   
     $ hg wip
-    o   4084:fcfa34d0387b dminor @
-    |  mozreview: use repository name when displaying treeherder results (bug 1230548) r=mcote
-    | @   4083:786baf6d476a gps
-    | |  mozreview: create child review requests from batch API
-    | o   4082:3f100fa4a94f gps
-    | |  mozreview: copy more read-only processing code; r?smacleod
-    | o   4081:939417680cbe gps
-    |/   mozreview: add web API to submit an entire series of commits (bug 1229468); r?smacleod
+    @  5887 armenzg tip @ Bug 1313661 - Bump pushlog_client to 0.6.0. r=me
+    : o  5885 glob mozreview: Improve the error message when pushing to a submitted/discarded review request (bug 1240725) r?smacleod
+    : o  5884 glob hgext: Support line breaks in hgrb error messages (bug 1240725) r?gps
+    :/
+    o  5883 mars mozreview: add py.test and demonstration tests to mozreview (bug 1312875) r=smacleod
+    : o  5881 glob autoland: log mercurial commands to autoland.log (bug 1313300) r?smacleod
+    :/
+    o  5250 gps ansible/docker-hg-web: set USER variable in httpd process
+    |
+    ~
   
   (Not shown are the colors that help denote the state each changeset
   is in.)
   
   (Relevant config options: alias.wip, revsetalias.wip, templates.wip)
   
   Would you like to install the `hg wip` alias (Yn)?  y
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y
   --- hgrc.old
   +++ hgrc.new
-  @@ -0,0 +1,6 @@
+  @@ -0,0 +1,17 @@
   +[alias]
   +wip = log --graph --rev=wip --template=wip
   +[revsetalias]
   +wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed()
   +[templates]
-  +wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)}{label("changeset.{phase}", ":")}{label("changeset.{phase}", short(node))} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))}{label("log.tag", if(fxheads," {fxheads}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset("."), "desc.here"),desc|firstline)}'
+  +wip = '{label("wip.branch", if(branches,"{branches} "))}{label(ifeq(graphnode,"x","wip.obsolete","wip.{phase}"),"{rev}:{node|short}")}{label("wip.user", " {author|user}")}{label("wip.tags", if(tags," {tags}"))}{label("wip.tags", if(fxheads," {fxheads}"))}{if(bookmarks," ")}{label("wip.bookmarks", if(bookmarks,bookmarks))}{label(ifcontains(rev, revset("parents()"), "wip.here"), " {desc|firstline}")}'
+  +[color]
+  +wip.bookmarks = yellow underline
+  +wip.branch = yellow
+  +wip.draft = green
+  +wip.here = red
+  +wip.obsolete = none
+  +wip.public = blue
+  +wip.tags = yellow
+  +wip.user = magenta
+  +[experimental]
+  +graphshorten = true
   
   Write changes to hgrc file (Yn)?  y
 
   $ cat .hgrc
   [alias]
   wip = log --graph --rev=wip --template=wip
   [revsetalias]
   wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed()
   [templates]
-  wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)}{label("changeset.{phase}", ":")}{label("changeset.{phase}", short(node))} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))}{label("log.tag", if(fxheads," {fxheads}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset("."), "desc.here"),desc|firstline)}'
+  wip = '{label("wip.branch", if(branches,"{branches} "))}{label(ifeq(graphnode,"x","wip.obsolete","wip.{phase}"),"{rev}:{node|short}")}{label("wip.user", " {author|user}")}{label("wip.tags", if(tags," {tags}"))}{label("wip.tags", if(fxheads," {fxheads}"))}{if(bookmarks," ")}{label("wip.bookmarks", if(bookmarks,bookmarks))}{label(ifcontains(rev, revset("parents()"), "wip.here"), " {desc|firstline}")}'
+  [color]
+  wip.bookmarks = yellow underline
+  wip.branch = yellow
+  wip.draft = green
+  wip.here = red
+  wip.obsolete = none
+  wip.public = blue
+  wip.tags = yellow
+  wip.user = magenta
+  [experimental]
+  graphshorten = true
 
 wip alias has pager configuration when pager enabled
 
   $ hg --config configwizard.steps=pager,wip,configchange configwizard
   This wizard will guide you through configuring Mercurial for an optimal
   experience contributing to Mozilla projects.
   
   The wizard makes no changes without your permission.
@@ -113,39 +139,41 @@ wip alias has pager configuration when p
   Which option would you like?  1
   It is common to want a quick view of changesets that are in progress.
   
   The ``hg wip`` command provides such a view.
   
   Example Usage:
   
     $ hg wip
-    o   4084:fcfa34d0387b dminor @
-    |  mozreview: use repository name when displaying treeherder results (bug 1230548) r=mcote
-    | @   4083:786baf6d476a gps
-    | |  mozreview: create child review requests from batch API
-    | o   4082:3f100fa4a94f gps
-    | |  mozreview: copy more read-only processing code; r?smacleod
-    | o   4081:939417680cbe gps
-    |/   mozreview: add web API to submit an entire series of commits (bug 1229468); r?smacleod
+    @  5887 armenzg tip @ Bug 1313661 - Bump pushlog_client to 0.6.0. r=me
+    : o  5885 glob mozreview: Improve the error message when pushing to a submitted/discarded review request (bug 1240725) r?smacleod
+    : o  5884 glob hgext: Support line breaks in hgrb error messages (bug 1240725) r?gps
+    :/
+    o  5883 mars mozreview: add py.test and demonstration tests to mozreview (bug 1312875) r=smacleod
+    : o  5881 glob autoland: log mercurial commands to autoland.log (bug 1313300) r?smacleod
+    :/
+    o  5250 gps ansible/docker-hg-web: set USER variable in httpd process
+    |
+    ~
   
   (Not shown are the colors that help denote the state each changeset
   is in.)
   
   (Relevant config options: alias.wip, revsetalias.wip, templates.wip)
   
   Would you like to install the `hg wip` alias (Yn)?  y
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y
   --- hgrc.old
   +++ hgrc.new
-  @@ -4,3 +4,12 @@
-   wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed()
-   [templates]
-   wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)}{label("changeset.{phase}", ":")}{label("changeset.{phase}", short(node))} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))}{label("log.tag", if(fxheads," {fxheads}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset("."), "desc.here"),desc|firstline)}'
+  @@ -15,3 +15,12 @@
+   wip.user = magenta
+   [experimental]
+   graphshorten = true
   +[extensions]
   +pager =
   +[pager]
   +pager = LESS=FRSXQ less
   +attend-help = true
   +attend-incoming = true
   +attend-outgoing = true
   +attend-status = true
@@ -186,43 +214,48 @@ wip alias ignores old esrs if using fire
   Would you like to activate firefoxtree (Yn)?  y
   It is common to want a quick view of changesets that are in progress.
   
   The ``hg wip`` command provides such a view.
   
   Example Usage:
   
     $ hg wip
-    o   4084:fcfa34d0387b dminor @
-    |  mozreview: use repository name when displaying treeherder results (bug 1230548) r=mcote
-    | @   4083:786baf6d476a gps
-    | |  mozreview: create child review requests from batch API
-    | o   4082:3f100fa4a94f gps
-    | |  mozreview: copy more read-only processing code; r?smacleod
-    | o   4081:939417680cbe gps
-    |/   mozreview: add web API to submit an entire series of commits (bug 1229468); r?smacleod
+    @  5887 armenzg tip @ Bug 1313661 - Bump pushlog_client to 0.6.0. r=me
+    : o  5885 glob mozreview: Improve the error message when pushing to a submitted/discarded review request (bug 1240725) r?smacleod
+    : o  5884 glob hgext: Support line breaks in hgrb error messages (bug 1240725) r?gps
+    :/
+    o  5883 mars mozreview: add py.test and demonstration tests to mozreview (bug 1312875) r=smacleod
+    : o  5881 glob autoland: log mercurial commands to autoland.log (bug 1313300) r?smacleod
+    :/
+    o  5250 gps ansible/docker-hg-web: set USER variable in httpd process
+    |
+    ~
   
   (Not shown are the colors that help denote the state each changeset
   is in.)
   
   (Relevant config options: alias.wip, revsetalias.wip, templates.wip)
   
   Would you like to install the `hg wip` alias (Yn)?  y
   Your config file needs updating.
   Would you like to see a diff of the changes first (Yn)?  y
   --- hgrc.old
   +++ hgrc.new
-  @@ -1,11 +1,12 @@
+  @@ -1,7 +1,7 @@
    [alias]
    wip = log --graph --rev=wip --template=wip
    [revsetalias]
   -wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed()
   +wip = (parents(not public()) or not public() or . or (head() and branch(default))) and (not obsolete() or unstable()^) and not closed() and not (fxheads() - date(-90))
    [templates]
-   wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)}{label("changeset.{phase}", ":")}{label("changeset.{phase}", short(node))} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))}{label("log.tag", if(fxheads," {fxheads}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset("."), "desc.here"),desc|firstline)}'
+   wip = '{label("wip.branch", if(branches,"{branches} "))}{label(ifeq(graphnode,"x","wip.obsolete","wip.{phase}"),"{rev}:{node|short}")}{label("wip.user", " {author|user}")}{label("wip.tags", if(tags," {tags}"))}{label("wip.tags", if(fxheads," {fxheads}"))}{if(bookmarks," ")}{label("wip.bookmarks", if(bookmarks,bookmarks))}{label(ifcontains(rev, revset("parents()"), "wip.here"), " {desc|firstline}")}'
+   [color]
+  @@ -17,6 +17,7 @@
+   graphshorten = true
    [extensions]
    pager =
   +firefoxtree = */hgext/firefoxtree (glob)
    [pager]
    pager = LESS=FRSXQ less
    attend-help = true
   
   Write changes to hgrc file (Yn)?  y