Skip to content
Snippets Groups Projects
  1. Apr 17, 2014
  2. Apr 16, 2014
    • Pierre-Yves David's avatar
      bundle2: capture remote stdout while unbundling · b7435117
      Pierre-Yves David authored
      When a reply is built, the bundle processing will capture the output of each
      handler and sends it to the client in a dedicated part.
      
      As a side effect, this add a "remote: " prefix to destination output on local
      push. This is considered okay for now as:
      
      1. bundle2 is still experimental,
      2. Matt said he could be okay to change output for bundle2,
      3. This keeps the implementation simple.
      
      This changeset does it for stdout only. stderr will be done in a future changeset.
      b7435117
    • Pierre-Yves David's avatar
      bundle2: introduce `replycaps` part for on-demand reply · 1ff06386
      Pierre-Yves David authored
      The bundle2 processing does not create a bundle2 reply by default anymore.  It
      is only done if the client requests it with a `replycaps` part. This part is
      called `replycaps` as it will eventually contain data about which bundle2
      capabilities are supported by the client.
      
      We have to add a flag to the test command to control whether a reply is
      generated or not.
      1ff06386
    • Pierre-Yves David's avatar
      bundle2: use an official iterparts method to unbundle parts · 07bcbf32
      Pierre-Yves David authored
      Explicit is better than implicit.
      07bcbf32
  3. Feb 28, 2014
    • Mads Kiilerich's avatar
      merge: with merge.preferancestor=*, run an auction with bids from ancestors · f4014f64
      Mads Kiilerich authored
      The basic idea is to do the merge planning with all the available ancestors,
      consider the resulting actions as "bids", make an "auction" and
      automatically pick the most favourable action for each file.
      
      This implements the basic functionality and will only consider "keep" and
      "get" actions. The heuristics for picking the best action can be tweaked later
      on.
      
      By default it will only pass ctx.ancestor as the single ancestor to
      calculateupdates. The code path for merging with a single ancestor is not
      changed.
      f4014f64
    • Lucas Moscovicz's avatar
      log: changed implementation to use graphlog code · 69402eb7
      Lucas Moscovicz authored
      Now that revsets work in a lazy way, log code can be changed to parse every
      option into a revset and then evaluate it lazily.
      
      Now expressions like
      
        "hg log -b default -b ."
      
      are converted into a revset using the same code as graphlog.
      69402eb7
  4. Feb 24, 2014
    • Mads Kiilerich's avatar
      context: introduce merge.preferancestor for controlling which ancestor to pick · 99b5eaf3
      Mads Kiilerich authored
      Multiple revisions can be specified in merge.preferancestor, separated by
      whitespace. First match wins.
      
      This makes it possible to overrule the default of picking the common ancestor
      with the lowest hash value among the "best" (introduced in 3605d4e7e618).
      
      This can for instance help with some merges where the 'wrong' ancestor is used.
      There will thus be some overlap between this and the problems that can be
      solved with a future 'consensus merge'.
      
      Mercurial will show a note like
        note: using 40663881a6dd as ancestor of 3b08d01b0ab5 and adfe50279922
              alternatively, use --config merge.preferancestor=0f6b37dbe527
      when the option is available, listing all the alternative ancestors.
      99b5eaf3
  5. Apr 17, 2014
    • Mads Kiilerich's avatar
      context: tell when .ancestor picks one of multiple common ancestors heads · e94e90a4
      Mads Kiilerich authored
      Show a message like
        note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5
      
      So far this is just a warning - there is nothing the user can do to select
      another ancestor.
      e94e90a4
    • Katsunori FUJIWARA's avatar
      hgweb: align entries in "changelog" and "revisions" pages of "spartan" style · a6571421
      Katsunori FUJIWARA authored
      Before this patch, each log entries in "changelog" and "revisions"
      pages of "spartan" style are not aligned by column, because:
      
        - each log entries are separated "<table>" entries, and
        - there are no fixed "width" information for each "<th>"/"<td>" entries
      
      This patch aligns entries in "changelog" and "revisions" pages of
      "spartan" style by:
      
        - adding 'label' class to '<th>' for 'age' information, and
        - setting 'width' of '<th class="label">' with fixed size
      
      'class="age"' is not used for this purpose, because it is also used to
      set "bold" font-weight
      
      "16em" seems to be wide enough to show date information fully, when
      web browser disables (or doesn't support) javascript.
      a6571421
    • Katsunori FUJIWARA's avatar
      hgweb: show revisions and hashes gotten from changelog in "comparison" page · 92fab48d
      Katsunori FUJIWARA authored
      Before this patch, revision numbers and hash values in "comparison"
      page are gotten from not changelog but filelog.
      
      Such filelog information is useful only for hgweb debugging, and may
      confuse users.
      
      This patch shows revision numbers and hash values gotten from
      changelog in "comparison" page.
      92fab48d
Loading