Skip to content
Snippets Groups Projects
  1. Oct 11, 2016
    • Gábor Stefanik's avatar
      checkcopies: add logic to handle remotebase · b94b92f0
      Gábor Stefanik authored
      As the two _checkcopies passes' ranges are separated by tca, not base,
      only one of the two passes will actually encounter the base.
      Pass "remotebase" to the other pass to let it know not to expect passing
      over the base. This is required for handling a few unusual rename cases.
      b94b92f0
  2. Oct 04, 2016
    • Gábor Stefanik's avatar
      mergecopies: add logic to process incomplete data · a005c33d
      Gábor Stefanik authored
      We first combine incomplete copies on the two sides of the topological CA
      into complete copies.
      Any leftover incomplete copies are then combined with the incomplete
      divergences to reconstruct divergences spanning over the topological CA.
      Finally we promote any divergences falsely flagged as incomplete to full
      divergences.
      
      Right now, there is nothing generating incomplete copy/divergence data,
      so this code does nothing. Changes to _checkcopies to populate these
      dicts are coming later in this series.
      a005c33d
  3. Oct 12, 2016
    • Gábor Stefanik's avatar
      checkcopies: handle divergences contained entirely in tca::ctx · 856ead83
      Gábor Stefanik authored
      During a graftlike merge, _checkcopies runs from ctx to tca, possibly
      passing over the merge base. If there is a rename both before and after
      the base, then we're actually dealing with divergent renames.
      If there is no rename on the other side of tca, then the divergence is
      contained entirely in the range of one _checkcopies invocation, and
      should be detected "in the loop" without having to rely on the other
      _checkcopies pass.
      856ead83
  4. Aug 25, 2016
    • Gábor Stefanik's avatar
      update: enable copy tracing for backwards and non-linear updates · a2804ddc
      Gábor Stefanik authored
      As a followup to the issue4028 series, this fixes a variant of the issue
      that can occur when updating with uncommited local changes.
      
      The duplicated .hgsub warning is coming from wc.dirty(). We would previously
      skip this call because it's only relevant when we're going to perform copy
      tracing, which we didn't do before.
      
      The change to the update summary line is because we now treat the rename as a
      proper rename (which counts as a change), rather than an add+delete pair
      (which counts as a change and a delete).
      a2804ddc
  5. Sep 26, 2016
  6. Aug 20, 2016
  7. Oct 13, 2016
    • Gábor Stefanik's avatar
      mergecopies: invoke _computenonoverlap for both base and tca during merges · 0accd5a5
      Gábor Stefanik authored
      The algorithm of _checkcopies can only walk backwards in the DAG, never
      forward. Because of this, the two _checkcopies patches need to run from
      their respective endpoints to the TCA to cover the entire subgraph where
      the merge is being performed. However, detection of files new in both
      endpoints, as well as directory rename detection, need to run with respect
      to the merge base, so we need lists of new files both from the TCA's and
      the merge base's viewpoint to correctly detect renames in a graft-like
      merge scenario.
      
      (Series reworked by Pierre-Yves David)
      0accd5a5
  8. Oct 17, 2016
  9. Oct 13, 2016
    • Gábor Stefanik's avatar
      copies: make _checkcopies handle simple renames in a rotated DAG · 88626de1
      Gábor Stefanik authored
      This introduces a distinction between "merge base" and
      "topological common ancestor". During a regular merge, these two are
      identical. Graft, however, performs a merge in a rotated DAG, where the
      merge base will not be a common ancestor at all in the
      original DAG.
      
      To correctly find copies in case of a graft, we need to take both the
      merge base and the topological CA into account, and track any renames
      between them in reverse. Fortunately we can detect this in advance,
      see comment in the code about "backwards".
      
      This patch only supports finding non-divergent renames contained entirely
      between the merge base and the topological CA. Further patches are coming
      to support more complex cases.
      
      (Pierre-Yves David was involved in the cleanup of this patch.)
      88626de1
    • Gábor Stefanik's avatar
      copies: compute a suitable TCA if base turns out to be unsuitable · 8c69c52c
      Gábor Stefanik authored
      This will be used later in an update to _checkcopies.
      
      (Pierre-Yves David was involved in the cleanup of this patch.)
      8c69c52c
  10. Oct 12, 2016
    • Gábor Stefanik's avatar
      copies: detect graft-like merges · 368e27eb
      Gábor Stefanik authored
      Right now, nothing changes as a result of this, but we want to handle
      grafts differently from ordinary merges later.
      
      (Series developed together with Pierre-Yves David)
      368e27eb
    • Gábor Stefanik's avatar
      tests: introduce tests for grafting through renames · 509d2925
      Gábor Stefanik authored
      These cover all currently known cases of renames being grafted,
      or changes being grafted through renames.
      
      Right now, most of these cases are broken. Later patches in this series
      will make them behave correctly.
      
      The testcases heavily rely on each other, which would make it very difficult
      to separate them and add them one-by-one for each case fixed by a patch.
      Separating them should perhaps be a 4.1 task, if it doesn't slow down
      the tests too much.
      
      (Developed together with Pierre-Yves David)
      509d2925
    • Gábor Stefanik's avatar
      checkcopies: add a sanity check against false-positive copies · 8a864844
      Gábor Stefanik authored
      When grafting a copy backwards through a rename, a copy is wrongly detected,
      which causes the graft to be applied inappropriately, in a destructive way.
      Make sure that the old file name really exists in the common ancestor,
      and bail out if it doesn't.
      
      This fixes the aggravated case of bug 5343, although the basic issue
      (failure to duplicate the copy information) still occurs.
      8a864844
  11. Oct 16, 2016
    • Gregory Szorc's avatar
      exchange: refactor APIs to obtain bundle data (API) · 3e86261b
      Gregory Szorc authored
      Currently, exchange.getbundle() returns either a cg1unpacker or a
      util.chunkbuffer (in the case of bundle2). This is kinda OK, as
      both expose a .read() to consumers. However, localpeer.getbundle()
      has code inferring what the response type is based on arguments and
      converts the util.chunkbuffer returned in the bundle2 case to a
      bundle2.unbundle20 instance. This is a sign that the API for
      exchange.getbundle() is not ideal because it doesn't consistently
      return an "unbundler" instance.
      
      In addition, unbundlers mask the fact that there is an underlying
      generator of changegroup data. In both cg1 and bundle2, this generator
      is being fed into a util.chunkbuffer so it can be re-exposed as a
      file object.
      
      util.chunkbuffer is a nice abstraction. However, it should only be
      used "at the edges." This is because keeping data as a generator is
      more efficient than converting it to a chunkbuffer, especially if we
      convert that chunkbuffer back to a generator (as is the case in some
      code paths currently).
      
      This patch refactors exchange.getbundle() into
      exchange.getbundlechunks(). The new API returns an iterator of chunks
      instead of a file-like object.
      
      Callers of exchange.getbundle() have been updated to use the new API.
      
      There is a minor change of behavior in test-getbundle.t. This is
      because `hg debuggetbundle` isn't defining bundlecaps. As a result,
      a cg1 data stream and unpacker is being produced. This is getting fed
      into a new bundle20 instance via bundle2.writebundle(), which uses
      a backchannel mechanism between changegroup generation to add the
      "nbchanges" part parameter. I never liked this backchannel mechanism
      and I plan to remove it someday. `hg bundle` still produces the
      "nbchanges" part parameter, so there should be no user-visible
      change of behavior. I consider this "regression" a bug in
      `hg debuggetbundle`. And that bug is captured by an existing
      "TODO" in the code to use bundle2 capabilities.
      3e86261b
  12. Oct 12, 2016
  13. Oct 11, 2016
  14. Oct 13, 2016
    • Mads Kiilerich's avatar
      cmdutil: satisfy expections in dirstateguard.__del__, even if __init__ fails · 144d8fe2
      Mads Kiilerich authored
      Python "delstructors" are terrible - this one because it assumed that __init__
      had completed before it was called. That would not necessarily be the case if
      the repository was read only or broken and saving the dirstate thus failed in
      unexpected ways. That could give confusing warnings about missing '_active'
      after failures.
      
      To fix that, make sure all member variables are "declared" before doing
      anything that possibly could fail. [Famous last words.]
      144d8fe2
    • Mads Kiilerich's avatar
      util: increase filechunkiter size to 128k · 7356e6b1
      Mads Kiilerich authored
      util.filechunkiter has been using a chunk size of 64k for more than 10 years,
      also in years where Moore's law still was a law. It is probably ok to bump it
      now and perhaps get a slight win in some cases.
      
      Also, largefiles have been using 128k for a long time. Specifying that size
      multiple times (or forgetting to do it) seems a bit stupid. Decreasing it to
      64k also seems unfortunate.
      
      Thus, we will set the default chunksize to 128k and use the default everywhere.
      7356e6b1
  15. Oct 12, 2016
    • Mads Kiilerich's avatar
      largefiles: always use filechunkiter when iterating files · 736f92c4
      Mads Kiilerich authored
      Before, we would sometimes use the default iterator over large files. That
      iterator is line based and would add extra buffering and use odd chunk sizes
      which could give some overhead.
      
      copyandhash can't just apply a filechunkiter as it sometimes is passed a
      genuine generator when downloading remotely.
      736f92c4
  16. Oct 14, 2016
  17. Oct 10, 2016
    • Yuya Nishihara's avatar
      revset: make follow() reject more than one start revisions · d61c42c1
      Yuya Nishihara authored
      Taking only the last revision is inconsistent because ancestors(set) follows
      all revisions given, and theoretically follow(startrev=set) == ancestors(set).
      I'm planning to add a support for multiple start revisions, but that won't fit
      to the 4.0 time frame. So reject multiple revisions now to avoid future BC.
      
      len(revs) might be slow if revs were large, but we don't care since a valid
      revs should have only one element.
      d61c42c1
  18. Oct 16, 2016
    • Gregory Szorc's avatar
      bundle2: only emit compressed chunks if they have data · 9626022f
      Gregory Szorc authored
      This is similar to 58467204cac0. Not all calls into the compressor
      return compressed data, as the compressor may buffer compressed
      output internally. It is cheaper to check for empty chunks than to
      send empty chunks through the generator.
      
      When generating a gzip-v2 bundle of the mozilla-unified repo, this
      change results in 50,093 empty chunks not being sent through the
      generator (out of 1,902,996 total input chunks).
      9626022f
  19. Oct 15, 2016
  20. Oct 13, 2016
    • Danek Duvall's avatar
      color: debugcolor should emit the user-defined colors · 8915c68f
      Danek Duvall authored
      This also fixes a long-standing bug that reversed the sense of the color
      name and the label used to print it, which was never relevant before.
      8915c68f
    • Danek Duvall's avatar
      color: ignore effects missing from terminfo · 5d777fe4
      Danek Duvall authored
      If terminfo mode is in effect, and an effect is used which is missing from
      the terminfo database, simply silently ignore the request, leaving the
      output unaffected rather than causing a crash.
      5d777fe4
    • Danek Duvall's avatar
      color: allow for user-configurable terminfo codes for effects · f34a8cff
      Danek Duvall authored
      If the entry in the terminfo database for your terminal is missing some
      attributes, it should be possible to create them on the fly without
      resorting to just making them a color.  This change allows you to have
      
          [color]
          terminfo.<effect> = <code>
      
      where <effect> might be something like "dim" or "bold", and <code> is the
      escape sequence that would otherwise have come from a call to tigetstr().
      If an escape character is needed, use "\E".  Any such settings will
      override attributes that are present in the terminfo database.
      f34a8cff
  21. Oct 04, 2016
    • Stanislau Hlebik's avatar
      update: warn if cwd was deleted · 90a6c18a
      Stanislau Hlebik authored
      During update directories are deleted as soon as they have no entries.
      But if current working directory is deleted then it cause problems
      in complex commands like 'hg split'. This commit adds a warning
      that will help users figure the problem faster.
      90a6c18a
  22. Oct 13, 2016
  23. Oct 14, 2016
  24. Oct 13, 2016
  25. Oct 12, 2016
Loading