Skip to content
Snippets Groups Projects
  1. May 01, 2016
    • Sean Farley's avatar
      debian: add wish to suggests · 5573b0f8
      Sean Farley authored
      Debian maintainers already have this and lintian warns us about not
      listing 'wish' as a dependency or suggestion so this patch does indeed
      just that. The issue, by the way, is that we are shipping hgk (which is
      written in tcl/tk) so we should be good citizens and list wish (a meta
      package for tcl/tk) as a dependency.
      5573b0f8
  2. May 07, 2016
    • Sean Farley's avatar
      hg-ssh: copy doc string to man page · 7b52cb38
      Sean Farley authored
      This corrects a warning from lintian that we're shipping an executable without
      a man page. Since there is a doc string in the text, let's use that for the man
      page.
      7b52cb38
  3. May 06, 2016
    • Matt Mackall's avatar
      progress: stop excessive clearing (issue4801) · 222b8170
      Matt Mackall authored
      The progress bar was being cleared on every write(), regardless of
      whether it was currently displayed. This could foul up the display of
      any writes that didn't include a linebreak.
      
      In particular, the win32 mode of the color extension was turning
      single prompt string writes into two writes, and the resulting
      clear/write/clear/write pattern was making the prompt invisible.
      
      We fix this by insisting that we have shown a progress bar and haven't
      just cleared it (setting lastprint to 0).
      
      Conveniently, the test suite already had instances of duplicate
      clears.. that are now cleared up.
      222b8170
  4. May 05, 2016
  5. May 01, 2016
  6. Apr 07, 2016
  7. May 01, 2016
  8. Apr 30, 2016
    • Sean Farley's avatar
      builddeb: use codename in version · 52f71214
      Sean Farley authored
      Apparently, this is needed to allow ppas to be built for multiple distros.
      52f71214
    • Pierre-Yves David's avatar
      rebase: restrict rebase destination to the pulled set (issue5214) · 261c2537
      Pierre-Yves David authored
      Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull`
      followed by `hg rebase` if anything was pulled.
      
      Now that rebase pick his default destination the same way than merge, than
      `hg rebase` step would abort in the case the repo already had multiple anonymous
      heads (because of the ambiguity). (changed in fac3a24be50e)
      
      The intend of the user with `hg pull --rebase` is clearly to rebase on pulled
      content. This used to be (mostly) enforced by the former default destination for
      rebase, "tipmost changeset of the branch" as the tipmost would likely a
      changeset that just got pulled. But this intended was no longer enforced with
      the new defaul destination (unified with merge).
      
      This changeset makes use of the '_destspace' mechanism introduced in the previous
      changeset to enforce this.
      
      This partially fixes issue5214 as no change at all have been made to the new
      handling of the case with bookmark (unified with merge).
      261c2537
    • Pierre-Yves David's avatar
      destutil: add the ability to specify a search space for rebase destination · cf7de4ae
      Pierre-Yves David authored
      In the 'hg pull --rebase', we don't want to pick a rebase destination unrelated
      to the pull, we lay down basic infrastructure to allow such restriction on
      stable (before 3.8 release) in this case. See issue 5214 for details.
      
      Actual usage and test will be in the next patch.
      cf7de4ae
    • Gregory Szorc's avatar
      sslutil: restore old behavior not requiring a hostname argument (issue5210) · 693b856a
      Gregory Szorc authored
      This effectively backs out changeset 1fde84d42f9c.
      
      The http library behind ui.http2=true isn't specifying the hostname.
      It is the day before the expected 3.8 release and we don't want to ship
      a regression.
      
      I'll try to restore this requirement in the 3.9 release cycle as part
      of planned improvements to Mercurial's SSL/TLS interactions.
      693b856a
  9. Apr 28, 2016
    • Matt Mackall's avatar
      tests: test a variety of cache invariants · b962ae0a
      Matt Mackall authored
      We've historically had a problem maintaining the expected invariants
      on our caches, especially when introducing new caches. This tests
      documents the invariants and exercises them across most of our
      existing cache files.
      b962ae0a
    • Matt Mackall's avatar
      repoview: ignore unwritable hidden cache · a4dc5fe7
      Matt Mackall authored
      The atomictemp.close() file attempts to do a rename, which can fail.
      Moving the close inside the exception handler fixes it.
      
      This doesn't fit well with the with: pattern, as it's the finalizer
      that's failing.
      a4dc5fe7
    • Matt Mackall's avatar
      tags: silence hgtagsfnodes reading failures · e3055b46
      Matt Mackall authored
      tryread() doesn't handle "is a directory" errors and presumably
      others. We might not want to globally swallow such tryread errors, so
      we replace with our own try/except handling.
      
      An upcoming test will use directories as a portable stand-in for
      various bizarre circumstances that cache read/write code should be
      robust to.
      e3055b46
    • Matt Mackall's avatar
      tags: silence cache parsing errors · a9dd92c4
      Matt Mackall authored
      Follow our standard STFU cache-handling pattern
      a9dd92c4
  10. May 01, 2016
  11. Apr 27, 2016
  12. Apr 28, 2016
    • Adam Simpkins's avatar
      graft: fix printing of --continue command · 224dd889
      Adam Simpkins authored
      Properly shell quote arguments, to avoid printing commands that won't work when
      run literally.  For example, a date string with timestamp needs to be quoted:
      --date '1456953053 28800'
      224dd889
  13. Apr 29, 2016
  14. Apr 27, 2016
    • Kevin Bullock's avatar
      osx: create a modern package including manpages · db5084d2
      Kevin Bullock authored
      Instead of using bdist_mpkg, we use the modern Apple-provided tools to
      build an OS X Installer package directly. This has several advantages:
      
      * Avoids bdist_mpkg which seems to be barely maintained and is hard to
        use.
      * Creates a single unified .pkg instead of a .mpkg.
      * The package we produce is in the modern, single-file format instead of
        a directory bundle that we have to zip up for download.
      
      In addition, this way of building the package now correctly:
      
      * Installs the manpages, bringing the `make osx`-generated package in
        line with the official Mac packages we publish on the website.
      * Installs files with the correct permissions instead of encoding the
        UID of the user who happened to build the package.
      
      Thanks to Augie for updating the test expectations.
      db5084d2
    • Augie Fackler's avatar
      80f15aa3
  15. Apr 19, 2016
  16. Apr 28, 2016
    • Matt Harbison's avatar
      verify: don't init subrepo when missing one is referenced (issue5128) (API) · 92d37fb3
      Matt Harbison authored
      Initializing a subrepo when one doesn't exist is the right thing to do when the
      parent is being updated, but in few other cases.  Unfortunately, there isn't
      enough context in the subrepo module to distinguish this case.  This same issue
      can be caused with other subrepo aware commands, so there is a general issue
      here beyond the scope of this fix.
      
      A simpler attempt I tried was to add an '_updating' boolean to localrepo, and
      set/clear it around the call to mergemod.update() in hg.updaterepo().  That
      mostly worked, but doesn't handle the case where archive will clone the subrepo
      if it is missing.  (I vaguely recall that there may be other commands that will
      clone if needed like this, but certainly not all do.  It seems both handy, and a
      bit surprising for what should be a read only operation.  It might be nice if
      all commands did this consistently, but we probably need Angel's subrepo caching
      first, to not make a mess of the working directory.)
      
      I originally handled 'Exception' in order to pick up the Aborts raised in
      subrepo.state(), but this turns out to be unnecessary because that is called
      once and cached by ctx.sub() when iterating the subrepos.
      
      It was suggested in the bug discussion to skip looking at the subrepo links
      unless -S is specified.  I don't really like that idea because missing a subrepo
      or (less likely, but worse) a corrupt .hgsubstate is a problem of the parent
      repo when checking out a revision.  The -S option seems like a better fit for
      functionality that would recurse into each subrepo and do a full verification.
      
      Ultimately, the default value for 'allowcreate' should probably be flipped, but
      since the default behavior was to allow creation, this is less risky for now.
      92d37fb3
Loading