Skip to content
Snippets Groups Projects
  1. Dec 08, 2020
  2. Dec 07, 2020
  3. Dec 08, 2020
  4. Dec 07, 2020
  5. Dec 01, 2020
  6. Nov 21, 2020
    • Matt Harbison's avatar
      phabricator: allow local revisions to be specified with `phabupdate` · 9624bf05
      Matt Harbison authored
      It's way easier and less error prone to specify a revset after importing a
      series than to manually type in a series of Differentials.
      
      Unlike most revision oriented commands, this requires the `--rev` option
      explicitly because the existing `DREVSPEC` doesn't need to have the leading 'D',
      and therefore the meaning is ambiguous.  I wouldn't have a problem giving
      precedence to the local revnum, but `phabread` and `phabimport` also use
      DREVSPEC, and local revisions make no sense there.  I would be fine with
      modifying that definition to require the leading 'D', but I'm not sure how many
      people are used to not specifying it.
      
      Differential Revision: https://phab.mercurial-scm.org/D9356
      9624bf05
  7. Nov 30, 2020
  8. Dec 02, 2020
  9. Nov 30, 2020
  10. Dec 03, 2020
  11. Dec 02, 2020
  12. Nov 27, 2020
  13. Dec 02, 2020
    • Kyle Lippincott's avatar
      statprof: separate functions and "line", assume 4 digit line numbers · 8b0a3ff5
      Kyle Lippincott authored
      Previously, the profile output looked like this (I've removed many lines that
      are mostly inconsequential):
      
      ```
      | 100.0%  0.02s  hg:             <module>          line 43:  dispatch.run()
      | 100.0%  0.02s  dispatch.py:    run               line 115:  status = dispatch(req)
      | 100.0%  0.02s  dispatch.py:    _runcatchfunc     line 432:  return _dispatch(req)
       \ 50.0%  0.01s  dispatch.py:    _dispatch         line 1228:  return runcommand(
         | 50.0%  0.01s  dispatch.py:    runcommand      line 883:  ret = _runcommand(ui, optio...
         | 50.0%  0.01s  dispatch.py:    _runcommand     line 1240:  return cmdfunc()
         | 50.0%  0.01s  localrepo.py:   __getitem__     line 1670:  quick_access = self._quick_...
         | 50.0%  0.01s  localrepo.py:   _quick_access_changeidline 1650:  return self._quick_access_c...
         | 50.0%  0.01s  localrepo.py:   __get__         line 179:  return getattr(unfi, self.n...
         | 50.0%  0.01s  util.py:        __get__         line 1747:  result = self.func(obj)
         | 50.0%  0.01s  localrepo.py:   _quick_access_changeid_wcline  1611:  cl = self.unfiltered().chan...
         | 50.0%  0.01s  localrepo.py:   __get__         line 110:  return super(_basefilecache...
         | 50.0%  0.01s  util.py:        __getattribute__line 245:  self.__spec__.loader.exec_m...
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: exec_moduleline            783:
         | 50.0%  0.01s  <frozen importlib._bootstrap>: _call_with_frames_removedline                 219:
         | 50.0%  0.01s  changelog.py:   <module>        line 376:  class changelog(revlog.revl...
         | 50.0%  0.01s  util.py:        __getattribute__line 245:  self.__spec__.loader.exec_m...
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: exec_moduleline            779:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: get_codeline         868:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: path_statsline           1012:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: _path_statline           87:
      ```
      
      This has a few problems, though I'm only addressing some of them.
      
      1.  If the stuff before "line ###" is long, there's no separation between the
          function name and the "line" string.
      2.  If the stuff before "line ###" is really long, there's excessive separation
          between the "line" string and the line number.
      3.  We frequently have 4-digit line numbers, the code on the right wasn't
          dynamically indented and ended up quite messy looking.
      
      To solve these problems, I've added a ", " prefix before "line" iff it would
      otherwise not have any separation such as spaces. I've added a 'max' so that we
      never use a negative width (which is the cause of problem #2 above), and I've
      added a default assumption of 4 digit line numbers (but again using a 'max' so
      this shouldn't cause problems if we go beyond that.
      
      With these changes, it now looks like this:
      
      ```
      | 100.0%  0.02s  hg:             <module>          line 43:   dispatch.run()
      | 100.0%  0.02s  dispatch.py:    run               line 115:  status = dispatch(req)
      | 100.0%  0.02s  dispatch.py:    _runcatchfunc     line 432:  return _dispatch(req)
       \ 50.0%  0.01s  dispatch.py:    _dispatch         line 1228: return runcommand(
         | 50.0%  0.01s  dispatch.py:    runcommand      line 883:  ret = _runcommand(ui, optio...
         | 50.0%  0.01s  dispatch.py:    _runcommand     line 1240: return cmdfunc()
         | 50.0%  0.01s  localrepo.py:   __getitem__     line 1670: quick_access = self._quick_...
         | 50.0%  0.01s  localrepo.py:   _quick_access_changeid, line 1650: return self._quick_access_c...
         | 50.0%  0.01s  localrepo.py:   __get__         line 179:  return getattr(unfi, self.n...
         | 50.0%  0.01s  util.py:        __get__         line 1747: result = self.func(obj)
         | 50.0%  0.01s  localrepo.py:   _quick_access_changeid_wc, line 1611: cl = self.unfiltered().chan...
         | 50.0%  0.01s  localrepo.py:   __get__         line 110:  return super(_basefilecache...
         | 50.0%  0.01s  util.py:        __getattribute__, line 245:  self.__spec__.loader.exec_m...
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: exec_module, line 783:
         | 50.0%  0.01s  <frozen importlib._bootstrap>: _call_with_frames_removed, line 219:
         | 50.0%  0.01s  changelog.py:   <module>        line 376:  class changelog(revlog.revl...
         | 50.0%  0.01s  util.py:        __getattribute__, line 245:  self.__spec__.loader.exec_m...
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: exec_module, line 779:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: get_code, line 868:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: path_stats, line 1012:
         | 50.0%  0.01s  <frozen importlib._bootstrap_external>: _path_stat, line 87:
      ```
      
      Differential Revision: https://phab.mercurial-scm.org/D9511
      8b0a3ff5
    • Kyle Lippincott's avatar
      statprof: fix off-by-one-line error in output · 068307b6
      Kyle Lippincott authored
      martinvonz claims they thought that this was intentional, but couldn't remember
      the reasoning for it. I can't understand why it would be preferable, and I
      didn't see anything in the comments in the file about why this would be useful,
      so I'm hopefully not breaking anything by "fixing" it.
      
      ### Old output
      
      ```
      | 100.0%  0.01s  dispatch.py:    run               line 43:  dispatch.run()
      | 100.0%  0.01s  dispatch.py:    dispatch          line 115:  status = dispatch(req)
      | 100.0%  0.01s  dispatch.py:    _runcatch         line 266:  ret = _runcatch(req) or 0
      | 100.0%  0.01s  dispatch.py:    _callcatch        line 442:  return _callcatch(ui, _runc...
      | 100.0%  0.01s  scmutil.py:     callcatch         line 451:  return scmutil.callcatch(ui...
      | 100.0%  0.01s  dispatch.py:    _runcatchfunc     line 155:  return func()
      | 100.0%  0.01s  dispatch.py:    _dispatch         line 432:  return _dispatch(req)
      | 100.0%  0.01s  hg.py:          repository        line 1179:  repo = hg.repository(
      | 100.0%  0.01s  hg.py:          _peerorrepo       line 221:  peer = _peerorrepo(
      | 100.0%  0.01s  util.py:        __getattribute__  line 188:  obj = _peerlookup(path).ins...
      | 100.0%  0.01s  localrepo.py:   makelocalrepositoryline 3227:  return makelocalrepository(...
      | 100.0%  0.01s  localrepo.py:   __init__          line 683:  return cls(
      | 100.0%  0.01s  util.py:        __getattribute__  line 1262:  self._extrafilterid = repov...
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: exec_moduleline          245:  self.__spec__.loader.exec_m...
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: get_codeline       779:
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: path_statsline         868:
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: _path_statline         1012:
      ```
      
      ### New output
      
      ```
      | 100.0%  0.01s  hg:             <module>          line 43:  dispatch.run()
      | 100.0%  0.01s  dispatch.py:    run               line 115:  status = dispatch(req)
      | 100.0%  0.01s  dispatch.py:    dispatch          line 266:  ret = _runcatch(req) or 0
      | 100.0%  0.01s  dispatch.py:    _runcatch         line 442:  return _callcatch(ui, _runc...
      | 100.0%  0.01s  dispatch.py:    _callcatch        line 451:  return scmutil.callcatch(ui...
      | 100.0%  0.01s  scmutil.py:     callcatch         line 155:  return func()
      | 100.0%  0.01s  dispatch.py:    _runcatchfunc     line 432:  return _dispatch(req)
      | 100.0%  0.01s  dispatch.py:    _dispatch         line 1179:  repo = hg.repository(
      | 100.0%  0.01s  hg.py:          repository        line 221:  peer = _peerorrepo(
      | 100.0%  0.01s  hg.py:          _peerorrepo       line 188:  obj = _peerlookup(path).ins...
      | 100.0%  0.01s  localrepo.py:   instance          line 3227:  return makelocalrepository(...
      | 100.0%  0.01s  localrepo.py:   makelocalrepositoryline 683:  return cls(
      | 100.0%  0.01s  localrepo.py:   __init__          line 1262:  self._extrafilterid = repov...
      | 100.0%  0.01s  util.py:        __getattribute__  line 245:  self.__spec__.loader.exec_m...
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: exec_moduleline          779:
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: get_codeline       868:
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: path_statsline         1012:
      | 100.0%  0.01s  <frozen importlib._bootstrap_external>: _path_statline         87:
      ```
      
      Differential Revision: https://phab.mercurial-scm.org/D9510
      068307b6
    • Pierre-Yves David's avatar
      run-tests: allow some slack about 'waiting on lock' message · f44b9c72
      Pierre-Yves David authored
      It is common to run the tests on very loaded machine when concurrent run might
      take a bit longer. Such message are usually harmless, but anoying as they break
      the tests.
      
      Test that explicitly depends on this value have been adjusted. This make them
      more robust anyway.
      
      A fun case was `test-clone-pull-corruption.t` which, without the previous
      changeset introducing extra flushing, ended use having a line 31 (`pulling from
      ../source`) changing order because the warning message was no longer flushing
      stdin before using stderr (stderr being invisible in the test).
      
      Differential Revision: https://phab.mercurial-scm.org/D9507
      f44b9c72
    • Pierre-Yves David's avatar
      tests: explicitly skip the lock warning in some remotefilelog tests · 7a795489
      Pierre-Yves David authored
      The output was conditional zed, so lets official skip it instead.
      
      Differential Revision: https://phab.mercurial-scm.org/D9505
      7a795489
    • Pierre-Yves David's avatar
      tests: use the right python when running dummyssh for narrow · d72378f9
      Pierre-Yves David authored
      some plateform no longer have a `python` executable.
      
      Differential Revision: https://phab.mercurial-scm.org/D9504
      d72378f9
    • Martin von Zweigbergk's avatar
    • Martin von Zweigbergk's avatar
      tests: show that in-memory rebase leaves state when working copy is dirty · d767f71b
      Martin von Zweigbergk authored
      When in-memory rebase falls back to on-disk rebase, it checks if the
      working copy is dirty. If it is, it aborts the rebase. However, it
      leaves the rebase state on disk. I broke it in feffeb18d412 (rebase:
      teach in-memory rebase to not restart with on-disk rebase on conflict,
      2020-09-18).
      
      Differential Revision: https://phab.mercurial-scm.org/D9508
      d767f71b
  14. Nov 23, 2020
    • Pulkit Goyal's avatar
      share: show warning if share is outdated while source supports share-safe · 49b4ab1d
      Pulkit Goyal authored
      Previous patches in the series and some which are already committed implements
      share safe functionality where config and requirements will be shared too.
      
      Rolling this feature has a problem that existing shares may never upgrade as
      they will never learn about the new config. To help the transition, we show a
      warning message if the share source supports share-safe mechanism. This provides
      the source repo ability to upgrade and pass on the message to shares that you
      should reshare and upgrade too.
      
      Differential Revision: https://phab.mercurial-scm.org/D9369
      49b4ab1d
  15. Oct 16, 2020
  16. Jun 25, 2020
  17. Nov 30, 2020
  18. Nov 27, 2020
  19. Nov 23, 2020
  20. Sep 18, 2019
  21. Nov 28, 2020
Loading