Skip to content
Snippets Groups Projects
  1. Feb 23, 2013
  2. Feb 22, 2013
  3. Feb 21, 2013
  4. Feb 20, 2013
  5. Feb 19, 2013
  6. Feb 09, 2013
    • Na'Tosha Bard's avatar
      largefiles: don't cache largefiles for pulled heads by default · d69585a5c5c0
      Na'Tosha Bard authored
      After discussion, we've agreed that largefiles for newly pulled heads should
      not be cached by default.  The use case for this is using largefiles repos
      with multiple remote servers (and therefore multiple remote largefiles caches),
      where users will be pulling from non-default locations on a regular basis.  We
      think this use case will be significantly less common than the use case where
      all largefiles are stored on the same central server, so the default should be
      no caching.
      
      The old behavior can be obtained by passing the --cache-largefiles flag to
      pull.
      d69585a5c5c0
  7. Feb 18, 2013
  8. Feb 17, 2013
    • Katsunori FUJIWARA's avatar
      bundle: treat branches created newly on the local correctly (issue3828) · 61c8327ced50
      Katsunori FUJIWARA authored
      Before this patch, "hg bundle --branch foo other" fails to create
      bundle file, if specified "foo" branch is created newly on the local
      repository.
      
      "hg bundle" uses "hg.addbranchrevs(repo, other, ...)" to look branch
      names up, even though other outgoing-like implementation uses
      "hg.addbranchrevs(repo, repo, ...)". In the former invocation, "other"
      repository recognizes such branches as unknown, so execution is
      aborted.
      
      This patch uses "hg.addbranchrevs(repo, repo, ..)" in "hg bundle" to
      bundle revisions on such branches correctly.
      61c8327ced50
  9. Feb 16, 2013
  10. Feb 15, 2013
    • Kevin Bullock's avatar
      mergetools: refine vimdiff warning message · 7d66a44e87ed
      Kevin Bullock authored
      We explicitly redraw before echoing the message so that it simply
      displays at the bottom of the window. Also simplifies the message
      printing by using 'echomsg' (which uses 'echohl' internally) and adds
      the names of the software involved for improved Googleability.
      7d66a44e87ed
    • Pierre-Yves David's avatar
      mergetools: vimdiff issue a warning explaining how to abort · f2b1f78cf202
      Pierre-Yves David authored
      Adds a message displayed at each vimdiff invocation:
      
        merge conflict detected, type ":cq" to abort
      
      Vimdiff is very confusing for non-vim user (not to speak about vim user confused
      anyway. However it is very likely that vimdiff is picked as the mergetool of
      choice when using the default config:
      - vim is available on all UNIX system.
      - Its one of the rare non graphical merge tools.
      f2b1f78cf202
  11. Feb 17, 2013
    • Matt Mackall's avatar
      httppeer: improve protocol check · 4921b5c2aeed
      Matt Mackall authored
      Pre-0.6c hgweb used text/plain for protocol responses. This meant
      that a web server could serve a static file and confuse a client into
      generating a nasty traceback.
      
      Now we insist that text/plain protocol responses not include a
      Content-Length, which older hgweb didn't generate but will typically
      be produced for static files.
      4921b5c2aeed
    • Matt Mackall's avatar
      httppeer: avoid large dumps when we don't see an hgweb repo · d23f61b6617f
      Matt Mackall authored
      When we don't get an hgweb protocol response, we dump the response to
      the user for diagnostic purposes (it might be a cgitb message, for
      instance).
      
      But if we try to clone a bundle, we don't want to show the
      entire bundle in the error message. Also, we don't want fetch the
      full bundle multiple times during fallback. So we only fetch 1k here.
      d23f61b6617f
  12. Feb 15, 2013
    • Kevin Bullock's avatar
      mergetools: refine vimdiff warning message · ec9b9968b7f8
      Kevin Bullock authored
      We explicitly redraw before echoing the message so that it simply
      displays at the bottom of the window. Also simplifies the message
      printing by using 'echomsg' (which uses 'echohl' internally) and adds
      the names of the software involved for improved Googleability.
      ec9b9968b7f8
    • Pierre-Yves David's avatar
      mergetools: vimdiff issue a warning explaining how to abort · 6a012704c841
      Pierre-Yves David authored
      Adds a message displayed at each vimdiff invocation:
      
        merge conflict detected, type ":cq" to abort
      
      Vimdiff is very confusing for non-vim user (not to speak about vim user confused
      anyway. However it is very likely that vimdiff is picked as the mergetool of
      choice when using the default config:
      - vim is available on all UNIX system.
      - Its one of the rare non graphical merge tools.
      6a012704c841
  13. Feb 12, 2013
    • Simon Heimberg's avatar
      dispatch: also a separate warning message on aliases with --config · 633cd0c46e6a
      Simon Heimberg authored
      As mentioned in bug 2043, --config is also not supported in an alias. So report
      this the same way as the other "early" options.
      
      Example with alias.broken = stat --config a.config=1
      
      Before:
        $ hg broken
        abort: Option --config may not be abbreviated!
      
      After:
        $ hg broken
        error in definition for alias 'broken': --config may only be given on the command line
      633cd0c46e6a
  14. Feb 14, 2013
  15. Feb 13, 2013
    • Durham Goode's avatar
      blackbox: do not translate the log messages · 4f485bd68f1d
      Durham Goode authored
      User 'timeless' in irc mentioned that having the blackbox be
      translated would result in logs that:
      
      - may be mixed language, if multiple users use the same repo
      - are not google searchable (since searching for english gives more
        results)
      - might not be readable by an admin if the employee is using hg in
        his native language
      
      And therefore we should log everything in english.
      4f485bd68f1d
  16. Feb 12, 2013
    • Kevin Bullock's avatar
      scmutil: split platform-specific bits into their own modules · 4c6f7f0dadab
      Kevin Bullock authored
      This parallels what's done for the util module, which imports either
      mercurial.posix or mercurial.windows as 'platform' and then slurps the
      appropriate functions into its own namespace.
      4c6f7f0dadab
    • Kevin Bullock's avatar
      backout: call cmdutil.commit directly instead of commands.commit · 12721a20ed30
      Kevin Bullock authored
      This cleans up the messiness of having one command call another, and
      makes the backout command robust against changes to the commit command.
      12721a20ed30
    • Kevin Bullock's avatar
      commit: factor out status printing into a helper function · 79107fad06aa
      Kevin Bullock authored
      We create a new function commitstatus() in cmdutil that handles printing
      the status message(s) after a commit. This will allow other commit-like
      commands to use it, and in particular is step 2 towards removing
      backout's call to commands.commit.
      79107fad06aa
    • Kevin Bullock's avatar
      backout: remove unnecessary dict copy · 1d183b33f007
      Kevin Bullock authored
      This is step 1 to remove backout's call to commands.commit. We don't use
      the options again anywhere below except for backout's own purposes,
      specifically choosing a merge tool, so we just write the commit options
      in directly.
      1d183b33f007
    • Kevin Bullock's avatar
      backout: remove unnecessary frobbing of addremove option · 0bca4d31f647
      Kevin Bullock authored
      There's no way for addremove to show up in backout's opts dictionary. It
      was being set manually because cmdutil.commit expected it to be there
      (and would throw an exception if it wasn't). This was fixed waaaaaaay
      back in:
      
      changeset:   5829:784073457a0f
      user:        Kirill Smelkov <kirr@mns.spb.ru>
      date:        Thu Jan 10 12:07:18 2008 +0300
      summary:     cmdutil.commit: extract 'addremove' from opts carefully
      0bca4d31f647
    • Kevin Bullock's avatar
      backout: use cmdutil.revert directly instead of commands.revert · fafdff7e9c43
      Kevin Bullock authored
      Before this change, backout would explicitly set the options it passed
      to commands.revert in order to fall thru most of its logic and call
      cmdutil.revert. This change makes it clearer what backup is trying to
      accomplish and makes it robust against changes to the revert command.
      fafdff7e9c43
  17. Feb 13, 2013
  18. Oct 15, 2012
    • Simon Heimberg's avatar
      tests: inform on Windows about unnecessary glob lines · 7591ed29e824
      Simon Heimberg authored
      When glob lines directly match on windows, "/" (and not "\") was output in the
      path on the line. No glob matching is necessary in this case.
      
      The test output will look like this (when 5 tests have passed and no 4 has an
      unnecessary glob):
      ...
      Info, unnecessary glob: info about some/thing (glob)
      ..
      7591ed29e824
Loading