Skip to content
Snippets Groups Projects
  1. Nov 17, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --source set · 3bff26f67169
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "source" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      3bff26f67169
  2. Nov 16, 2013
    • Mads Kiilerich's avatar
      rebase: improve error message for empty --rev set · a259f7b488ab
      Mads Kiilerich authored
      Before, it just said 'nothing to rebase' in this case. Now, it aborts
      mentioning the reason: 'empty "rev" revision set'.
      
      Specifying revisions that cannot be rebased is a 'soft' error, but specifying
      an empty set deserves an abort that explains exactly what the problem is.
      a259f7b488ab
  3. Nov 17, 2013
  4. Nov 21, 2013
    • Mads Kiilerich's avatar
      help: branch names primarily denote the tipmost unclosed branch head · 4edd179fefb8
      Mads Kiilerich authored
      Was the behavior correct and the description wrong so it should be updated as
      in this patch? Or should the code work as the documentation says?
      
      Both ways could make some sense ... but none of them are obvious in all cases.
      
      One place where it currently cause problems is when the current revision has
      another branch head that is closer to tip but closed. 'hg rebase' refuses to
      rebase to that as it only see the tip-most unclosed branch head which is the
      current revision.
      
      /me kind of likes named branches, but no so much how branch closing works ...
      4edd179fefb8
  5. Jan 12, 2014
    • Mads Kiilerich's avatar
      util: introduce util.debugstacktrace for showing a stack trace without crashing · 47d0843647d1
      Mads Kiilerich authored
      This is often very handy when hacking/debugging.
      
      Calling util.debugstacktrace('hey') from a place in hg will give something like:
        hey at:
         ./hg:38                                     in <module>
         /home/user/hgsrc/mercurial/dispatch.py:28   in run
         /home/user/hgsrc/mercurial/dispatch.py:65   in dispatch
         /home/user/hgsrc/mercurial/dispatch.py:88   in _runcatch
         /home/user/hgsrc/mercurial/dispatch.py:740  in _dispatch
         /home/user/hgsrc/mercurial/dispatch.py:514  in runcommand
         /home/user/hgsrc/mercurial/dispatch.py:830  in _runcommand
         /home/user/hgsrc/mercurial/dispatch.py:801  in checkargs
         /home/user/hgsrc/mercurial/dispatch.py:737  in <lambda>
         /home/user/hgsrc/mercurial/util.py:472      in check
      ...
      47d0843647d1
  6. Jan 07, 2014
  7. Nov 16, 2013
    • Mads Kiilerich's avatar
      bisect: --command without --noupdate should flag the parent rev it tested · 0d32dd60016c
      Mads Kiilerich authored
      14913fcb30c6 not only introduced the 'bisect(current)' revset predicate, it
      also changed how the 'current' revision is used in combination with --command.
      The new behaviour might be ok for --noupdate where the working directory and
      its revision shouldn't be used, but it also did that when --command is used to
      run a command on the currently checked out revision then it could register the
      test result on the wrong revision.
      
      An example:
      
      Before, bisect with --command could use the wrong revision when recording the
      test result:
      
        $ hg up -qr 0
        $ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters"
        changeset 31:58c80a7c8a40: bad
        abort: inconsistent state, 31:58c80a7c8a40 is good and bad
      
      Now it works as before and as expected and uses the working directory revision
      for the --command result:
      
        $ hg up -qr 0
        $ hg bisect --command "python \"$TESTTMP/script.py\" and some parameters"
        changeset 0:b99c7b9c8e11: bad
        ...
      0d32dd60016c
    • Mads Kiilerich's avatar
      context: drop caching 'copies' method · d0097d5818f9
      Mads Kiilerich authored
      The 'copies' method has no test coverage and calls copies.pathcopies with an
      incorrect number of parameters and is thus (fortunately) not used. Kill it.
      d0097d5818f9
  8. Nov 19, 2013
  9. Nov 22, 2013
  10. Nov 19, 2013
  11. Nov 17, 2013
  12. Jan 13, 2014
  13. Jan 08, 2014
    • David Soria Parra's avatar
      i18n-de: rename noun "entfernt" to "Gegenseite" · 45aac162da03
      David Soria Parra authored
      The German translation for "remote" as "entfernt" can be misleading
      in situations where remote is used as a noun. "entfernt" is not a
      noun and can also mean "removed". To clarify this we rename "remote"
      to "Gegenseite" when used as a noun.
      45aac162da03
  14. Jan 10, 2014
  15. Nov 16, 2013
  16. Nov 05, 2013
    • Pierre-Yves David's avatar
      push: more robust check for bundle fast path · 7401bb54fe76
      Pierre-Yves David authored
      When all changesets in the local repo are either being pushed or remotly known,
      we can take a fast path when bundling changeset because we are certain all local
      deltas are computed againts base known remotely.
      
      So we have a check to detect this situation, when we did a bare push and nothing
      was excluded.
      
      In a coming refactoring, the discovery will run on filtered view and the content
      of `outgoing.excluded` will just include unserved (secret) changeset not filtered by the
      repoview used to call push (usually "visible"). So we need to check if there is
      both no excluded changeset and nothing filtered by the current repoview.
      7401bb54fe76
  17. Nov 16, 2013
    • Pierre-Yves David's avatar
      pull: fix post-pull common computation · 2888a412f0b0
      Pierre-Yves David authored
      Before that changes, pulled revision that happend to be already known locally
      (so, not actually added) was not taken into account when computing the new
      common set between local and remote.
      
      It appears that we already know the heads of the pulled set. It is in the
      `rheads` variable, so we are just using it and everything is works fine.
      
      We are dropping the, now useless, computation of `added` set in the process.
      2888a412f0b0
  18. Nov 25, 2013
  19. Dec 23, 2013
  20. Nov 26, 2013
    • Durham Goode's avatar
      revlog: move file writing to a separate function · 33394f2e331e
      Durham Goode authored
      Moves the code that actually writes to a file to a separate function in
      revlog.py. This allows extensions to intercept and use the data being written to
      disk. For example, an extension might want to replicate these writes elsewhere.
      
      When cloning the Mercurial repo on /dev/shm with --pull, I see about a 0.3% perf change.
      It goes from 28.2 to 28.3 seconds.
      33394f2e331e
  21. Nov 24, 2013
  22. Jan 02, 2014
  23. Dec 30, 2013
  24. Jan 01, 2014
Loading