Skip to content
Snippets Groups Projects
  1. Mar 08, 2011
  2. Mar 07, 2011
  3. Mar 06, 2011
  4. Mar 07, 2011
    • Steven Brown's avatar
      httprepo: order URL query string fields for readability · 970150dd
      Steven Brown authored
      - cmd is always first, since the other fields are arguments to that command.
      - The other fields are in alphabetical order, rather than random order.
      
      example "hg serve" output
      BEFORE
      127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
      127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 -
      127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 -
      
      AFTER
      127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
      127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 -
      127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -
      970150dd
    • Matt Mackall's avatar
      ancestor: improve description · 22565ddb
      Matt Mackall authored
      22565ddb
    • Eric Eisner's avatar
      dea6efdd
    • Matt Mackall's avatar
      ancestor: rewrite to deal with crossed linkrevs (issue2682) · 7ab85fec
      Matt Mackall authored
      This version is about 10% slower, possibly because it visits some
      revisions in a different topological order than what's in the revlog.
      7ab85fec
  5. Mar 06, 2011
  6. Mar 07, 2011
    • Matt Mackall's avatar
      merge: back out single-parent fast-forward merge · 1792b8a9
      Matt Mackall authored
      This backs out
      
       changeset:   13158:9e7e24052745
       user:        Mads Kiilerich <mads@kiilerich.com>
       date:        Tue Dec 07 03:29:21 2010 +0100
       summary:     merge: fast-forward merge with descendant
      
      Before named branches, the invariants were:
      
      a) "merges" always have two parents
      b) p1 is not linearly related to p2
      
      Adding named branches made (b) problematic, so the above patch was
      introduced, which fixed (b) but broke (a).
      
      After discussion, we decided that the invariants should be:
      
      a) "merges" always have two parents
      b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
      1792b8a9
  7. Mar 05, 2011
  8. Mar 06, 2011
  9. Mar 05, 2011
  10. Feb 18, 2011
  11. Mar 04, 2011
    • Patrick Mezard's avatar
      Merge with stable · d4c2f2ac
      Patrick Mezard authored
      d4c2f2ac
    • Patrick Mezard's avatar
      subrepo: handle svn tracked/unknown directory collisions · 67fbe566
      Patrick Mezard authored
      This happens more often than expected. Say you have an svn subrepository with
      python code. Python would have generated unknown .pyc files. Now, you rebase
      this setup on a revision where a directory containing python code does not
      exist. Subversion is first asked to remove this directory when updating, but
      will not because it contains untracked items. Then it will have to bring back
      the directory after the merge but will fail because it now collides with an
      untracked directory.
      
      Using --force is not very elegant but it is much simpler than rewriting our own
      purge command for subversion.
      67fbe566
  12. Mar 03, 2011
Loading