| Submitter | Manuel Jacob |
|---|---|
| Date | June 9, 2020, 3:25 a.m. |
| Message ID | <6c8384afbf770be21674.1591673157@tmp> |
| Download | mbox | patch |
| Permalink | /patch/46485/ |
| State | Accepted |
| Headers | show |
Comments
Good catch, LGTM On 6/9/20 5:25 AM, Manuel Jacob wrote: > # HG changeset patch > # User Manuel Jacob <me@manueljacob.de> > # Date 1591673085 -7200 > # Tue Jun 09 05:24:45 2020 +0200 > # Branch stable > # Node ID 6c8384afbf770be2167478fff3cb9b92e1182a06 > # Parent 1f114c797961733ea03d0de88390f9555a7edef4 > resourceutil: fix location of line comments > > These comments slipped out of position when the sources where formatted with > black in 2372284d9457. > > diff -r 1f114c797961 -r 6c8384afbf77 mercurial/utils/resourceutil.py > --- a/mercurial/utils/resourceutil.py Thu Apr 30 00:33:00 2020 -0400 > +++ b/mercurial/utils/resourceutil.py Tue Jun 09 05:24:45 2020 +0200 > @@ -23,10 +23,10 @@ > (portable, not much used). > """ > return ( > - pycompat.safehasattr(sys, "frozen") > - or pycompat.safehasattr(sys, "importers") # new py2exe > - or imp.is_frozen("__main__") # old py2exe > - ) # tools/freeze > + pycompat.safehasattr(sys, "frozen") # new py2exe > + or pycompat.safehasattr(sys, "importers") # old py2exe > + or imp.is_frozen("__main__") # tools/freeze > + ) > > > # the location of data files matching the source code > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >
On Tue, Jun 09, 2020 at 01:13:26PM +0200, Pierre-Yves David wrote: > Good catch, LGTM > > On 6/9/20 5:25 AM, Manuel Jacob wrote: > > # HG changeset patch > > # User Manuel Jacob <me@manueljacob.de> > > # Date 1591673085 -7200 > > # Tue Jun 09 05:24:45 2020 +0200 > > # Branch stable > > # Node ID 6c8384afbf770be2167478fff3cb9b92e1182a06 > > # Parent 1f114c797961733ea03d0de88390f9555a7edef4 > > resourceutil: fix location of line comments queued, thanks
Patch
diff -r 1f114c797961 -r 6c8384afbf77 mercurial/utils/resourceutil.py --- a/mercurial/utils/resourceutil.py Thu Apr 30 00:33:00 2020 -0400 +++ b/mercurial/utils/resourceutil.py Tue Jun 09 05:24:45 2020 +0200 @@ -23,10 +23,10 @@ (portable, not much used). """ return ( - pycompat.safehasattr(sys, "frozen") - or pycompat.safehasattr(sys, "importers") # new py2exe - or imp.is_frozen("__main__") # old py2exe - ) # tools/freeze + pycompat.safehasattr(sys, "frozen") # new py2exe + or pycompat.safehasattr(sys, "importers") # old py2exe + or imp.is_frozen("__main__") # tools/freeze + ) # the location of data files matching the source code