| Submitter | Chris Jerdonek |
|---|---|
| Date | Dec. 31, 2013, 8:56 a.m. |
| Message ID | <542bce15a4a62253ee2d.1388480179@stonewall.local> |
| Download | mbox | patch |
| Permalink | /patch/3254/ |
| State | Superseded |
| Delegated to: | Matt Mackall |
| Headers | show |
Comments
On Tue, Dec 31, 2013 at 12:56:19AM -0800, Chris Jerdonek wrote: > # HG changeset patch > # User Chris Jerdonek <chris.jerdonek@gmail.com> > # Date 1388479602 28800 > # Tue Dec 31 00:46:42 2013 -0800 > # Node ID 542bce15a4a62253ee2da4108785a03c89826953 > # Parent 17bfa5d7637f2d312e6cf375d937d6de6de931d2 > debuginstall: change "checking" to "showing" for Python lib info I like the series, but I'll withhold final review since mpm already started. Looks superficially reasonable. > > This commit changes the output of "hg debuginstall" by changing the word > "checking" in the line that references "Python lib". We do this because, > unlike the other lines using the word "checking," no check follows the > display of this information. > > Below is an example of what the output looks like after this change. > The marked line is the changed output line: > > $ hg debuginstall > checking encoding (UTF-8)... > showing Python executable (/Users/chris/.virtualenvs/default/bin/python) > showing Python version (2.7.6) > -->showing Python lib (/Users/chris/.virtualenvs/default/lib/python2.7) > checking installed modules (/Users/chris/mercurial)... > checking templates (/Users/chris/mercurial/templates)... > checking commit editor... > checking username... > no problems detected > > diff --git a/mercurial/commands.py b/mercurial/commands.py > --- a/mercurial/commands.py > +++ b/mercurial/commands.py > @@ -2061,7 +2061,7 @@ > ui.status(_("showing Python executable (%s)\n") % sys.executable) > ui.status(_("showing Python version (%s)\n") > % ("%s.%s.%s" % sys.version_info[:3])) > - ui.status(_("checking Python lib (%s)...\n") > + ui.status(_("showing Python lib (%s)\n") > % os.path.dirname(os.__file__)) > > # compiled modules > diff --git a/tests/test-install.t b/tests/test-install.t > --- a/tests/test-install.t > +++ b/tests/test-install.t > @@ -3,7 +3,7 @@ > checking encoding (ascii)... > showing Python executable (*) (glob) > showing Python version (2.*) (glob) > - checking Python lib (*lib*)... (glob) > + showing Python lib (*lib*) (glob) > checking installed modules (*mercurial)... (glob) > checking templates (*mercurial?templates)... (glob) > checking commit editor... > @@ -15,7 +15,7 @@ > checking encoding (ascii)... > showing Python executable (*) (glob) > showing Python version (2.*) (glob) > - checking Python lib (*lib*)... (glob) > + showing Python lib (*lib*) (glob) > checking installed modules (*mercurial)... (glob) > checking templates (*mercurial?templates)... (glob) > checking commit editor... > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2061,7 +2061,7 @@ ui.status(_("showing Python executable (%s)\n") % sys.executable) ui.status(_("showing Python version (%s)\n") % ("%s.%s.%s" % sys.version_info[:3])) - ui.status(_("checking Python lib (%s)...\n") + ui.status(_("showing Python lib (%s)\n") % os.path.dirname(os.__file__)) # compiled modules diff --git a/tests/test-install.t b/tests/test-install.t --- a/tests/test-install.t +++ b/tests/test-install.t @@ -3,7 +3,7 @@ checking encoding (ascii)... showing Python executable (*) (glob) showing Python version (2.*) (glob) - checking Python lib (*lib*)... (glob) + showing Python lib (*lib*) (glob) checking installed modules (*mercurial)... (glob) checking templates (*mercurial?templates)... (glob) checking commit editor... @@ -15,7 +15,7 @@ checking encoding (ascii)... showing Python executable (*) (glob) showing Python version (2.*) (glob) - checking Python lib (*lib*)... (glob) + showing Python lib (*lib*) (glob) checking installed modules (*mercurial)... (glob) checking templates (*mercurial?templates)... (glob) checking commit editor...
# HG changeset patch # User Chris Jerdonek <chris.jerdonek@gmail.com> # Date 1388479602 28800 # Tue Dec 31 00:46:42 2013 -0800 # Node ID 542bce15a4a62253ee2da4108785a03c89826953 # Parent 17bfa5d7637f2d312e6cf375d937d6de6de931d2 debuginstall: change "checking" to "showing" for Python lib info This commit changes the output of "hg debuginstall" by changing the word "checking" in the line that references "Python lib". We do this because, unlike the other lines using the word "checking," no check follows the display of this information. Below is an example of what the output looks like after this change. The marked line is the changed output line: $ hg debuginstall checking encoding (UTF-8)... showing Python executable (/Users/chris/.virtualenvs/default/bin/python) showing Python version (2.7.6) -->showing Python lib (/Users/chris/.virtualenvs/default/lib/python2.7) checking installed modules (/Users/chris/mercurial)... checking templates (/Users/chris/mercurial/templates)... checking commit editor... checking username... no problems detected