Skip to content
Snippets Groups Projects
  1. Feb 03, 2016
  2. Feb 02, 2016
  3. Feb 03, 2016
  4. Feb 01, 2016
  5. Jan 31, 2016
    • Martin von Zweigbergk's avatar
      verify: recover lost freeing of memory · ac5057d5
      Martin von Zweigbergk authored
      In df8973e1fb45 (verify: move file cross checking to its own function,
      2016-01-05), "mflinkrevs = None" was moved into function, so the
      reference was cleared there, but the calling function now held on to
      the variable. The point of clearing it was presumably to free up
      memory, so let's move the clearing to the calling function where it
      makes a difference. Also change "mflinkrevs = None" to "del
      mflinkrevs", since the comment about scope now surely is obsolete.
      ac5057d5
  6. Feb 01, 2016
  7. Jan 30, 2016
    • Yuya Nishihara's avatar
      backout: disable --merge with --no-commit (issue4874) · 9960b636
      Yuya Nishihara authored
      Because "backout --merge" have to make a commit before merging, it doesn't
      work with --no-commit. We could change "backout --merge" to make a merge
      commit automatically, and --no-commit to bypass a merge commit, but that
      change would be undesirable because:
      
       a) it's hard to fix bad merges in general
       b) two commits would be created with the same --message
      
      So, this patch simply disables "--merge --no-commit".
      9960b636
  8. Jan 27, 2016
    • Martin von Zweigbergk's avatar
      changegroup: fix pulling to treemanifest repo from flat repo (issue5066) · 88609cfa
      Martin von Zweigbergk authored
      In c0f11347b107 (changegroup: don't support versions 01 and 02 with
      treemanifests, 2016-01-19), I stopped supporting use of cg1 and cg2
      with treemanifest repos. What I had not considered was that it's
      perfectly safe to pull *to* a treemanifest repo using any changegroup
      version. As reported in issue5066, I therefore broke pull from old
      repos into a treemanifest repo. It was not covered by the test case,
      because that pulled from a local repo while enabling treemanifests,
      which enabled treemanifests on the source repo as well. After
      switching to pulling via HTTP, it breaks.
      
      Fix by splitting up changegroup.supportedversions() into
      supportedincomingversions() and supportedoutgoingversions().
      88609cfa
  9. Jan 28, 2016
  10. Jan 29, 2016
    • Siddharth Agarwal's avatar
      merge: don't try to merge subrepos twice (issue4988) · 6bce6d92
      Siddharth Agarwal authored
      In my patch series ending with rev 25e4b2f000c5 I switched most change/delete
      conflicts to be handled at the resolve layer. .hgsubstate was the one file that
      we weren't able to handle, so we kept the old code path around for it.
      
      The old code path added .hgsubstate to one of the other lists as the user
      specifies, including possibly the 'g' list.
      
      Now since we did this check after converting the actions from being keyed by
      file to being keyed by action type, there was nothing that actually removed
      .hgsubstate from the 'cd' or 'dc' lists. This meant that the file would
      eventually make its way into the 'mergeactions' list, now freshly augmented
      with 'cd' and 'dc' actions.
      
      We call subrepo.submerge for both 'g' actions and merge actions.
      
      This means that if the resolution to an .hgsubstate change/delete conflict was
      to add it to the 'g' list, subrepo.submerge would be called twice. It turns out
      that this doesn't cause any adverse effects on Linux due to caching, but
      apparently breaks on other operating systems including Windows.
      
      The fix here moves this to before we convert the actions over. This ensures
      that it .hgsubstate doesn't make its way into multiple lists.
      
      The real fix here is going to be:
      (1) move .hgsubstate conflict resolution into the resolve layer, and
      (2) use a real data structure for the actions rather than shuffling data around
          between lists and dictionaries: we need a hash (or prefix-based) index by
          file and a list index by action type.
      
      There's a very tiny behavior change here: collision detection on
      case-insensitive systems will happen after this is resolved, not before. I think
      this is the right change -- .hgsubstate could theoretically collide with other
      files -- but in any case it makes no practical difference.
      
      Thanks to Yuya Nishihara for investigating this.
      6bce6d92
  11. Jan 27, 2016
    • Nathan Goldbaum's avatar
      f0d3c579
    • Siddharth Agarwal's avatar
      merge: undocument checkunknown and checkignored configs for 3.7 · 7b7e1615
      Siddharth Agarwal authored
      We've discovered an issue with this flag during certain kinds of rebases. When:
      
      (1) we're rebasing while currently on the destination commit, and
      (2) an untracked or ignored file F is currently in the working copy, and
      (3) the same file F is in a source commit, and
      (4) F has different contents in the source commit,
      
      then we'll try to merge the file rather than overwrite it.
      
      An earlier patch I sent honored the options for these situations as well.
      Unfortunately, rebases go through the same flow as the old, deprecated 'hg
      merge --force'. We'd rather not make any changes to 'hg merge --force'
      behavior, and there's no way from this point in the code to figure out whether
      we're in 'hg rebase' or 'hg merge --force'.
      
      Pierre-Yves David and I came up with the idea to split the 'force' flag up into
      'force' for rebases, and 'forcemerge' for merge. Since this is a very
      disruptive change and we're in freeze mode, simply undocument the options for
      this release so that our hands aren't tied by BC concerns. We'll redocument
      them in the next release.
      7b7e1615
  12. Jan 28, 2016
    • Katsunori FUJIWARA's avatar
      commands: advance current active bookmark at pull --update correctly · 7cb7264c
      Katsunori FUJIWARA authored
      Before this patch, "hg pull --update" doesn't advance current active
      bookmark correctly, if pulling itself doesn't advance it, even though
      "hg pull" + "hg update" does so.
      
      Existing test for "pull --update works the same as pull && update" in
      test-bookmarks.t doesn't examine this case, because pulling itself
      advance current active bookmark before actual updating the working
      directory in that test case.
      
      To advance current active bookmark at "hg pull --update" correctly,
      this patch examines 'movemarkfrom' instead of 'not checkout'.
      
      Even if 'not checkout' at the invocation of postincoming(), 'checkout'
      is overwritten by "the revision to update to" value returned by
      destutil.destupdate() in such case. Therefore, 'not checkout'
      condition means "update destination is revision #0", and isn't
      suitable for examining whether active bookmark should be advanced.
      
      Even though examination around "movemarkfrom == repo['.'].node()" may
      seem a little redundant just for this issue, this makes it easier to
      compare (and unify in the future, maybe) with the same logic to update
      bookmark at "hg update" below.
      
              if not ret and movemarkfrom:
                  if movemarkfrom == repo['.'].node():
                      pass # no-op update
                  elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                      ui.status(_("updating bookmark %s\n") % repo._activebookmark)
                  else:
                      # this can happen with a non-linear update
                      ui.status(_("(leaving bookmark %s)\n") %
                                repo._activebookmark)
                      bookmarks.deactivate(repo)
      7cb7264c
  13. Jan 24, 2016
    • Matt Harbison's avatar
      largefiles: prevent committing a missing largefile · 571ba161
      Matt Harbison authored
      Previously, if the largefile was deleted at the time of a commit, the standin
      was silently not updated and its current state (possibly garbage) was recorded.
      The test makes it look like this is somewhat of an edge case, but the same thing
      happens when an `hg revert` followed by `rm` changes the standin.
      
      Aside from the second invocation of this in lfutil.updatestandinsbymatch()
      (which is what triggers this test case), the three other uses are guarded by
      dirstate checks for added or modified, or an existence check in the filesystem.
      So aborting in lfutil.updatestandins() should be safe, and will avoid silent
      skips in the future if this is used elsewhere.
      571ba161
  14. Jan 27, 2016
    • Augie Fackler's avatar
      changegroup: fix treemanifest exchange code (issue5061) · ca8d2b73
      Augie Fackler authored
      There were two mistakes: one was accidental reuse of the fclnode
      variable from the loop gathering file nodes, and the other (masked by
      that bug) was not correctly handling deleted directories. Both cases
      are now fixed and the test passes.
      ca8d2b73
  15. Jan 22, 2016
    • Matt Mackall's avatar
      log: speed up single file log with hidden revs (issue4747) · 4186d359
      Matt Mackall authored
      On repos with lots of heads, the filelog() code could spend several
      minutes decompressing manifests. This change instead tries to
      efficiently scan the changelog for candidates and decompress as few
      manifests as possible. This is a regression introduced in 3.3 by the
      linkrev adjustment code. Prior to that, filelog was nearly instant.
      
      For the repo in the bug report, this improves time of a simple log
      command from ~3 minutes to ~.5 seconds, a 360x speedup.
      
      For the main Mercurial repo, a log of commands.py slows down from
      1.14s to 1.45s, a 27% slowdown. This is still faster than the file()
      revset, which takes 2.1 seconds.
      4186d359
  16. Jan 24, 2016
  17. Jan 25, 2016
    • Martin von Zweigbergk's avatar
      context: back out sneaky code change in documentation change · 75fa75d3
      Martin von Zweigbergk authored
      In 81b391a45264 (context: clarify why we don't compare file contents
      when nodeid differs, 2016-01-12), I also changed "node2 != _newnode"
      into "self.rev() is not None". I don't remember why. They are similar,
      but the former also catches the case where the file is clean in the
      dirstate (so node2 is not _newnode), but different from the "other"
      context. This resulted in unnecessary file content comparison a few
      lines further down in the code. Let's just back out the code change.
      
      Thanks to Durham Goode for spotting this.
      75fa75d3
  18. Jul 23, 2015
    • Yuya Nishihara's avatar
      templater: abort if infinite recursion detected while compiling · cfe7da66
      Yuya Nishihara authored
      In this case, a template is parsed recursively with no thunk for lazy
      evaluation. This patch prevents recursion by putting a dummy of the same name
      into a cache that will be referenced while parsing if there's a recursion.
      
        changeset = {files % changeset}\n
                             ~~~~~~~~~
                              = [(_runrecursivesymbol, 'changeset')]
      cfe7da66
  19. Jul 22, 2015
  20. Jan 23, 2016
  21. Jan 25, 2016
    • Laurent Charignon's avatar
      crecord: fix help bar display issue (issue5063) · 3d3b4ac3
      Laurent Charignon authored
      Before this patch, the help bar in crecord wouldn't be printed correctly when
      the terminal window didn't have enough column to display it. This patch adds
      logic to make sure that the help bar message is always displayed. We use an
      ellipsis when it is not possible to display the complete message.
      3d3b4ac3
    • Laurent Charignon's avatar
      crecord: fix typo in the help text · fedd8165
      Laurent Charignon authored
      In the crecord help dialog, the toggle all option was wrongfully documented.
      Instead of using 'a', one must use 'A' to toggle all the hunks. The crecord
      header that is always displayed on the screen contains the right shortcut and
      does not need to be changed.
      fedd8165
  22. Jan 18, 2016
    • Mason Malone's avatar
      subrepo: better error messages in _ensuregit · 594bdc38
      Mason Malone authored
      This patch improves the error messages raised when an OSError occurs, since
      simply re-raising the exception can be both confusing and misleading. For
      example, if "hg identify" is run inside a repository that contains a Git
      subrepository and the git binary could not be found, it'll exit with the message
      "abort: No such file or directory". That implies "identify" has a problem
      reading the repository itself. There's no way for the user to know what the
      real problem is unless they dive into the Mercurial source, which is what I
      ended up doing after spending hours debugging errors while provisioning a VM
      with Ansible (turns out I forgot to install Git on it).
      
      Descriptive errors are especially important on Windows, since it's common for
      Windows users to forget to set the "Path" system variable after installing Git.
      594bdc38
  23. Jan 23, 2016
    • Anton Shestakov's avatar
      hgweb: update canvas.width before dynamically redrawing graph (issue2683) · 1779ff74
      Anton Shestakov authored
      After 91ac8cb79125 graph canvas width is decided once on the initial rendering.
      However, after graph page gets scrolled down to load more, it might need more
      horizontal space to draw, so it needs to resize the canvas dynamically.
      
      The exact problem that this patch solves can be seen using:
      
          hg init testfork
          cd testfork
          echo 0 > foo
          hg ci -Am0
          echo 1 > foo
          hg ci -m1
          hg up 0
          echo 2 > foo
          hg ci -m2
          hg gl -T '{rev}\n'
      
          @  2
          |
          | o  1
          |/
          o  0
      
          hg serve
      
      And then by navigating to http://127.0.0.1:8000/graph/tip?revcount=1
      
      "revcount=1" makes sure the initial graph contains only revision 2. And because
      the initial canvas width takes only that one revision into count, after the
      (immediate) AJAX update revision 1 will be cut off from the graph.
      
      We can safely set canvas width to the new value we get from the AJAX request
      because every time graph is updated, it is completely redrawn using all the
      requested nodes (in the case above it will use /graph/2?revcount=61), so the
      value is guaranteed not to decrease.
      
      P.S.: Sorry for parsing HTML with regexes, but I didn't start it.
      1779ff74
Loading