Skip to content
Snippets Groups Projects
  1. May 09, 2014
    • Pierre-Yves David's avatar
      import: add --partial flag to create a changeset despite failed hunks · bee0e1cffdd3
      Pierre-Yves David authored
      The `hg import` command gains a `--partial` flag. When specified, a commit will
      always be created from a patch import. Any hunk that fails to apply will
      create .rej file, same as what `hg qimport` would do. This change is mainly
      aimed at preserving changeset metadata when applying a patch, something very
      important for reviewers.
      
      In case of failure with `--partial`, `hg import` returns 1 and the following
      message is displayed:
      
          patch applied partially
          (fix the .rej files and run `hg commit --amend`)
      
      When multiple patches are imported, we stop at the first one with failed hunks.
      
      In the future, someone may feel brave enough to tackle a --continue flag to
      import.
      bee0e1cffdd3
  2. May 18, 2014
  3. May 01, 2014
  4. May 26, 2014
  5. Apr 29, 2014
    • Pierre-Yves David's avatar
      revsetbenchmark: support for running on other repo · ea3d75ebea6d
      Pierre-Yves David authored
      We add a -R/--repo option to run the benchmarks on another repository. This is
      very useful as some repository are bigger/more interesting  than the mercurial one.
      ea3d75ebea6d
    • Pierre-Yves David's avatar
      revsetbenchmark: automatically finds the perf extension · 651d7548a744
      Pierre-Yves David authored
      Before this changeset, you had to stand in the root of the mercurial repo to run
      the `revsetbenchmark.py` script. Otherwise, the perf extension would not be
      found a `./contrib/perf.py` and the script would crash in panic.
      
      We now figure out the contrib directory from the location of this script. This
      makes it possible to run the script from other location that the mercurial repo
      root (but you still need to be in the core mercurial repository)
      651d7548a744
  6. May 16, 2014
  7. May 19, 2014
    • Pierre-Yves David's avatar
      revset-benchmark: add max(::(tip~20) - obsolete()) · cb0e28d61905
      Pierre-Yves David authored
      This revset is used in evolve. The new revset lazyness should make it all faster
      but in practice it is significantly slower.
      
      Below is a timing for this entry on my Mercurial repo.
      
      2.9.2) ! wall 0.034598 comb 0.040000 user 0.040000 sys 0.000000 (best of 100)
      3.0+@) ! wall 0.062268 comb 0.060000 user 0.060000 sys 0.000000 (best of 100)
      
      The ~20 have been taken arbitrary.
      cb0e28d61905
  8. Feb 28, 2014
    • Mads Kiilerich's avatar
      merge: use separate lists for each action type · 43eecb4e23f8
      Mads Kiilerich authored
      This replaces the grand unified action list that had multiple action types as
      tuples in one big list. That list was iterated multiple times just to find
      actions of a specific type. This data model also made some code more
      convoluted than necessary.
      
      Instead we now store actions as a tuple of lists. Using multiple lists gives a
      bit of cut'n'pasted code but also enables other optimizations.
      
      This patch uses 'if True:' to preserve indentations and help reviewing. It also
      limits the number of conflicts with other pending patches. It can trivially be
      cleaned up later.
      43eecb4e23f8
  9. May 20, 2014
    • Pierre-Yves David's avatar
      changelog: ensure changelog._delaybuf is initialized · 667df8f478d1
      Pierre-Yves David authored
      The ``localrepo.writepending`` method is using the ``changelog._delaybuff``
      attribute to know if it has anything to do. However the ``changelog._delaybuff``
      is never initialised at ``__init__`` time. This can lead to crash when using
      bundle2 for part that never touch the changelog.
      
      We simply initialize it to its base value. This is scheduled for stable as it
      both trivial and blocking for experimenting with bundle2.
      667df8f478d1
  10. May 22, 2014
    • Yuya Nishihara's avatar
      proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1 · 21b3513d43e4
      Yuya Nishihara authored
      With Python 2.7.7rc1, "hg pull" through HTTP CONNECT tunnel fails due to the
      removal of _set_hostport [1].
      
            ...
            File "mercurial/url.py", line 372, in https_open
              return self.do_open(self._makeconnection, req)
            ...
            File "mercurial/url.py", line 342, in connect
              _generic_proxytunnel(self)
            File "mercurial/url.py", line 228, in _generic_proxytunnel
              self._set_hostport(self.host, self.port)
          AttributeError: httpsconnection instance has no attribute '_set_hostport'
      
      self._set_hostport(self.host, self.port) should be noop and can be removed
      because:
      
       - _set_hostport() [2] was the function to parse "host:port" string and
         set them to self.host and self.port,
       - and (self.host, self.port) pair should be valid since connect() is called
         prior to _generic_proxytunnel().
      
       [1]: http://hg.python.org/cpython/rev/568041fd8090
       [2]: http://hg.python.org/cpython/file/3a1db0d2747e/Lib/httplib.py#l721
      21b3513d43e4
  11. May 23, 2014
  12. May 25, 2014
  13. May 10, 2014
  14. May 09, 2014
  15. Apr 25, 2014
  16. May 16, 2014
  17. May 08, 2014
    • Durham Goode's avatar
      rebase: specify custom conflict marker labels for rebase (BC) · 3b40e32e88c3
      Durham Goode authored
      Changes rebase conflict markers to say 'source' and 'dest' instead of
      'local' and 'other'.  This ends up looking like:
      
        one
        <<<<<<< dest:   a3e5c7fd master - bob: "A commit to master"
        master
        =======
        mine
        >>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch"
        three
      3b40e32e88c3
  18. May 10, 2014
  19. May 08, 2014
  20. Apr 22, 2014
  21. May 08, 2014
    • Durham Goode's avatar
      merge: add conflict marker formatter (BC) · 25d5a9ecbb85
      Durham Goode authored
      Adds a conflict marker formatter that can produce custom conflict marker
      descriptions. It can be set via ui.mergemarkertemplate. The old behavior
      can be used still by setting ui.mergemarkers=basic.
      
      The default format is similar to:
      
        {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"
      
      And renders as:
      
        contextblahblah
        <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
        line from my changes
        =======
        line from the other changes
        >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
        morecontextblahblah
      25d5a9ecbb85
  22. Apr 22, 2014
Loading