Skip to content
Snippets Groups Projects
  1. Oct 14, 2015
  2. Mar 10, 2015
  3. Oct 15, 2015
  4. Oct 16, 2015
  5. Oct 15, 2015
    • Gregory Szorc's avatar
      exchange: don't print error codes after clone bundle failure · 69ac9aebbc55
      Gregory Szorc authored
      We don't appear to print error codes elsewhere. The error codes are
      inconsistent between at least Linux and OS X and are more trouble than
      they are worth. Humans care about the error string more than the code
      anyway.
      
      A glob was also added to pave over differences in error strings between
      Linux and OS X.
      69ac9aebbc55
  6. Oct 14, 2015
    • Augie Fackler's avatar
    • Augie Fackler's avatar
      merge-tools: allow marking a mergetool as completely disabled · a1e43e85d294
      Augie Fackler authored
      Very often in my life I'm finding that the only configured merge tool
      present on the system is vimdiff[0], and it's currently impossible (as
      far as I can tell) short of specifying `ui.merge = `[1] to actually
      *disable* a merge tool. This allows vimdiff-haters to put:
      
        [merge-tools]
        vimdiff.disable = yes
      
      in their ~/.hgrc and never see vimdiff again. I'm stopping short of
      putting this as a commented out entry in the sample new user hgrc
      (seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
      but I might come back and do that later.
      
      0: vimdiff is at an awkward intersection: it's usually installed by
      the vim package which is often installed as a vi substitute, so it's
      mere presence doesn't imply me wanting it, unlike (say) kdiff3.
      
      1: There's a related problem I ran into today where specifying
      `ui.merge = :merge` failed because :merge isn't a command, which I
      think is a regression. I'll try and figure that out and at least file
      a bug.
      a1e43e85d294
    • Sean Farley's avatar
      16e69e6b357b
  7. Oct 15, 2015
  8. Oct 14, 2015
  9. Oct 01, 2015
  10. Sep 30, 2015
  11. Sep 29, 2015
    • Augie Fackler's avatar
      changegroup: reformat packermap and add comment · 42733e956887
      Augie Fackler authored
      I'm about to add a cg3, and it seems prudent to annotate what formats
      support what features. It strikes me that we may want to consider
      moving to a more feature-oriented model in the future, but we'll see
      how that looks in a little while I guess.
      42733e956887
  12. Oct 14, 2015
  13. Oct 13, 2015
Loading