Skip to content
Snippets Groups Projects
  1. Oct 13, 2015
  2. Oct 14, 2015
    • Gregory Szorc's avatar
      clonebundles: advertise clone bundles feature to clients · 23c0da28
      Gregory Szorc authored
      Server operators that have enabled clone bundles probably want clients
      to use it. This patch introduces a feature that will insert a bundle2
      "output" part that advertises the existence of the clone bundles
      feature to clients that aren't using it.
      
      The server uses the "cbattempted" argument to "getbundle" to determine
      whether a client supports clone bundles and to avoid sending the message
      to clients that failed the clone bundle for whatever reason.
      23c0da28
    • Gregory Szorc's avatar
      exchange: advertise if a clone bundle was attempted · 704818fb
      Gregory Szorc authored
      The client now sends a "cbattempted" boolean flag to the "getbundle"
      wire protocol command to tell the server whether a clone bundle was
      attempted.
      
      The presence of this flag will enable the server to conditionally emit a
      bundle2 "output" part advertising the availability of clone bundles to
      compatible clients that don't have it enabled.
      704818fb
  3. Oct 13, 2015
  4. Oct 14, 2015
    • Gregory Szorc's avatar
      6a854f55
    • Gregory Szorc's avatar
      wireproto: properly parse false boolean args (BC) · 3e7f6756
      Gregory Szorc authored
      The client represents boolean arguments as '0' and '1'.
      bool('0') == bool('1') == True, so a simple bool(val) isn't sufficient
      for converting the argument back to a bool type.
      
      Currently, "obsmarkers" is the only boolean argument to getbundle.
      
      I /think/ the only place where we currently set the "obsmarkers"
      argument is during bundle2 pulls. As a result of this bug, the server
      /might/ be sending obsolete markers bundle2 part(s) to clients that
      don't request them. That is why I marked this BC.
      
      Surprisingly there was no test fall out from this change. I suspect a
      lapse in test coverage.
      3e7f6756
  5. Oct 15, 2015
  6. Oct 05, 2015
    • Pierre-Yves David's avatar
      update: introduce a 'UpdateAbort' exception · 634666c4
      Pierre-Yves David authored
      The 'postincoming' function used by 'hg pull --update' and 'hg unbundle' is
      catching 'Abort' exceptions to intercept failed update. This feel a bit too
      wide to me, so I'm introducing a more precise exception to specify update
      destination issues.
      634666c4
  7. Oct 06, 2015
    • Pierre-Yves David's avatar
      update: "deprecate" call to 'merge.update' without a destination · 08b06824
      Pierre-Yves David authored
      Now that all internal callers pre-compute and set a destination at a higher level
      it feels like we can kill this API. This will allow us to simplify this
      function. However I feel like this is a bit too central and critical to break
      now. I'm adding a devel warning to let extension make catch this in the next
      cycle.
      08b06824
  8. Oct 15, 2015
    • Christian Delahousse's avatar
      shelve: delete shelve statefile on any exception during abort · ca8170b5
      Christian Delahousse authored
      When a user's repository is in an unfinished unshelve state and they choose to
      abort, at a minimum, the repo should be out of that state. We've found
      situations where the user could not leave the state unless manually deleting the
      state file. This fix ensures that no matter what exception may be raised during
      the abort, the shelved state file will be deleted, the user will be out of the
      unshelve state and they can get their repository into a workable condition.
      ca8170b5
    • Gregory Szorc's avatar
      highlight: add option to prevent content-only based fallback · 7a3f6490
      Gregory Szorc authored
      When Mozilla enabled Pygments on hg.mozilla.org, we got a lot of weirdly
      colorized files. Upon further investigation, the hightlight extension
      is first attempting a filename+content based match then falling back to a
      purely content-driven detection mode in Pygments. Sounds good in theory.
      
      Unfortunately, Pygments' content-driven detection establishes no minimum
      threshold for returning a lexer. Furthermore, the detection code for
      a number of languages is very liberal. For example, ActionScript 3 will
      return a confidence of 0.3 (out of 1.0) if the first 1k of the file
      we pass in matches the regex "\w+\s*:\s*\w"! Python matches on
      "import ". It's no coincidence that a number of our extension-less files
      were getting highlighted improperly.
      
      This patch adds an option to have the highlighter not fall back to
      purely content-based detection when filename+content detection failed.
      This can be enabled to render unlighted text instead of taking the risk
      that unknown file types are highlighted incorrectly. The old behavior is
      still the default.
      7a3f6490
    • Gregory Szorc's avatar
      highlight: inline checkfctx() · 0d93df4d
      Gregory Szorc authored
      It is only used once. pygmentize() is pretty small. Let's just inline
      it.
      0d93df4d
    • Gregory Szorc's avatar
      highlight: consolidate duplicate code · 613d850c
      Gregory Szorc authored
      I'm adding some logic in a future patch and this will make it so I only
      have to add it once.
      613d850c
  9. Oct 13, 2015
    • Christian Delahousse's avatar
      rebase: properly abort when destination is public (issue4896) · e9b3d523
      Christian Delahousse authored
      After rebasing a set of changes onto a public changeset and having the first one
      be skipped, if you try to abort, the operation fails. This fix adds a check to
      disallow the target rev into the dstates list within the abort function. This
      list is checked for immutable states before the rest of abort does its thing.
      e9b3d523
  10. Oct 14, 2015
  11. Oct 15, 2015
  12. Oct 14, 2015
  13. Oct 13, 2015
    • Ryan McElroy's avatar
      rebase: factor out nothing to rebase return code · 66dc39cd
      Ryan McElroy authored
      A rebase call that results in nothing to rebase might be considered successful
      in some contexts. This factors out the return code from places where hg
      determines that there is nothing to rebase, so an extenion might change this
      return code to be something that would allow scripts to run without seeing this
      as an error.
      66dc39cd
  14. Oct 14, 2015
    • Anton Shestakov's avatar
      gitweb: visually highlight source lines when hovering over line numbers · ab2cd800
      Anton Shestakov authored
      Due to how the line links now reside outside of the source lines, hovering over
      line numbers doesn't count as hovering over the appropriate source line. It can
      be worked around by using a "+" css selector. However, it's necessary to
      reorder the elements and put <a> before <span> (which is actually quite
      logical). It works without further css tweaks because <a> is already
      absolute-positioned and so the order doesn't matter visually.
      ab2cd800
  15. Oct 13, 2015
  16. Oct 14, 2015
    • Anton Shestakov's avatar
      monoblue: visually highlight source lines when hovering over line numbers · ceb44643
      Anton Shestakov authored
      Due to how the line links now reside outside of the source lines, hovering over
      line numbers doesn't count as hovering over the appropriate source line. It can
      be worked around by using a "+" css selector. However, it's necessary to
      reorder the elements and put <a> before <span> (which is actually quite
      logical). It works without further css tweaks because <a> is already
      absolute-positioned and so the order doesn't matter visually.
      ceb44643
    • Anton Shestakov's avatar
      monoblue: make the size of line links bigger to cover line numbers better · 721274ce
      Anton Shestakov authored
      Due to how the line numbers in monoblue are formed (via css counters), the size
      of the area with the numbers and the size of the actually clickable links are
      not tied together well enough. Before this patch, there were noticeable "gaps"
      between line links - clicking on the bottom part of a visible line number did
      nothing as opposed to selecting this line.
      
      Let's set font-size for everything in pre.sourcelines so that it also affects
      the links and then add a bit of padding to them so compensate for layout
      differences.
      
      This way the sizes are still not 100% the same, but should be very close.
      721274ce
  17. Sep 26, 2015
    • Anton Shestakov's avatar
      gitweb: don't drop current revision context on graph page · e901df65
      Anton Shestakov authored
      In hgweb, some pages have a context of current revision; e.g. changelog and
      shortlog show changesets starting from this current revision. However, some
      gitweb templates were dropping current revision from some urls _to_ /graph page
      and _on_ that page. This patch fixes it.
      e901df65
  18. Oct 13, 2015
    • Sean Farley's avatar
      util: also catch IndexError · 6331a0c3
      Sean Farley authored
      This makes life so, so much easier for hgwatchman, which provides a named tuple
      but throws an IndexError instead of a TypeError.
      6331a0c3
  19. Oct 14, 2015
  20. Oct 12, 2015
  21. Aug 19, 2015
  22. Aug 21, 2015
  23. Oct 12, 2015
  24. Oct 01, 2015
Loading