D259: label: rename log.trouble into log.instability

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

D259: label: rename log.trouble into log.instability

dsp (David Soria Parra)
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The renaming is done according to
  https://www.mercurial-scm.org/wiki/CEDVocabulary.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D259

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/templates/map-cmdline.default
  tests/test-obsolete.t

CHANGE DETAILS

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -951,15 +951,15 @@
   [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset:   7:50c51b361e60]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
-  [log.trouble|instability: orphan, phase-divergent]
+  [log.instability|instability: orphan, phase-divergent]
   [log.summary|summary:     add babar]
   
 
   $ hg log -T default -r 'phasedivergent()' --color=debug
   [log.changeset changeset.draft changeset.unstable instability.orphaninstability.phase-divergent|changeset:   7:50c51b361e60]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
-  [log.trouble|instability: orphan, phase-divergent]
+  [log.instability|instability: orphan, phase-divergent]
   [log.summary|summary:     add babar]
   
 
diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default
--- a/mercurial/templates/map-cmdline.default
+++ b/mercurial/templates/map-cmdline.default
@@ -68,7 +68,7 @@
 ldate = '{label("log.date",
                 "date:        {date|date}")}\n'
 
-ltroubles = '{if(instabilities, "{label('log.trouble',
+ltroubles = '{if(instabilities, "{label('log.instability',
                                    'instability: {join(instabilities, ", ")}')}\n")}'
 
 extra = '{label("ui.debug log.extra",
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1581,7 +1581,7 @@
             # i18n: column positioning for "hg log"
             instabilities = ctx.instabilities()
             self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
-                          label='log.trouble')
+                          label='log.instability')
 
         self._exthook(ctx)
 



To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

D259: label: rename log.trouble into log.instability

dsp (David Soria Parra)
lothiraldan added a reviewer: quark.
lothiraldan added a subscriber: quark.
lothiraldan added a comment.


  Here are hopefully the last patches of this series.
 
  @quark I tried running the hg-experimental (https://bitbucket.org/facebook/hg-experimental) tests against this series.
 
  I think I don't have the right environment setup, I have bunch of errors that seems related to my shell, not having a memcache available and not having the remotenames extension. Apart from these errors I didn't saw test output changes that seems related to this series.
 
  test-lfs.t output changed with this series but also on mercurial stable but it could be my test environment again.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D259

To: lothiraldan, #hg-reviewers, quark
Cc: quark, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

D259: label: rename log.trouble into log.instability

dsp (David Soria Parra)
In reply to this post by dsp (David Soria Parra)
quark added a comment.


  In https://phab.mercurial-scm.org/D259#4135, @lothiraldan wrote:
 
  > Here are hopefully the last patches of this series.
  >
  > @quark I tried running the hg-experimental (https://bitbucket.org/facebook/hg-experimental) tests against this series.
  >
  > I think I don't have the right environment setup, I have bunch of errors that seems related to my shell, not having a memcache available and not having the remotenames extension. Apart from these errors I didn't saw test output changes that seems related to this series.
 
 
  Cool. Thanks!
 
  Ideally those tests should be skipped automatically. I think there is some code detecting remotenames and skip accordingly.
 
  > test-lfs.t output changed with this series but also on mercurial stable but it could be my test environment again.
 
  lfs is probably unrelated here.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D259

To: lothiraldan, #hg-reviewers, quark
Cc: quark, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

D259: label: rename log.trouble into log.instability

dsp (David Soria Parra)
In reply to this post by dsp (David Soria Parra)
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdb6b666ce1e6: label: rename log.trouble into log.instability (authored by lothiraldan).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D259?vs=604&id=813

REVISION DETAIL
  https://phab.mercurial-scm.org/D259

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/templates/map-cmdline.default
  tests/test-obsolete.t

CHANGE DETAILS

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -951,15 +951,15 @@
   [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent|changeset:   7:50c51b361e60]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
-  [log.trouble|instability: orphan, phase-divergent]
+  [log.instability|instability: orphan, phase-divergent]
   [log.summary|summary:     add babar]
   
 
   $ hg log -T default -r 'phasedivergent()' --color=debug
   [log.changeset changeset.draft changeset.unstable instability.orphaninstability.phase-divergent|changeset:   7:50c51b361e60]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
-  [log.trouble|instability: orphan, phase-divergent]
+  [log.instability|instability: orphan, phase-divergent]
   [log.summary|summary:     add babar]
   
 
diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default
--- a/mercurial/templates/map-cmdline.default
+++ b/mercurial/templates/map-cmdline.default
@@ -68,7 +68,7 @@
 ldate = '{label("log.date",
                 "date:        {date|date}")}\n'
 
-ltroubles = '{if(instabilities, "{label('log.trouble',
+ltroubles = '{if(instabilities, "{label('log.instability',
                                    'instability: {join(instabilities, ", ")}')}\n")}'
 
 extra = '{label("ui.debug log.extra",
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1687,7 +1687,7 @@
             # i18n: column positioning for "hg log"
             instabilities = ctx.instabilities()
             self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
-                          label='log.trouble')
+                          label='log.instability')
 
         self._exthook(ctx)
 



To: lothiraldan, #hg-reviewers, quark
Cc: quark, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Loading...