Skip to content
Snippets Groups Projects
  1. Aug 23, 2014
  2. Mar 16, 2014
  3. Aug 21, 2014
  4. Aug 20, 2014
  5. Aug 21, 2014
  6. Aug 20, 2014
    • Pierre-Yves David's avatar
      debugobsolete: add a way to record parent information · 406181ee335f
      Pierre-Yves David authored
      We add a ``--record-parents`` flag to debugobsolete. This can be used to record
      parent information in the marker when the precursors are known locally. This
      will be useful to test the "relevant markers" computation.
      406181ee335f
    • Pierre-Yves David's avatar
      obsstore: add relevantmarkers method · 8c69262df82d
      Pierre-Yves David authored
      We add a ``relevantmarkers`` method to fetch all markers that seem relevant to a
      set of nodes. See function documentation about how this set is computed. This
      will let us exchange only the markers that seem "relevant" to the set of
      changesets related to a push or a pull.
      
      The approach used to define "relevant" has been successfully tested in evolve
      for 6 months.
      8c69262df82d
  7. Aug 19, 2014
  8. Aug 21, 2014
  9. Aug 19, 2014
  10. Aug 21, 2014
    • durin42's avatar
      cvsps: add two more tiebreakers in cscmp · 90cf454edd70
      durin42 authored
      test-convert-cvs.t has been a little flaky for a while now. Add an
      extra tiebreaker in cscmp so that all the cases in the test will sort
      reliably.
      
      Without this patch, test-convert-cvs.t failed after 346 runs. With
      this patch, I stopped trying to get it to fail after 615 runs. While
      not conclusive, that makes me pretty optimistic that this is a working
      fix.
      90cf454edd70
  11. Aug 16, 2014
  12. Aug 20, 2014
    • Siddharth Agarwal's avatar
      purge: avoid full walks when directories aren't purged · fe22d86a8992
      Siddharth Agarwal authored
      If match.traversedir is not None, we're forced to do full walks. However when
      we aren't purging directories we don't need to set match.traversedir to
      anything.
      
      This speeds up non-full walks such as the one hgwatchman makes possible. For
      mozilla-central with hgwatchman enabled, 'hg purge --files' goes from 0.88
      seconds to 0.22.
      fe22d86a8992
  13. Aug 21, 2014
  14. Aug 20, 2014
  15. Aug 19, 2014
  16. Aug 18, 2014
    • Pierre-Yves David's avatar
      obsstore: also store the 'parents' field on disk · cf414981978a
      Pierre-Yves David authored
      We now store the `parents` field on disk. We use the same strategy as for
      `date`: We stick it into the metadata. This is slow and dirty, but this is also
      the only way we currently have.
      
      At some point we'll have a new obsstore format to store this properly.
      cf414981978a
  17. Aug 19, 2014
  18. Aug 18, 2014
  19. Aug 19, 2014
  20. Aug 16, 2014
    • Katsunori FUJIWARA's avatar
      transplant: change "editform" to distinguish merge commits from others · de783f2403c4
      Katsunori FUJIWARA authored
      "editform" argument for "getcommiteditor" is decided according to the
      format below:
      
        EXTENSION[.COMMAND][.ROUTE]
      
        - EXTENSION: name of extension
        - COMMAND: name of command, if there are two or more commands in EXTENSION
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      This patch newly adds "normal" and "merge" as ROUTE, to distinguish
      merge commits from other.
      
      This patch adds 4 test patterns to test combination of "merge"(x2) and
      "--continue"(x2).
      de783f2403c4
    • Katsunori FUJIWARA's avatar
      rebase: change "editform" to distinguish merge commits from others · d0d3e5c6eb3c
      Katsunori FUJIWARA authored
      "editform" argument for "getcommiteditor" is decided according to the
      format below:
      
        EXTENSION[.COMMAND][.ROUTE]
      
        - EXTENSION: name of extension
        - COMMAND: name of command, if there are two or more commands in EXTENSION
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      This patch newly adds "merge" as ROUTE, to distinguish merge commits
      from other.
      
      This patch passes bool as "ctxorbool" to "mergeeditform", because
      working context has always 2 parents at this point. Dropping the
      second parent of non-merging commits is executed in "concludenode".
      
      Unlike other patches in this series (e.g. for "hg commit"), this patch
      doesn't add "normal.normal"/"normal.merge" style ROUTEs, because there
      is no "merge" case in "collapse" ROUTE.
      d0d3e5c6eb3c
    • Katsunori FUJIWARA's avatar
      import: change "editform" to distinguish merge commits from others · f3200bf460a8
      Katsunori FUJIWARA authored
      "editform" argument for "getcommiteditor" is decided according to the
      format below:
      
        COMMAND[.ROUTE]
      
        - COMMAND: name of command
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      This patch uses "normal.normal" and "normal.merge" as ROUTE of
      "editform" instead of "normal", to distinguish merge commits from
      other in "hg import" without "--bypass" case.
      
      This patch assumes "editform" variations for "hg import" below:
      
          import.normal.normal
          import.normal.merge
          import.bypass.normal
          import.bypass.merge
      
      Unlike other patches in this series, this patch uses "editor.sh"
      instead of "checkeditform.sh" for the name of the script to check
      "HGEDITFORM", because it has to do more than checking "HGEDITFORM".
      
      To invoke editor forcibly in "test-import-merge.t", this patch creates
      the patch not having patch description as "merge.nomsg.diff".
      f3200bf460a8
    • Katsunori FUJIWARA's avatar
      commit: change "editform" to distinguish merge commits from other (--amend) · f5ff18f65b73
      Katsunori FUJIWARA authored
      "editform" argument for "getcommiteditor" is decided according to the
      format below:
      
        COMMAND[.ROUTE]
      
        - COMMAND: name of command
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      This patch uses "amend.normal" and "amend.merge" as ROUTE of
      "editform" instead of "amend", to distinguish merge commits from other
      in "hg commit --amend" case.
      f5ff18f65b73
    • Katsunori FUJIWARA's avatar
      commit: change "editform" to distinguish merge commits from others · 75618a223e18
      Katsunori FUJIWARA authored
      "editform" argument for "getcommiteditor" is decided according to the
      format below:
      
        COMMAND[.ROUTE]
      
        - COMMAND: name of command
        - ROUTE: name of route, if there are two or more routes in COMMAND
      
      This patch uses "normal.normal" and "normal.merge" as ROUTE of
      "editform" instead of "normal", to distinguish merge commits from
      others in "hg commit" without "--amend" case.
      
      This patch assumes "editform" variations for "hg commit" below:
      
          commit.normal.normal
          commit.normal.merge
          commit.amend.normal
          commit.amend.merge
      
      "mergeeditform" is factored out for subsequent patches. It takes
      "ctxorbool" argument, because context object can't be passed in some
      cases.
      75618a223e18
    • Gregory Szorc's avatar
      test-ssh: verify that stderr from remote is printed (issue4336) · 8341c677c204
      Gregory Szorc authored
      The issue fixed in the previous patch was uncovered by implementing an
      extension that printed additional output locally before the push command
      completed. This test emulates that.
      
      If this change is applied before the previous patch, the test will fail
      on Linux, with the local output being printed before the "remote: "
      lines.
      8341c677c204
    • Gregory Szorc's avatar
      posix: implement readpipe using non-blocking I/O (issue4336) · 331cbf088c4c
      Gregory Szorc authored
      On Linux, fstat().st_size of a pipe always returns 0, even if the
      pipe has data available for reading. This meant that reading from
      and subsequently printing the stderr pipe content after wireproto
      commands over SSH meant that available data wasn't being printed.
      
      We now implement pipe reading on POSIX by doing a non-blocking
      read for all available data.
      331cbf088c4c
    • Gregory Szorc's avatar
      platform: implement readpipe() · 234e4c24b980
      Gregory Szorc authored
      Reading all available data from a pipe has a platform-dependent
      implementation.
      
      This patch establishes platform.readpipe() by copying the
      inline implementation in sshpeer.readerr(). The implementations
      for POSIX and Windows are currently identical. The POSIX
      implementation will be changed in a subsequent patch.
      234e4c24b980
    • Pierre-Yves David's avatar
      exchange: remove duplicated addition to pushop.stepdone · 172036d60b22
      Pierre-Yves David authored
      Not sure how it got there but it is useless.
      172036d60b22
  21. Aug 19, 2014
  22. Aug 16, 2014
Loading