Skip to content
Snippets Groups Projects
  1. Jul 23, 2013
  2. Jul 21, 2013
  3. Jul 19, 2013
  4. Jul 12, 2013
    • Shun-ichi GOTO's avatar
      osutil: consider WindowsError's behaviour to support python 2.4 on Windows · 004f965630d9
      Shun-ichi GOTO authored
      This change treat the ESRCH error as ENOENT like WindowsError class
      does in python 2.5 or later. Without this change, some try..execpt
      code which expects errno is ENOENT may fail. Actually hg command does
      not work with python 2.4 on Windows.
      
      CreateFile() will fail with error code ESRCH
      when parent directory of specified path is not exist,
      or ENOENT when parent directory exist but file is not exist.
      Two errors are same in the mean of "file is not exist".
      So WindowsError class treats error code ESRCH as ENOENT
      in python 2.5 or later, but python 2.4 does not.
      
      Actual results with python 2.4:
      >>> errno.ENOENT
      2
      >>> errno.ESRCH
      3
      >>> WindowsError(3, 'msg').errno
      3
      >>> WindowsError(3, 'msg').args
      (3, 'msg')
      
      And with python 2.5 (or later):
      >>> errno.ENOENT
      2
      >>> errno.ESRCH
      3
      >>> WindowsError(3, 'msg').errno
      2
      >>> WindowsError(3, 'msg').args
      (3, 'msg')
      
      Note that there is no need to fix osutil.c because it never be used
      with python 2.4.
      004f965630d9
  5. Jul 17, 2013
    • Matthew Turk's avatar
      churn: split email aliases from the right · 68f7129af6a8
      Matthew Turk authored
      This splits churn email aliases from the right, to enable incorrectly-specified
      addresses that include equal signs to be mapped to correct addresses.  This
      will enable aliasing of bad addresses (typically typos) such as:
      
      sername=myusername
      
      that appear in the churn output through a churn alias such as:
      
      sername=myusername = myusername
      
      whereas previously splitting from the left would not enable this behavior.
      68f7129af6a8
  6. Jul 14, 2013
  7. Jul 12, 2013
    • Alexander Plavin's avatar
      hgweb: always start log with searched revision · a87d9102f7af
      Alexander Plavin authored
      This makes the specified revision be always on top of the list.
      Before the patch, for example with repo having revisions 0, 1, 2, 3 and user
      searching for '2', all revisions were shown and the specified one wasn't
      the first.
      a87d9102f7af
  8. Jul 01, 2013
  9. Jul 19, 2013
  10. Jul 13, 2013
  11. Jul 18, 2013
    • Mads Kiilerich's avatar
      convert: fix bad conversion of copies when hg.startrev is specified · 948df0f10ec1
      Mads Kiilerich authored
      The 'copynode' was looked up in self.keep as if it was a changeset node. It is
      however a filelog node, and self.keep would thus fail if it actually looked at
      its parameter ... which it only did if a startrev was specified.
      
      Instead we now don't check the copy node - we don't have to. It must have been
      copied from one of the parents, and we already check whether one of the parents
      have the copy source.
      
      We could perhaps use linkrev to see if the corresponding changeset was
      converted ... but that would sometimes be wrong.
      
      The existing test of this was wrong - now it is better, but it seems like it
      exposes a 'log' issue.
      948df0f10ec1
    • Mads Kiilerich's avatar
      test-convert-hg-startrev: fix test for copy removal on missing parent · 2345c9eb73c7
      Mads Kiilerich authored
      The test assumed that 'b' was missing just because the changeset that
      introduced 'b' wasn't converted ... but 'b' was also not removed before the
      start revision, and the parent was thus not missing at all.
      
      Instead we introduce a file 'f' in rev 0 and remove it in rev 1 so the copy
      source really doesn't exist in the repo that is converted from rev 1.
      2345c9eb73c7
  12. Jul 13, 2013
  13. Jul 18, 2013
  14. Jul 14, 2013
  15. Jul 12, 2013
  16. Jul 11, 2013
    • Jordi Gutiérrez Hermoso's avatar
      commit: enable --secret option · 4a0d0616c47d
      Jordi Gutiérrez Hermoso authored
      At the moment, creating secret commits is slightly cumbersome. They
      can either be created by changing the default commit phase to secret
      or by doing `hg phase --secret --force`. Both of these make secret
      commits appear to be like some kind of advanced feature.
      
      Secret commits, however, should be a convenient feature for people who
      want to work on a private branch without affecting anyone else. There
      should therefore be a prominent and convenient method for creating
      secret commits.
      
      Since the default phase is draft and there is no need to use --force
      to go from a secret phase to any other phase, this patch
      intentionally does not add --draft and --public options.
      4a0d0616c47d
  17. Jul 17, 2013
    • Florence Laguzet's avatar
      merge: deprecate the --force option · f4148c36f0aa
      Florence Laguzet authored
      The --force option in merge does not make what people think it does so
      it may not be visible to everyone.
      
      I have local changes and want to pull one's changes which made 2 heads.
      The --force option in help says
      
       -f --force      force a merge with outstanding changes
      
      so I can expect that I can use it to force the merge and commit it in my
      local repository without taking my local changes into account. But
      merging with -f keeps local changes and "add" them: they must be
      committed or reverted before doing the merge commit. The merge -f cannot
      be reverted so it leads my repository in a bad state: cannot commit
      merge and don't want to revert/commit local changes yet.
      
      Message in help have been updated to emphasize the fact that local
      changes are included in the merge.
      f4148c36f0aa
  18. Jul 18, 2013
  19. Jul 11, 2013
  20. Jul 18, 2013
  21. Jul 12, 2013
Loading