Skip to content
Snippets Groups Projects
  1. Mar 29, 2016
  2. Mar 28, 2016
  3. Mar 29, 2016
  4. Mar 26, 2016
    • Martin von Zweigbergk's avatar
      bundle: avoid crash when no good changegroup version found · c4b72779
      Martin von Zweigbergk authored
      When using treemanifests, only changegroup3 bundles can be
      created. However, there is currently no way of requesting a
      changegroup3 bundle, so we run into an assertion in
      changegroup.getbundler() when trying to get a changroup2
      bundler. Let's avoid the traceback and print a short error message
      instead.
      c4b72779
  5. Mar 25, 2016
  6. Mar 28, 2016
    • Martin von Zweigbergk's avatar
      bundle: move writebundle() from changegroup.py to bundle2.py (API) · ae53ecc4
      Martin von Zweigbergk authored
      writebundle() writes a bundle2 bundle or a plain changegroup1. Imagine
      away the "2" in "bundle2.py" for a moment and this change should makes
      sense. The bundle wraps the changegroup, so it makes sense that it
      knows about it. Another sign that this is correct is that the delayed
      import of bundle2 in changegroup goes away.
      
      I'll leave it for another time to remove the "2" in "bundle2.py"
      (alternatively, extract a new bundle.py from it).
      ae53ecc4
  7. Mar 29, 2016
  8. Mar 23, 2016
  9. Mar 21, 2016
    • Mateusz Kwapich's avatar
      subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC) · 34d43cb8
      Mateusz Kwapich authored
      CVE-2016-3068 (1/1)
      
      Git's git-remote-ext remote helper provides an ext:: URL scheme that
      allows running arbitrary shell commands. This feature allows
      implementing simple git smart transports with a single shell shell
      command. However, git submodules could clone arbitrary URLs specified
      in the .gitmodules file. This was reported as CVE-2015-7545 and fixed
      in git v2.6.1.
      
      However, if a user directly clones a malicious ext URL, the git client
      will still run arbitrary shell commands.
      
      Mercurial is similarly effected. Mercurial allows specifying git
      repositories as subrepositories. Git ext:: URLs can be specified as
      Mercurial subrepositories allowing arbitrary shell commands to be run
      on `hg clone ...`.
      
      
      The Mercurial community would like to thank Blake Burkhart for
      reporting this issue. The description of the issue is copied from
      Blake's report.
      
      This commit changes submodules to pass the GIT_ALLOW_PROTOCOL env
      variable to git commands  with the same list of allowed protocols that
      git submodule is using.
      
      When the GIT_ALLOW_PROTOCOL env variable is already set, we just pass it
      to git without modifications.
      34d43cb8
  10. Mar 17, 2016
  11. Mar 28, 2016
  12. Mar 27, 2016
  13. Mar 28, 2016
  14. Mar 17, 2016
  15. Mar 26, 2016
    • Katsunori FUJIWARA's avatar
      tests: fix for failure of test-convert-p4-filetypes.t · 64ed9f90
      Katsunori FUJIWARA authored
      Before this patch, test-convert-p4-filetypes.t fails (at least with
      2015.2/1366233 version of p4/p4d), because some files below are
      omitted in expected output for revision 1.
      
        - file_tempobj
        - file_xtempobj
      
      These files are:
      
        - add-ed at revision 0, and
        - edit-ed at revision 1
      
      According to perforce command reference below, file type 'tempobj' and
      'xtempobj' imply '+S' modifier, which indicates that "Only the head
      revision is stored". This means that these files should appear only in
      the most recent revision (= revision 1).
      
          https://www.perforce.com/perforce/doc.current/manuals/cmdref/file.types.html
      
      BTW, test-convert-p4-filetypes.t with 2015.2/1366233 version of p4/p4d
      fails similarly also at recent revisions for hgext/convert/p4.py in
      2015. Therefore, this patch should be reviewed by perforce guru, to
      examine whether this failure depends on version (and/or configuration)
      of p4/p4d or not.
      64ed9f90
  16. Mar 21, 2016
    • Jordi Gutiérrez Hermoso's avatar
      crecord: re-enable reviewing a patch before comitting it · 44319097
      Jordi Gutiérrez Hermoso authored
      The "r" option for this feature was copied into Mercurial from
      crecord, but the actual implementation never made it into hg until
      now. It's a moderately useful feature that allows the user to edit the
      patch in a text editor before comitting it for good.
      
      This requires a test, so we must also enable a corresponding testing
      'R' option that skips the confirmation dialogue. In addition, we also
      need a help text for the editor when reviewing the final patch.
      
      As for why this is a useful feature if we can already edit hunks in an
      editor, I would like to offer the following points:
      
          * editing hunks does not show the entire patch all at once
      
            ** furthermore, the hunk "tree" in the TUI has no root that could be
               selected for edition
      
          * it is helpful to be able to see the entire final patch for
            confirmation
      
            ** within this view, the unselected hunks are hidden, which is
               visusally cleaner
      
            ** this works as a final review of the complete result, which is
               a bit more difficult to do conceptually via hunk editing
      
          * this feature was already in crecord, so it was an oversight to
            not bring it to core
      
          * it works and is consistent with editing hunks
      44319097
  17. Mar 20, 2016
  18. Mar 21, 2016
Loading