Skip to content
Snippets Groups Projects
  1. Feb 01, 2013
  2. Jan 31, 2013
  3. Feb 01, 2013
  4. Jan 31, 2013
    • Pierre-Yves David's avatar
      hgweb: add a `web.view` to control filtering · 36549fa712da
      Pierre-Yves David authored
      This options add a new `web.view` to control filter level of hgweb.
      
      This option have two purposes:
      
      1) Allow fall back to unfiltered version in case a yet undetected by critical
         bug is found in filtering after 2.5 release
      
      2) People use hgweb as a local repoviewer. When they have secret changesets,
         they wants to use "visible" filter not "served"
      
      (modified by mpm, documentation deferred)
      36549fa712da
    • Pierre-Yves David's avatar
      hgweb: returns 404 for unknow revision instead of 500 · 0af2fe7b3274
      Pierre-Yves David authored
      I noticed that access to filtered revision returned HTTP 500 code (internal
      server error). Investigation shown that it was the case for unknown revision
      too. That wrong and we now properly return a 404 for revision not found.
      0af2fe7b3274
    • Pierre-Yves David's avatar
      subrepo: allows to drop courtesy phase sync (issue3781) · 751135cca13c
      Pierre-Yves David authored
      Publishing server may contains draft changeset when they are created locally. As
      publishing is the default, it is actually fairly common. Because of this
      "inconsistency" phases synchronization may be done even to publishing server.
      
      This may cause severe issues for subrepo. It is possible to reference read-only
      repository as subrepo. Push in a super repo recursively push subrepo. Those
      pushes to potential read only repo are not optional, they are "suffered" not
      "choosed". This does not break because as the repo is untouched the push is
      supposed to be empty. If the reference repo locally contains draft changesets, a
      courtesy push is triggered to turn them public. As the repo is read only, the
      push fails (after possible prompt asking for credential). Failure of the
      sub-push aborts the whole subrepo push. This force the user to define a custom
      default-push for such subrepo.
      
      This changeset introduce a prevention of this error client side by skipping the
      courtesy phase synchronisation in problematic situation. The phases
      synchronisation is skipped when four conditions are gathered:
      - this is a subrepo push, (normal push to read-only repo)
      - and remote support phase
      - and remote is publishing
      - and no changesets was pushed (if we pushed changesets, repo is not read only)
      
      The internal config option used in this version is not definitive. It is here to
      demonstrate a working fix to the issue.
      
      In the future we probably wants to track subrepo changes and avoid pushing to
      untouched one. That will prevent any attempt to push to read-only or unreachable
      subrepo.
      
      Another fix to prevent courtesy push from older clients to push to newer server
      is also still needed.
      751135cca13c
    • Mads Kiilerich's avatar
      tests: fix toctou race in tinyproxy.py (issue3795) · ca430fb6a668
      Mads Kiilerich authored
      test-http-proxy.t sometimes failed with:
          File ".../tests/tinyproxy.py", line 110, in _read_write
            data = i.recv(8192)
        error: (104, 'Connection reset by peer')
      
      This might have started showing up with a9fd11ffa13f ... but it has apparently
      also been seen before. I don't see anything in a9fd11ffa13f that can explain
      it. It seems to be a race in test, in the tinyproxy helper:
      
      Tinyproxy found an incoming socket using select(). It would break the loop if
      an error had been detected on the socket, but there was no error and it tried
      to recv() from the socket. That failed - apparently because it had been reset
      after select().
      
      Errors in the recv() will now be caught and will break the loop like errors
      detected by select() would.
      
      (send() could also fail in a similar way ... but using the same solution there
      and losing data we have read doesn't feel right.)
      ca430fb6a668
  5. Feb 01, 2013
    • Pierre-Yves David's avatar
      rebase: mention --rev in the help · 0324a1d88a53
      Pierre-Yves David authored
      This changeset adds a small mention of it in the help to prevent
      confusion. This small addition references online help that is easier to
      update and improve at release time.
      
      Following Wagner Bruna's advice, this is added in a plain new paragraph
      to not invalidate current translation this close to the release.
      0324a1d88a53
    • Pierre-Yves David's avatar
      hgweb: remove baseline info from paper template · 0c51532ec233
      Pierre-Yves David authored
      The user interface introduced in d605a82cf189 is not considered ready
      for prime time yet. The internal code stays in place for custom template
      usage. The feature is ultimately wanted and will be re-enabled soon. The
      current issue is only related to the visual of the current interface.
      0c51532ec233
    • Kevin Bullock's avatar
      rebase: mention phases in the help · 9fbeb61b8ad2
      Kevin Bullock authored
      Mention that Mercurial helps you not do what you've just been warned not
      to do, with a reference to the 'phases' help topic (not the 'phase'
      command help).
      
      Thanks to Pierre-Yves David <pierre-yves.david@ens-lyon.org> for
      motivating this change and Wagner Bruna
      <wagner.bruna+mercurial@gmail.com> for advising on how to do it in an
      i18n-friendly way.
      9fbeb61b8ad2
  6. Jan 31, 2013
    • Angel Ezquerra's avatar
      hgwebdir: use web.prefix when creating url breadcrumbs (issue3790) · bf8bbbf4aa45
      Angel Ezquerra authored
      The web.prefix setting was being ignored when creating the index URL
      breadcrumbs.
      
      We only need to fix hgwebdir and not hgweb because hgweb gets the complete URL
      request, including the prefix, while hgwebdir gets a "subdir" which does not
      include the prefix.
      
      This fix is slightly different of what was suggested on the bug tracker. In
      there it was suggested to hide the prefix itself from the breadcrumb. I think
      that would be a better solution, but it would require changing all the index
      templates and passing the prefix to the template engine, which may be too big
      a change for stable during the freeze. For now this fixes the problem, and the
      fix could be improved during the next cycle.
      bf8bbbf4aa45
    • Siddharth Agarwal's avatar
      rebase: delete divergent bookmarks on destination (issue3685) · 2a1fac3650a5
      Siddharth Agarwal authored
      Similar to merge, divergent bookmarks are only deleted when the bookmark is on
      the destination parent.
      2a1fac3650a5
  7. Jan 30, 2013
  8. Jan 31, 2013
  9. Nov 28, 2012
    • Matt Harbison's avatar
      share: backout fd903f89e42b, except the test · 798ab869b2ee
      Matt Harbison authored
      Locating the share source when no default path is available is now handled in
      subrepo._abssource(), so unconditionally setting a default path (and the
      associated problems) can be avoided.
      
      The test change reflects the fact that a default path is no longer set on the
      resulting share.
      798ab869b2ee
    • Matt Harbison's avatar
      subrepo: use sharepath if available when locating the source repo · f254ab6207ae
      Matt Harbison authored
      This is an alternative fix for issue3518, enabling sharing of repositories with
      subrepos, without unconditionally setting the default path in the resulting
      repo's hgrc file.  Better test coverage is added here, but won't prove this code
      is working until fd903f89e42b is backed out.
      
      The problem with the original fix is, if a default path is not available to be
      copied over from the share source, the default path on the resulting repo is set
      to the source location.  Since that's where the actual repository is stored, the
      path is essentially self-referential, so push, pull, incoming and outgoing
      effectively operate on itself.  While incoming and outgoing make it look like
      nothing was changed, push currently hangs (see issue3657).  In this case where
      there is not a real default path, these operations should abort with
      "default(-push) not found", like the source repo would.  Note this problem with
      the original fix affected repos without subrepos too.
      f254ab6207ae
  10. Jan 22, 2013
  11. Jan 31, 2013
  12. Jan 30, 2013
  13. Jan 28, 2013
  14. Jan 30, 2013
  15. Jan 29, 2013
  16. Jan 27, 2013
Loading