Skip to content
Snippets Groups Projects
  1. Dec 18, 2014
  2. Dec 16, 2014
  3. Dec 11, 2014
  4. Dec 12, 2014
  5. Dec 13, 2014
  6. Dec 08, 2014
    • Durham Goode's avatar
      log: fix log revset instability · 424d6691
      Durham Goode authored
      The log/graphlog revset was not producing stable results since it was
      iterating over a dict. Now we sort before iterating to guarantee a fixed order.
      
      This fixes some potential flakiness in the tests.
      424d6691
  7. Dec 05, 2014
    • Durham Goode's avatar
      log: fix log -f slow path to actually follow history · 9601229e
      Durham Goode authored
      The revset created when -f was used with a slow path (for patterns and
      directories) did not actually contain any logic to enforce follow. Instead it
      was depending on the passed in subset to already be limited (which was limited
      to :. but not ::.). This fixes it by adding a '& ::.' to any -f log revset.
      
      hg log -f <file> is still broken, in that it can return results that aren't
      actually ancestors of the current file, but fixing that has major perf
      implications, so we'll deal with it later.
      9601229e
  8. Nov 17, 2014
    • Martin von Zweigbergk's avatar
      update: don't overwrite untracked ignored files on update · 30b60216
      Martin von Zweigbergk authored
      When looking for untracked files that would conflict with a tracked
      file in the target revision (or the remote side of a merge), we
      explcitly exclude ignored files. The code was added in 7e30f5f2285f
      (merge: refactor unknown file conflict checking, 2012-02-09), but it
      seems like only unknown, not ignored, files were considered since the
      beginning of time.
      
      Although ignored files are mostly build outputs and backup files, we
      should still not overwrite them. Fix by simply removing the explicit
      check.
      30b60216
  9. Dec 03, 2014
    • Martin von Zweigbergk's avatar
      update: add tests for untracked local file · 689540e6
      Martin von Zweigbergk authored
      We don't seem to have any tests for updating to another revision when
      there are untracked files on the local side that conflict with the
      those on the remote side, so let's add tests. This shows how we
      overwrite untracked ignored files when updating to a revision that
      tracks the file.
      689540e6
  10. Dec 02, 2014
  11. Dec 01, 2014
  12. Nov 29, 2014
  13. Dec 02, 2014
  14. Dec 01, 2014
  15. Nov 30, 2014
  16. Dec 01, 2014
  17. Nov 28, 2014
    • Mads Kiilerich's avatar
      mq: fix update of headers that occur in the "wrong" order · 94092019
      Mads Kiilerich authored
      Mq tried to insert headers in the right order. Sometimes it would stop
      searching before checking all headers and it could thus duplicate a header
      instead of replacing it.
      94092019
    • Gregory Szorc's avatar
      hgweb: send proper HTTP response after uncaught exception · dc4d2cd3
      Gregory Szorc authored
      This patch fixes a bug where hgweb would send an incomplete HTTP
      response.
      
      If an uncaught exception is raised when hgweb is processing a request,
      hgweb attempts to send a generic error response and log that exception.
      
      The server defaults to chunked transfer coding. If an uncaught exception
      occurred, it was sending the error response string / chunk properly.
      However, RFC 7230 Section 4.1 mandates a 0 size last chunk be sent to
      indicate end of the entity body. hgweb was failing to send this last
      chunk. As a result, properly written HTTP clients would assume more data
      was coming and they would likely time out waiting for another chunk to
      arrive.
      
      Mercurial's own test harness was paving over the improper HTTP behavior
      by not attempting to read the response body if the status code was 500.
      This incorrect workaround was added in ba6577a19656 and has been removed
      with this patch.
      dc4d2cd3
  18. Nov 26, 2014
  19. Nov 25, 2014
    • Pierre-Yves David's avatar
      rename: properly report removed and added file as modified (issue4458) · 2963d5c9
      Pierre-Yves David authored
      The result of 'hg rm' + 'hg rename' disagreed with the one from
      'hg rename --force'. We align them on 'hg move --force' because it agrees with
      what 'hg status' says after the commit.
      
      Stopping reporting a modified file as added puts an end to the hg revert confusion in this
      situation (issue4458).
      
      However, reporting the file as modified also prevents revert from restoring the copy
      source. We fix this in a later changeset.
      
      Git diff also stop reporting the add in the middle of the chain as add. Not
      sure how important (and even wrong) it is.
      2963d5c9
  20. Nov 26, 2014
    • Pierre-Yves David's avatar
      manifest: fix a bug where working copy file 'add' mark was buggy · fd1bab28
      Pierre-Yves David authored
      Because the same dictionary was used to (1) get node from parent and (2) store
      annotated version, we could end up with buggy values. For example with a chain
      of renames:
      
        $ hg mv b c
        $ hg mv a b
      
      The value from 'b' would be updated as "<old-a>a", then the value of c would be
      updated as "<old-b>a'. With the current dictionary sharing this ends up with:
      
          '<new-c>' == '<old-a>aa'
      
      This value is double-wrong as we should use '<old-b>' and a single 'a'.
      
      We now use a read-only value for lookup. The 'test-rename.t' test is impacted
      because such a chained added file is suddenly detected as such.
      fd1bab28
    • anatoly techtonik's avatar
  21. Nov 25, 2014
  22. Nov 21, 2014
    • Durham Goode's avatar
      changegroup: fix file linkrevs during reorders (issue4462) · cc0ff93d
      Durham Goode authored
      Previously, if reorder was true during the creation of a changegroup bundle,
      it was possible that the manifest and filelogs would be reordered such that the
      resulting bundle filelog had a linkrev that pointed to a commit that was not
      the earliest instance of the filelog revision. For example:
      
      With commits:
      
      0<-1<---3<-4
        \       /
         --2<---
      
      if 2 and 3 added the same version of a file, if the manifests of 2 and 3 have
      their order reversed, but the changelog did not, it could produce a filelog with
      linkrevs 0<-3 instead of 0<-2, which meant if commit 3 was stripped, it would
      delete that file data from the repository and commit 2 would be corrupt (as
      would any future pulls that tried to build upon that version of the file).
      
      The fix is to make the linkrev fixup smarter. Previously it considered the first
      manifest that added a file to be the first commit that added that file, which is
      not true. Now, for every file revision we add to the bundle we make sure we
      attach it to the earliest applicable linkrev.
      cc0ff93d
    • Anton Shestakov's avatar
      templates: fix broken "less" & "more" links in paper style (issue4460) · c00b156d
      Anton Shestakov authored
      "/search", which is an invalid command in hgweb, was mistakenly used for
      "[show] more [revsets]" and "[show] less [revsets]" links on search page in
      templates "paper" (and those which inherit paper, such as coal) before and
      worked fine until 6e1fbcb18a75, which made hgweb more strict about invalid
      commands.
      c00b156d
  23. Nov 19, 2014
    • Pierre-Yves David's avatar
      push: stop independent usage of bundle2 in syncphase (issue4454) · 2e65da5f
      Pierre-Yves David authored
      The phase-syncing code was using bundle2 if the remote supported it. It was
      doing so without regard to bundle2 activation on the client. Moreover, the
      phase push is now properly included in the unified bundle2 push, so having extra
      code in syncphase should be useless. If the remote is bundle2-enabled, the
      phases should already be synced.
      
      The buggy verification code was leading to a crash when a 3.2 client was pushing
      to a 3.1 server. The real bundle2 path detected that their versions were
      incompatible, but the syncphase code failed to, sending an incompatible bundle2
      to the server.
      
      We drop the useless and buggy code as a result. The "else" clause is
      de-indented in the process.
      2e65da5f
  24. Nov 17, 2014
  25. Nov 16, 2014
  26. Nov 11, 2014
Loading