Skip to content
Snippets Groups Projects
  1. Oct 08, 2014
    • Martin von Zweigbergk's avatar
      merge: make error message consistent with other commands · 18b38691
      Martin von Zweigbergk authored
      If a merge is attempted when another merge is already ongoing, we give
      the message "outstanding uncommitted merges". Many other commands
      (such as backout, rebase, histedit) give the same message in singular
      form. Since the singular form also seems to make more sense, let's use
      that for 'hg merge' as well.
      18b38691
  2. Oct 10, 2014
  3. Oct 09, 2014
    • durin42's avatar
      run-tests: handle --jobs and --first gracefully · 9a20f53e
      durin42 authored
      Without this change, --first causes currently-running tests to explode
      in violent and surprising ways when their temporary directory gets
      cleaned up. Now we just suppress failure messages from non-first
      failures when running in --first mode.
      9a20f53e
  4. Oct 06, 2014
    • Jordi Gutiérrez Hermoso's avatar
      config: use the same hgrc for a cloned repo as for an uninitted repo · 2be7d5eb
      Jordi Gutiérrez Hermoso authored
      This just copies the same local sample hgrc, except it sets the
      default path to the repo it was cloned from.
      
      This is cut-and-paste from the local sample hgrc, but I think it's
      acceptable, since the two pieces of code are right next to each other
      and they're small. There is danger of them going out of synch, but it
      would complicate the code too much to get rid of this C&P.
      
      I also add ui as an import to hg.py, but with demandimport, this
      should not be a noticeable performance hit.
      2be7d5eb
  5. Oct 08, 2014
    • Jordi Gutiérrez Hermoso's avatar
      config: give a more detailed sample repo config · 5a831e4e
      Jordi Gutiérrez Hermoso authored
      Some examples of the typical configurations that one might want to do
      in an .hg/hgrc file. This includes a default-push that happens to
      point to the same location as my-fork.
      
      I insist on the myfork terminology for a server-side clone. Bitbucket,
      Github, and others have widely popularised this meaning of "fork".
      
      This also includes a gentle nudge to use a repo-specific username,
      which is something that people might not instinctively realise is an
      option.
      5a831e4e
  6. Oct 07, 2014
  7. Oct 03, 2014
    • Pierre-Yves David's avatar
      baseset: explicitly track order of the baseset · 36e09c25
      Pierre-Yves David authored
      A baseset starts without an explicit order. But as soon as a sort is requested,
      we simply register that the baseset has an order and use the ordered version of
      the list to behave accordingly.
      
      We will want to properly record the order at creation time in the future. This
      would unlock more optimisation and avoid some sorting.
      36e09c25
    • Pierre-Yves David's avatar
      baseset: fix isascending and isdescending · 966860f7
      Pierre-Yves David authored
      We now have sufficient information to return the proper value there.
      966860f7
    • Pierre-Yves David's avatar
      baseset: prepare lazy ordering in __iter__ · c1107cb2
      Pierre-Yves David authored
      We'll explicitly track the order of the baseset to take advantage of the
      ascending and descending lists during iteration.
      c1107cb2
    • Pierre-Yves David's avatar
      baseset: implement a fastasc and fastdesc · 4ffb327e
      Pierre-Yves David authored
      Baseset contains already-computed revisions. It is considered "cheap" to do
      operations on an already-computed set. So we add attributes to hold version of
      the list in ascending and descending order and use them for `fastasc` and
      `fastdesc`. Having distinct lists is important to provide correct iteration in
      all cases. Altering a python list will impact an iterator connected to it.
      
      eg: not preserving order at iterator creation time
      
          >>> l = [0, 1]
          >>> i = iter(l)
          >>> l.reverse()
          >>> list(i)
          [1, 0]
      
      eg: corrupting in progress iteration
      
          >>> l = [0, 1]
          >>> i = iter(l)
          >>> i.next()
          0
          >>> l.reverse()
          >>> i.next()
          0
      4ffb327e
  8. Oct 06, 2014
    • Pierre-Yves David's avatar
      baseset: stop inheriting from built-in list class · 0e8bb81b
      Pierre-Yves David authored
      The baseset is doing more and more smartset magic and using its list-like
      property less and less. So we store the list of revisions in an explicit
      attribute and stop inheriting.
      
      This requires reimplementing some basic methods.
      0e8bb81b
  9. Oct 07, 2014
  10. Oct 06, 2014
  11. Oct 07, 2014
  12. Oct 06, 2014
  13. Oct 07, 2014
    • Pierre-Yves David's avatar
      getgraphlogrevs: remove user of baseset.append · cd43195e
      Pierre-Yves David authored
      A `baseset` has multiple cached results and will get even more in the future.
      Making it an object "populated once" like the other smartsets makes it both safer
      and simpler. The append method will be removed at some point.
      cd43195e
    • Pierre-Yves David's avatar
      getlogrevs: remove user of baseset.append · 65ccc733
      Pierre-Yves David authored
      A `baseset` has multiple cached results and will get even more in the future.
      Making it an object "populated once" like the other smartsets makes it both safer
      and simpler. The append method will be removed at some point.
      65ccc733
  14. Oct 08, 2014
    • Pierre-Yves David's avatar
      revset-last: remove user of baseset.append · e74245b7
      Pierre-Yves David authored
      A `baseset` has multiple cached results and will get even more in the future.
      Making it an object "populated once" like the other smartsets makes it both safer
      and simpler. The append method will be removed at some point.
      e74245b7
  15. Oct 06, 2014
    • Pierre-Yves David's avatar
      revset-limit: remove user of baseset.append · 5385314e
      Pierre-Yves David authored
      A `baseset` has multiple cached results and will get even more in the future.
      Making it an object "populated once" like the other smartsets makes it both safer
      and simpler. The append method will be removed at some point.
      5385314e
  16. Oct 07, 2014
  17. Oct 06, 2014
Loading