Skip to content
Snippets Groups Projects
  1. Aug 16, 2014
    • 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
  2. Aug 19, 2014
  3. Aug 16, 2014
  4. Jun 24, 2014
  5. Aug 02, 2014
  6. Aug 01, 2014
  7. Jun 24, 2014
  8. Aug 02, 2014
  9. Jun 24, 2014
  10. Aug 16, 2014
  11. Aug 15, 2014
  12. Aug 18, 2014
    • Gregory Szorc's avatar
      hgweb: refresh repository using URL not path (issue4323) · c39d404f0eb0
      Gregory Szorc authored
      hgweb detects out-of-date repository instances (using a highly
      suspect mechanism that should probably be fixed) and obtains a new
      repository object if needed.
      
      This patch changes the repository object copy to use the repo URL
      (instead of path). This preserves more information about the source
      repository and allows bundles to be served through hgweb.
      
      A test verifying that bundles can now be served properly via
      `hg serve` has been added.
      c39d404f0eb0
  13. Aug 19, 2014
    • Pierre-Yves David's avatar
      obsmarker: add `date` as an explicit field · 883e8b6bd461
      Pierre-Yves David authored
      The markers are now 5-item tuples (concluded by the date). The obsstore.fields
      contents have been updated accordingly.
      
      There is no change to the on-disk format yet, so the date has to be extracted
      every time we read binary markers and re-injected each team we write them. This
      introduces a slowdown that will be solved when a new version of the format is
      added. Such a slowdown was already introduced by the evolve extension anyway.
      883e8b6bd461
  14. Aug 12, 2014
    • Pierre-Yves David's avatar
      obsstore: add fields attribute to track each field in a marker · e75b1a3c1dbc
      Pierre-Yves David authored
      We are going to increase the amount of data explicitly stored in obsolescence
      markers. This mean we are going to have a longer tuple and some values will be
      shuffled around. So we add a ``fields`` attribute to the obsstore class to
      keep track of what entry is what. This will be useful for extensions and for
      documentation purpose.
      e75b1a3c1dbc
  15. Aug 14, 2014
  16. Aug 15, 2014
  17. Jun 24, 2014
    • Pierre-Yves David's avatar
      revert: add an XXX about rename tracking · f1debbcd71cd
      Pierre-Yves David authored
      We check for rename information in the dirstate. This is probably not enough to
      preserve this behavior when using an explicit target rev.
      
      I just spotted this while working on this code, but this is outside the scope
      of my series so I'm just adding a comment to highlight this suspicious
      situation.
      f1debbcd71cd
    • Pierre-Yves David's avatar
      revert: inline a now useless closure · f18aca03ddd9
      Pierre-Yves David authored
      Now that a single call site remains, we can just inline its content.
      f18aca03ddd9
    • Pierre-Yves David's avatar
      revert: remove code killed by the double status · 76fa261b5fe3
      Pierre-Yves David authored
      All those checks were here to catch cases where files were not modified in
      dirstate but were different in the target revision. This is now properly handled
      by calling status on the target node too.
      76fa261b5fe3
Loading