Skip to content
Snippets Groups Projects
  1. Jul 19, 2018
    • durin42's avatar
      Added tag 4.7rc0 for changeset e90130af47ce · a9be0ab0525a
      durin42 authored
      a9be0ab0525a
    • Gregory Szorc's avatar
      configitems: restore alias for format.aggressivemergedeltas · e90130af47ce
      Gregory Szorc authored
      913ca175c4ae broke BC by dropping support for reading
      format.aggressivemergedeltas. Let's restore it.
      
      Differential Revision: https://phab.mercurial-scm.org/D3966
      4.7rc0
      e90130af47ce
    • Yuya Nishihara's avatar
      c08ea1e219c0
    • Augie Fackler's avatar
      7acec9408e1c
    • Sushil Khanchi's avatar
      histedit: drop --no-backup option · faea9b1980d9
      Sushil Khanchi authored
      Dropping this option because now we have a better option
      than passing --no-backup flag every time, now user can
      set a config in hgrc:
      
      [ui]
      history-editing-backup = False
      
      This config aims to operate on every history editing command and
      it is still work in progress. As yuya suggessted it probably to
      late to add full support this config, so making this as
      an experimental config.
      
      Differential Revision: https://phab.mercurial-scm.org/D3965
      faea9b1980d9
    • Boris Feld's avatar
      aggressivemergedelta: document rename and move to `revlog` section · 913ca175c4ae
      Boris Feld authored
      The config does not follow our naming guideline and "Aggressive" is probably a
      word to keep away from users.
      
      The option does not truly fit in the `format` section. It can be turned on and
      off for existing repository without much consequence regarding compatibility.
      
      A new `revlog` option is created to control behavior related to revlog writing
      and reading. We can see multiple other config options that could be migrated
      there.
      
      * format.maxchainlen
      * experimental.mmapindexthreshold
      * experimental.sparse-read.density-threshold (in an updated form)
      * experimental.sparse-read.min-gap-size (in an updated form)
      
      In addition, we can foresee at least a couple of sparse-revlog related option
      coming too (to reduce delta chain length and increase snapshot reuse)
      
      These two extra options might fit there too. Unless we want to create a
      section dedicated to caches and performance.
      
      * format.chunkcachesize
      * format.manifestcachesize
      
      For now, we only migrate `optimize-delta-parent-choice` since it is getting
      out of experimental. It is too close to the release to move the other one. In
      addition, we still lack proper the prioritization of alias that would help
      renaming them without bad consequence for users.
      
      (Not fully happy about the `revlog` name but could not find better).
      913ca175c4ae
    • Boris Feld's avatar
      aggressivemergedeltas: rename variable internally · 93777d16a25d
      Boris Feld authored
      The "aggressivemergedeltas" name is not great. First, it is quite long,
      second, we would rather have less "Aggressive" names within the project. We
      are about to rename the config option, so it seems the appropriate time to
      rename the internal variable.
      93777d16a25d
    • Boris Feld's avatar
      config: document the purpose of the `format` config section · 8891dc15b327
      Boris Feld authored
      The config section now have a top level documentation to clarify its intend and
      usage. In particular, user are now explain when the option are taken in account
      and how to convert repository.
      
      There are an handful of experimental options in this section that does not match
      its definition. They should be relocated to other section before getting out of
      experimental. (see next changeset for one example).
      8891dc15b327
    • Rodrigo Damazio Bovendorp's avatar
      macosx: fixing macOS version generation after db9d1dd01bf0 · 25880ddf9a86
      Rodrigo Damazio Bovendorp authored
      With the Python3 change, the string is now something like
      version = b'4.6.2+848-88be288e8ac1'
      where it was previously just:
      version = '4.6.2+848-88be288e8ac1'
      
      Differential Revision: https://phab.mercurial-scm.org/D3964
      25880ddf9a86
  2. Jul 10, 2018
  3. Jul 18, 2018
    • Gregory Szorc's avatar
      merge: mark file gets as not thread safe (issue5933) · be4984261611
      Gregory Szorc authored
      In default installs, this has the effect of disabling the thread-based
      worker on Windows when manifesting files in the working directory. My
      measurements have shown that with revlog-based repositories, Mercurial
      spends a lot of CPU time in revlog code resolving file data. This ends
      up incurring a lot of context switching across threads and slows down
      `hg update` operations when going from an empty working directory to
      the tip of the repo.
      
      On mozilla-unified (246,351 files) on an i7-6700K (4+4 CPUs):
      
      before: 487s wall
      after:  360s wall (equivalent to worker.enabled=false)
      cpus=2: 379s wall
      
      Even with only 2 threads, the thread pool is still slower.
      
      The introduction of the thread-based worker (02b36e860e0b) states that
      it resulted in a "~50%" speedup for `hg sparse --enable-profile` and
      `hg sparse --disable-profile`. This disagrees with my measurement
      above. I theorize a few reasons for this:
      
      1) Removal of files from the working directory is I/O - not CPU - bound
         and should benefit from a thread pool (unless I/O is insanely fast
         and the GIL release is near instantaneous). So tests like `hg sparse
         --enable-profile` may exercise deletion throughput and aren't good
         benchmarks for worker tasks that are CPU heavy.
      2) The patch was authored by someone at Facebook. The results were
         likely measured against a repository using remotefilelog. And I
         believe that revision retrieval during working directory updates with
         remotefilelog will often use a remote store, thus being I/O and not
         CPU bound. This probably resulted in an overstated performance gain.
      
      Since there appears to be a need to enable the thread-based worker with
      some stores, I've made the flagging of file gets as thread safe
      configurable. I've made it experimental because I don't want to formalize
      a boolean flag for this option and because this attribute is best
      captured against the store implementation. But we don't have a proper
      store API for this yet. I'd rather cross this bridge later.
      
      It is possible there are revlog-based repositories that do benefit from
      a thread-based worker. I didn't do very comprehensive testing. If there
      are, we may want to devise a more proper algorithm for whether to use
      the thread-based worker, including possibly config options to limit the
      number of threads to use. But until I see evidence that justifies
      complexity, simplicity wins.
      
      Differential Revision: https://phab.mercurial-scm.org/D3963
      be4984261611
    • Gregory Szorc's avatar
      worker: ability to disable thread unsafe tasks · ef3838a47503
      Gregory Szorc authored
      The worker on Windows is implemented using a thread pool. If worker
      tasks are not thread safe, badness can occur. In addition, if tasks
      are executing CPU bound code and holding onto the GIL, there will be
      non-substantial overhead in Python context switching between active
      threads. This can result in significant slowdowns of tasks.
      
      This commit teaches the code for determining whether to use a worker
      to take thread safety into account. Effectively, thread unsafe tasks
      don't use the thread-based worker on Windows.
      
      Differential Revision: https://phab.mercurial-scm.org/D3962
      ef3838a47503
  4. Jul 17, 2018
  5. Jan 28, 2018
  6. Jul 16, 2018
    • Boris Feld's avatar
      debug: move extensions debug behind a dedicated flag · fcb517ff9562
      Boris Feld authored
      Since b86664c81833, we process the `--debug` flag earlier. This is overall
      good and useful, but has at least one negative side effect.
      
      Previously the debug message we report when trying to import extensions were
      issued before we processed the `--debug` flag. Now they happen after.
      
      Before:
      
        $ ./hg id --debug
        21f507b8de2f9c1606e9aeb5ec7d2a6dedb7a4a7 tip
      
      After:
      
        $ ./hg id --debug                          ☿ (revset-bench)
        could not import hgext.evolve (No module named evolve): trying hgext3rd.evolve
        could not import hgext.mercurial_keyring (No module named mercurial_keyring): trying hgext3rd.mercurial_keyring
        could not import hgext3rd.mercurial_keyring (No module named mercurial_keyring): trying mercurial_keyring
        could not import hgext.hggit (No module named hggit): trying hgext3rd.hggit
        could not import hgext3rd.hggit (No module named hggit): trying hggit
        21f507b8de2f9c1606e9aeb5ec7d2a6dedb7a4a7 tip
      
      (This get worse if --traceback is used).
      
      To work around this, we move this extensions related debug message behind a
      new flag 'devel.debug.extensions' and restore the previous output.
      
      I'm not fully happy about using the 'devel' section for a flag that can be
      used by legitimate users to debug extensions issues. However, it fits well
      next to other `devel.devel.*` options and is mostly used by extensions author
      anyway.
      
      We might move it to another, more appropriate section in the future (using
      alias).
      fcb517ff9562
    • Kyle Lippincott's avatar
      curses: use "text" interface if TERM=dumb · d79f3afb079e
      Kyle Lippincott authored
      Differential Revision: https://phab.mercurial-scm.org/D3948
      d79f3afb079e
    • Matt Harbison's avatar
      windows: expand '~/' and '~\' to %USERPROFILE% when translating to cmd.exe · c382c19ce9bd
      Matt Harbison authored
      It's convenient to be able to reference hooks in a portable location on any
      platform.
      c382c19ce9bd
    • Matt Harbison's avatar
      windows: replace single quote with double quote when translating to cmd.exe · 02b5b5c1bba8
      Matt Harbison authored
      Since cmd.exe doesn't understand single quotes, single quotes to prevent $var
      expansion is basically unusable without this.  Single quote isn't allowed in a
      path name, so it seems unlikely to come up otherwise.
      02b5b5c1bba8
    • Matt Harbison's avatar
      hook: only print the note about native cmd translation if it actually changes · f9b2d996ffa5
      Matt Harbison authored
      This makes it so that it will never occur on a non Windows platform.
      f9b2d996ffa5
    • Matt Harbison's avatar
      hook: disable the shell to native command translation by default · 2009d84f245a
      Matt Harbison authored
      There are other things I want to add like ~ expansion and translating single to
      double quotes for cmd.exe.  So off by default is safer.
      
      I'm having second thoughts about the name, but I don't have any better ideas.
      2009d84f245a
  7. Jul 17, 2018
    • Mike Hommey's avatar
      setup: allow to run setup.py with python 3 without a mercurial checkout · dbbe45ae5ad1
      Mike Hommey authored
      Some people may want to test mercurial in a python 3 environment through e.g.
      pip, in which case setup.py doesn't run in a mercurial checkout, so the hack
      in setup.py to allow python 3 cannot be overcome.
      
      This change allows a manual override with the HGPYTHON3 environment variable.
      
      Additionally, when for some reason the version is unknown (for crazy people
      like me, who have a git checkout of the mercurial repo), the version variable
      ends up being an unicode string, which fails the `isinstance(version, bytes)`
      assertion. So fix that at the same time.
      
      Differential Revision: https://phab.mercurial-scm.org/D3958
      dbbe45ae5ad1
  8. Jun 21, 2018
  9. Jul 17, 2018
  10. Jun 05, 2018
    • Paul Morelle's avatar
      sparse-revlog: implement algorithm to write sparse delta chains (issue5480) · f8762ea73e0d
      Paul Morelle authored
      The classic behavior of revlog._isgooddeltainfo is to consider the span size
      of the whole delta chain, and limit it to 4 * textlen.
      Once sparse-revlog writing is allowed (and enforced with a requirement),
      revlog._isgooddeltainfo considers the span of the largest chunk as the
      distance used in the verification, instead of using the span of the whole
      delta chain.
      
      In order to compute the span of the largest chunk, we need to slice into
      chunks a chain with the new revision at the top of the revlog, and take the
      maximal span of these chunks. The sparse read density is a parameter to the
      slicing, as it will stop when the global read density reaches this threshold.
      For instance, a density of 50% means that 2 of 4 read bytes are actually used
      for the reconstruction of the revision (the others are part of other chains).
      
      This allows a new revision to be potentially stored with a diff against
      another revision anywhere in the history, instead of forcing it in the last 4
      * textlen. The result is a much better compression on repositories that have
      many concurrent branches. Here are a comparison between using deltas from
      current upstream (aggressive-merge-deltas on by default) and deltas from a
      sparse-revlog
      
      Comparison of `.hg/store/` size:
      
          mercurial (6.74% merges):
              before:     46,831,873 bytes
              after:      46,795,992 bytes (no relevant change)
          pypy (8.30% merges):
              before:    333,524,651 bytes
              after:     308,417,511 bytes -8%
          netbeans (34.21% merges):
              before:  1,141,847,554 bytes
              after:   1,131,093,161 bytes -1%
          mozilla-central (4.84% merges):
              before:  2,344,248,850 bytes
              after:   2,328,459,258 bytes -1%
          large-private-repo-A (merge 19.73%)
              before: 41,510,550,163 bytes
              after:   8,121,763,428 bytes -80%
          large-private-repo-B (23.77%)
              before: 58,702,221,709 bytes
              after:   8,351,588,828 bytes -76%
      
      Comparison of `00manifest.d` size:
      
          mercurial (6.74% merges):
              before:      6,143,044 bytes
              after:       6,107,163 bytes
          pypy (8.30% merges):
              before:     52,941,780 bytes
              after:      27,834,082 bytes -48%
          netbeans (34.21% merges):
              before:    130,088,982 bytes
              after:     119,337,636 bytes -10%
          mozilla-central (4.84% merges):
              before:    215,096,339 bytes
              after:     199,496,863 bytes -8%
          large-private-repo-A (merge 19.73%)
              before: 33,725,285,081 bytes
              after:     390,302,545 bytes -99%
          large-private-repo-B (23.77%)
              before: 49,457,701,645 bytes
              after:   1,366,752,187 bytes -97%
      
      
      The better delta chains provide a performance boost in relevant repositories:
      
          pypy, bundling 1000 revisions:
              before: 1.670s
              after:  1.149s -31%
      
      Unbundling got a bit slower. probably because the sparse algorithm is still
      pure
      python.
      
          pypy, unbundling 1000 revisions:
              before: 4.062s
              after:  4.507s +10%
      
      Performance of bundle/unbundle in repository with few concurrent branches (eg:
      mercurial) are unaffected.
      
      No significant differences have been noticed then timing `hg push` and `hg
      pull` locally. More state timings are being gathered.
      
      Same as for aggressive-merge-delta, better delta comes with longer delta
      chains. Longer chains have a performance impact. For example. The length of
      the chain needed to get the manifest of pypy's tip moves from 82 item to 1929
      items. This moves the restore time from 3.88ms to 11.3ms.
      
      Delta chain length is an independent issue that affects repository without
      this changes. It will be dealt with independently.
      
      No significant differences have been observed on repositories where
      `sparse-revlog` have not much effect (mercurial, unity, netbeans). On pypy,
      small differences have been observed on some operation affected by delta chain
      building and retrieval.
      
      
          pypy, perfmanifest
              before: 0.006162s
              after:  0.017899s +190%
      
          pypy, commit:
              before: 0.382
              after:  0.376 -1%
      
          pypy, status:
              before: 0.157
              after:  0.168 +7%
      
      More comprehensive and stable timing comparisons are in progress.
      f8762ea73e0d
  11. Jun 04, 2018
    • Paul Morelle's avatar
      sparse-revlog: new requirement enabled with format.sparse-revlog · aa21a9ad46ea
      Paul Morelle authored
      The meaning of the new 'sparse-revlog' requirement is that the revlogs are
      allowed to contain wider delta chains with larger holes between the interesting
      chunks. These sparse delta chains should be read in several chunks to avoid a
      potential explosion of memory usage.
      
      Former version won't know how to read a delta chain in several chunks. They
      would keep reading them in a single read, and therefore would be subject to the
      potential memory explosion. Hence this new requirement: only versions having
      support of sparse-revlog reading should be allowed to read such a revlog.
      
      Implementation of this new algorithm and tools to enable or disable the
      requirement will follow in the next changesets.
      aa21a9ad46ea
    • Paul Morelle's avatar
      revlog: extract `deltainfo.distance` for future conditional redefinition · c67093e81a3e
      Paul Morelle authored
      This commit exist to make the next one clearer.
      c67093e81a3e
  12. Jul 16, 2018
  13. Jul 13, 2018
  14. Jul 12, 2018
    • Jörg Sonnenberger's avatar
      ssh: avoid reading beyond the end of stream when using compression · 27391d74aaa2
      Jörg Sonnenberger authored
      Compressed streams can be used as part of getbundle. The normal read()
      operation of bufferedinputpipe will try to fulfill the request exactly
      and can deadlock if the server sends less as it is done. At the same
      time, the bundle2 logic will stop reading when it believes it has gotten
      all parts of the bundle, which can leave behind end of stream markers as
      used by bzip2 and zstd.
      
      To solve this, introduce a new optional unbufferedread interface and
      provided it in bufferedinputpipe and doublepipe. If there is buffered
      data left, it will be returned, otherwise it will issue a single read
      request and return whatever it obtains.
      
      Reorganize the decompression handlers to try harder to read until the
      end of stream, especially if the requested read can already be
      fulfilled. Check for end of stream is messy with Python 2, none of the
      standard compression modules properly exposes it. At least with zstd and
      bzip2, decompressing will remember EOS and fail for empty input after
      the EOS has been seen. For zlib, the only way to detect it with Python 2
      is to duplicate the decompressobj and force some additional data into
      it. The common handler can be further optimized, but works as PoC.
      
      Differential Revision: https://phab.mercurial-scm.org/D3937
      27391d74aaa2
  15. Jul 16, 2018
  16. Jul 15, 2018
    • Yuya Nishihara's avatar
      obsolete: explode if metadata contains invalid UTF-8 sequence (API) · ff1182d166a2
      Yuya Nishihara authored
      The current metadata API can be a source of bugs since it forces callers to
      process encoding conversion by themselves. So let's make it reject bad data
      as a last ditch. I assume there's no metadata field which is supposed to store
      arbitrary BLOB like transplant_source.
      ff1182d166a2
    • Yuya Nishihara's avatar
      obsolete: store user name and note in UTF-8 (issue5754) (BC) · 6b5ca1d0aa1e
      Yuya Nishihara authored
      Before, user names were stored in local encoding and transferred across
      repositories, which made it impossible to restore non-ASCII user names on
      different platforms. This patch fixes new markers to be encoded in UTF-8
      and decoded back to local encoding when displaying. Existing markers are
      unfixable so they may result in mojibake.
      
      I don't like the API that requires metadata dict to be UTF-8 encoded, which
      is a source of bugs, but there's no abstraction layer to process the encoding
      thingy efficiently. So we apply the same rule as extras dict to obsstore
      metadata.
      6b5ca1d0aa1e
    • Yuya Nishihara's avatar
      83d965803325
  17. Jul 12, 2018
    • Yuya Nishihara's avatar
      revset: special case commonancestors(none()) to be empty set · e4b270a32ba8
      Yuya Nishihara authored
      This matches the behavior of ancestor(none()).
      
      From an implementation perspective, ancestor() and commonancestors() are
      intersection, and ancestors() is union, so it would make some sense that
      commonancestors(none()) returned all revisions. However, ancestor(none())
      isn't implemented as such, which breaks ancestor(x) == max(commonancestors(x)).
      
      From a user perspective, ancestors of nothing is nothing whichever type
      of operation the ancestor predicate does.
      e4b270a32ba8
  18. Jul 10, 2018
  19. Jul 14, 2018
Loading