Skip to content
Snippets Groups Projects
  1. Aug 22, 2017
  2. Aug 23, 2017
  3. Aug 17, 2017
    • Martin von Zweigbergk's avatar
      exchange: don't attempt phase exchange if phase-heads was in bundle · 13dc7f29
      Martin von Zweigbergk authored
      The Mercurial core server doesn't yet include phase-heads parts in the
      bundle, but our Google-internal server wants to do
      that. Unfortunately, the usual exchange still happens even if
      phase-heads part is included (including the short-circuited one for
      old/publishing servers). That means that even if our server (again,
      the Google-internal one, but also future Mercurial core servers)
      includes a phase-heads part to indicate that some heads should be
      drafts, that would still get overwritten by the phase updating that
      happens after. So let's fix that by marking the phase step done if we
      receive at least one phase-heads part in the bundle.
      
      Differential Revision: https://phab.mercurial-scm.org/D440
      13dc7f29
  4. Aug 16, 2017
    • Jun Wu's avatar
      pushvars: do not mangle repo state · 800bb35d
      Jun Wu authored
      Setting `repo._shellvars` works but is not a clean way to pass the pushvars
      information from the push command to the exchange operation. Therefore
      change it to actually pass `pushvars` as a push operation argument instead.
      
      This makes third party extension like remotenames easier to support pushvars
      cleanly. The key value parsing and verification code has been moved to a
      lower level so it's harder to be bypassed and easier to be used in
      remotenames which could replace `push` command entirely.
      
      Differential Revision: https://phab.mercurial-scm.org/D423
      800bb35d
  5. Aug 21, 2017
  6. Aug 23, 2017
  7. Aug 13, 2017
  8. Aug 22, 2017
  9. Aug 23, 2017
  10. Aug 22, 2017
  11. Aug 20, 2017
  12. Aug 19, 2017
  13. Aug 22, 2017
  14. Aug 11, 2017
  15. Aug 16, 2017
  16. Aug 18, 2017
  17. Aug 16, 2017
    • Jun Wu's avatar
      demandimport: disable if chg is being used · 3cfc9070
      Jun Wu authored
      In chg's case, making modules lazily loaded could actually slow down things
      since chg pre-imports them. Therefore disable demandimport if chg is being
      used.
      
      This is not done by setting `HGDEMANDIMPORT` chg client-side because that
      has side-effects on child processes (hooks, etc).
      
      Differential Revision: https://phab.mercurial-scm.org/D351
      3cfc9070
  18. Aug 18, 2017
  19. Aug 15, 2017
    • Danny Hooper's avatar
      log: add a "graphwidth" template variable · 6f6c8788
      Danny Hooper authored
      Wrapping text in templates for 'hg log --graph' can't be done very well,
      because the template doesn't know how wide the graph drawing is. The edge
      drawing function needs to know the number of lines in the template output, so
      we need to also determine how wide that drawing would be before we call the
      edgefn or evaluate the template.
      
      This patch makes edgefn compute the graph width and pass it into the template
      so that we can do something like this:
      
      COLUMNS=10 hg log --graph --template "{fill(desc, termwidth - graphwidth)}"
      @  a a a a
      |  a a a a
      |  a a a a
      o    a a a
      |\   a a a
      | |  a a a
      | |  a a a
      
      Using extensions to do this would be relatively complicated due to a lack of
      hooks in this area of the code.
      
      In the future it may make sense to have a more generic "textwidth" that tells
      you how many columns you can expect to fill without causing the terminal to
      wrap your output. I'm not sure there are other situations to motivate this yet,
      or if it is entirely feasible.
      
      Differential Revision: https://phab.mercurial-scm.org/D360
      6f6c8788
Loading