Skip to content
Snippets Groups Projects
  1. Feb 29, 2016
  2. Feb 15, 2016
    • Yuya Nishihara's avatar
      log: fix order of revisions filtered by multiple OR options (issue5100) · c407583c
      Yuya Nishihara authored
      This is the simplest workaround for the issue of the ordering of revset, which
      is that the expression "x or y" takes over the ordering specified by the input
      set (or the left-hand-side expression.) For example, the following expression
      
        A & (x | y)
      
      will be evaluated as if
      
        (A & x) | (A & y)
      
      That's wrong because revset has ordering. I'm going to fix this problem in
      the revset module, but that wouldn't fit to stable. So, this patch just works
      around the common log cases.
      
      Since this change might have some impact on performance, it is enabled only
      if the expression built from log options has ' or ' operation.
      c407583c
  3. Feb 26, 2016
    • Gregory Szorc's avatar
      demandimport: add _imp to ignore list · f5b2b358
      Gregory Szorc authored
      Mozilla is seeing an issue with demand importing of _imp
      failing in pkg_resources/__init__.py:fixup_namespace_packages.
      It strangely only reproduces when using a modern version of
      setuptools/pip in certain scenarios. Adding _imp to the demand import
      ignore list seems to make the problem go away.
      f5b2b358
  4. Feb 22, 2016
  5. Feb 23, 2016
    • Pierre-Yves David's avatar
      revert: properly revert to ancestor of p2 during merge (issue5052) · cb6a952e
      Pierre-Yves David authored
      During merge, added (from one perspective) file can be reported as "modified".
      To work around that, revert was testing if modified file were present in the
      parent manifest and marking them as "added" in this case. However, we should be
      checking against the target revision manifest instead. Otherwise see file as
      "newly added" even if they exist in the target revision.
      
      That revert behavior regressed in 06fbd9518bc5.
      cb6a952e
  6. Feb 01, 2016
  7. Feb 20, 2016
    • Rainer Woitok's avatar
      doc: correct example concerning "hg purge" alias in man page "hgrc.5" · 1bcb4f34
      Rainer Woitok authored
      The "hg purge" alias as currently described in "hgrc.5" only works, if
      the caller's current working directory is identical to the repository's
      root directory.
      
      This patch slightly modifies the example by adding an empty pattern as a
      file argument to the "hg status" command, thus forcing this command to
      list the affected files relative to the current directory.
      1bcb4f34
  8. Feb 19, 2016
  9. Feb 08, 2016
    • Katsunori FUJIWARA's avatar
      setup: avoid procedure related to hg.exe at setup.py --pure · 8da94662
      Katsunori FUJIWARA authored
      Before this patch, "setup.py --pure" fails on Windows, because
      hgbuildscripts.run() tries to copy "hg.exe", which doesn't generated
      at "setup.py --pure".
      
      At that time, run_command('build_hgexe') invoked in
      hgbuildscripts.run() does nothing and returns successfully. Therefore,
      subsequent procedure assuming existence of "hg.exe" fails.
      
      This patch avoids procedure related to "hg.exe" (= all of
      hgbuildscripts.run() except for build_scripts.run() invocation) at
      "setup.py --pure".
      8da94662
  10. Feb 05, 2016
  11. Feb 06, 2016
    • Yuya Nishihara's avatar
      ui: fix crash by non-interactive prompt echo for user name · 89003c49
      Yuya Nishihara authored
      Since we've dropped a str cast at write() by f04bd381e8c0, ui.prompt() should
      convert default to '' if it is None. Otherwise, write() would fail with
      "TypeError: object of type 'NoneType' has no len()".
      
      This patch includes the tests for both interactive and non-interactive cases
      because "ui.askusername" was never tested.
      89003c49
  12. Feb 10, 2016
    • Yuya Nishihara's avatar
      zeroconf: forward all arguments passed to ui.configitems() wrapper · 72f2a19c
      Yuya Nishihara authored
      f43988e5954c added 'ignoresub' argument to ui.configitems(), but zeroconf
      wrapper wasn't updated. It caused the following crash:
      
        Traceback (most recent call last):
          File "bin/hg", line 43, in <module>
            mercurial.dispatch.run()
          File "lib/python/mercurial/dispatch.py", line 54, in run
            sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
          File "lib/python/mercurial/dispatch.py", line 120, in dispatch
            ret = _runcatch(req)
          File "lib/python/mercurial/dispatch.py", line 191, in _runcatch
            return _dispatch(req)
          File "lib/python/mercurial/dispatch.py", line 924, in _dispatch
            cmdpats, cmdoptions)
          File "lib/python/mercurial/dispatch.py", line 681, in runcommand
            ret = _runcommand(ui, options, cmd, d)
          File "lib/python/mercurial/extensions.py", line 195, in closure
            return func(*(args + a), **kw)
          File "lib/python/hgext/zeroconf/__init__.py", line 180, in cleanupafterdispatch
            return orig(ui, options, cmd, cmdfunc)
          File "lib/python/mercurial/dispatch.py", line 1055, in _runcommand
            return checkargs()
          File "lib/python/mercurial/dispatch.py", line 1015, in checkargs
            return cmdfunc()
          File "lib/python/mercurial/dispatch.py", line 921, in <lambda>
            d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
          File "lib/python/mercurial/util.py", line 991, in check
            return func(*args, **kwargs)
          File "lib/python/mercurial/commands.py", line 5405, in paths
            pathitems = sorted(ui.paths.iteritems())
          File "lib/python/mercurial/util.py", line 723, in __get__
            result = self.func(obj)
          File "lib/python/mercurial/ui.py", line 619, in paths
            return paths(self)
          File "lib/python/mercurial/ui.py", line 1099, in __init__
            for name, loc in ui.configitems('paths', ignoresub=True):
          File "lib/python/mercurial/extensions.py", line 195, in closure
            return func(*(args + a), **kw)
        TypeError: configitems() got an unexpected keyword argument 'ignoresub'
      
      We have no test coverage for zeroconf, so I've added a minimal test that
      could reproduce this problem.
      72f2a19c
  13. Feb 05, 2016
  14. Feb 02, 2016
    • Yuya Nishihara's avatar
      revset: flatten chained 'list' operations (aka function args) (issue5072) · b19d8d5d
      Yuya Nishihara authored
      Internal _matchfiles() function can take bunch of arguments, which would
      lead to a maximum recursion depth error. This patch avoids the excessive
      stack use by flattening 'list' nodes beforehand.
      
      Since getlist() no longer takes a nested 'list' nodes, _parsealiasdecl()
      also needs to flatten argument list, "aliasname($1, $2, ...)".
      b19d8d5d
  15. Feb 05, 2016
  16. Feb 03, 2016
  17. Feb 02, 2016
  18. Feb 03, 2016
  19. Feb 01, 2016
  20. 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
  21. Feb 01, 2016
Loading