Skip to content
Snippets Groups Projects
  1. Oct 08, 2015
  2. Oct 05, 2015
  3. Sep 29, 2015
  4. Oct 05, 2015
    • Pierre-Yves David's avatar
      update: move default destination computation to a function · 2aeeef1d
      Pierre-Yves David authored
      We ultimately want this to be accessible through a revset, but there is too
      much complexity here for that to work. Especially we'll have to return more
      than just the destination to control the behavior (eg: bookmarks to activate,
      etc).
      
      To prevent cycle, a new module is created, it will receive other
      destination/behavior function in the future.
      2aeeef1d
  5. Oct 08, 2015
    • Gregory Szorc's avatar
      worker: restore old countcpus code (issue4869) · c0501c26
      Gregory Szorc authored
      This is a backout of d29859cfcfc2. The stdlib implementation of
      multiprocessing.cpu_count() attempts to invoke a process on BSD and
      Darwin platforms (at least on 2.7). Under certain conditions (such as
      cwd being removed) this could raise. Our old code was silently catching
      the exception.
      
      The old code was more robust, so restore it.
      c0501c26
    • Siddharth Agarwal's avatar
      filemerge: call premerge directly from main merge function · f18646cf
      Siddharth Agarwal authored
      The merge code currently does (in pseudocode):
      
      for f in tomerge:
          premerge f
          merge f
      
      We'd like to change this to look more like:
      
      for f in tomerge:
          premerge f
      
      for f in tomerge:
          merge f
      
      This makes sure as many files are resolved as possible before prompting for the
      others. This restructuring is also necessary for custom merge drivers.
      
      This function separates out the premerge step from the merge step. In future
      patches we'll actually turn these into separate steps in the merge driver.
      
      The 'if r:' occurrences will be cleaned up in subsequent patches.
      f18646cf
  6. Oct 05, 2015
    • Durham Goode's avatar
      bundle2: allow lazily acquiring the lock · 58880acd
      Durham Goode authored
      In the external pushrebase extension, it is valuable to be able to do some work
      without taking the lock (like running expensive hooks). This enables
      significantly higher commit throughput.
      
      This patch adds an option to lazily acquire the lock. It means that all bundle2
      part handlers that require writing to the repo must first call
      op.gettransction(), when in this mode.
      58880acd
  7. Oct 06, 2015
  8. Oct 08, 2015
  9. Oct 02, 2015
    • Pierre-Yves David's avatar
      patchbomb: add a 'bundletype' config under 'patchbomb' · d4a1bfe1
      Pierre-Yves David authored
      patchbomb relies on the 'hg bundle' command to generate an attached bundle using
      --bundle. However, while 'hg bundle' has a --type option, patchbomb did not.
      This is becoming very relevant since we are about to issue bundle2 for
      general-delta repository.
      
      This was tracked as issue4863
      d4a1bfe1
  10. Oct 07, 2015
  11. Oct 06, 2015
  12. Oct 07, 2015
  13. Oct 06, 2015
  14. Oct 07, 2015
  15. Oct 06, 2015
  16. Oct 05, 2015
    • Pierre-Yves David's avatar
      incoming: request a bundle2 when possible (BC) · 1e8e0b01
      Pierre-Yves David authored
      Incoming was using bundle1 in all cases, as bundle1 is restricted to
      changegroup1 and does not support general delta, this can lead to significant
      CPU overhead if the server is using general delta storage. We now properly
      request and store a bundle2 to disk.
      
      If the server include any output or error in the bundle, they will be stored on
      disk and replayed when the bundle is read. As 'hg incoming' is going to read the
      bundle right away, we call that 'good' enough and go back to the bigger plan of
      having general delta on by default.
      
      This was tracked as 4864
      1e8e0b01
    • Pierre-Yves David's avatar
      bundlerepo: indent some code to prepare next patch · a018cbab
      Pierre-Yves David authored
      We are about to add a new condition. Code is indented in a separated patch for
      readability.
      a018cbab
  17. Oct 08, 2015
    • Pierre-Yves David's avatar
      bundle2: add a way to just forward the bundle2 stream to another user · b87e4638
      Pierre-Yves David authored
      There is use case for directly forward and bundle2 stream from the peer to a
      file (eg: 'hg incoming --bundle'), However ssh peers have no way to know the
      'getbundle' is over except for actually interpreting the bundle. So we need to
      have the unbundle do the interpreting and forward job.
      
      The function is marked as private to highlight that this is terrible and that we
      are sorry.
      b87e4638
  18. Oct 05, 2015
  19. Oct 07, 2015
Loading