Skip to content
Snippets Groups Projects
  1. Mar 27, 2012
  2. Feb 15, 2012
    • Greg Ward's avatar
      phases: fix a non-standard debug message · bc1d9492
      Greg Ward authored
      - add missing newline
      - ditch gratuitous use of string formatting with dict
      - fix so it actually does string formatting ('%' rather than ',')
      - inline unnecessary local variable
      - downcase first word
      bc1d9492
  3. Mar 25, 2012
  4. Mar 24, 2012
    • Pierre-Yves David's avatar
      qfinish: comply with the phases.new-commit option in secret mode (issue3335) · 9518cb55
      Pierre-Yves David authored
      In secret mode qfinished changeset were move to the draft phase in all case[1]
      without regard to phases.new-commit value
      
      This changeset ensure qfinish does not automatically promote a changeset
      further than the phases.new-commit value.
      
      Note: This may also result in qfinished changeset made public if
      phases.new-commit is set to public.
      
      [1] "In all case" where parent have a compatible phase. Qfinish keep never
          altering phases of changeset not involved in the qfinish.
      9518cb55
  5. Mar 22, 2012
    • Greg Ward's avatar
      test-gpg: make sure gpg does not modify the trustdb.gpg file · aae219a9
      Greg Ward authored
      Tests really should not modify files in the Mercurial working dir
      where they ran from! I suspect that trustdb.gpg is now old enough that
      GPG thinks it should update it automatically. Suppress that feature
      with --no-auto-check-trustdb.
      aae219a9
  6. Mar 27, 2012
  7. Mar 23, 2012
  8. Mar 22, 2012
    • Katsunori FUJIWARA's avatar
      largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check · 50247a7a
      Katsunori FUJIWARA authored
      original implementation queries whether specified pattern is related
      or not to largefiles in target context by 'dirstate.__contains__()'.
      
      but this can't recognize 'directory pattern' correctly, so this patch
      uses 'dirstate.dirs()' for it.
      
      this patch uses dirstate instead of lfdirstate in 'working' route
      (second patch hunk for 'hgext/largefiles/reposetup.py'), because
      'dirs()' information may be already built for dirstate but not yet for
      lfdirstate at this point. this prevents lfdirstate from building up
      and having 'dirs()' information.
      50247a7a
    • Katsunori FUJIWARA's avatar
      largefiles: suppress unexpected warning of 'hg status' for removed files · d8cc6711
      Katsunori FUJIWARA authored
      original implementation queries whether specified pattern is related
      or not to largefiles, to target context.
      
      but changectx/workingctx returns False about relationship with files
      marked as removed.
      
      So, 'hg status' with 'file pattern' for removed file shows unexpected
      warning message in below process:
      
          1. 'tostandin()' returns non-STANDIN filename for removed file,
             because changectx/workingctx returns False about relationship
             with it
      
          2. 'match.files()' contains non-STANDIN filename, which is already
             removed from working directory
      
          3. 'dirstate.walk()' invoked via 'localrepository.status()' treats
             non-STANDIN filename as bad filename, because there is no entry
             for it in dirstate: only STANDIN is managed in dirstate
      
          4. 'dirstate.walk()' invokes 'match.bad()', which is defined in
             'localrepository.status()' as 'bad()'
      
          5. 'bad()' shows warning message for non-STANDIN, because it is
             not related to source context: only STANDIN is related to it
      
      this patch queries to dirstate instead of changectxt/workingctx,
      because dirstate returns expected result for removed files.
      
      'match.files()' is used by 'localrepository.status()' only in
      'working' case, so this patched code also works correctly in
      non-'working' case.
      d8cc6711
    • Matt Mackall's avatar
      rebase: properly calculate descendant set when aborting (issue3332) · 08068233
      Matt Mackall authored
      Checking for descendants of target being public was also wrong.
      08068233
    • Matt Mackall's avatar
      strip: ignore -n (issue3326) (BC) · 900eee07
      Matt Mackall authored
      -n could be confused for --dry-run by foolhardy users, resulting in
       permanent data loss.
      
      As leaving a backup when none was requested is significantly less
      disastrous, the short option is silently ignored. Old scripts continue
      to work, users only get lightly burned.
      900eee07
    • Matt Mackall's avatar
  9. Mar 21, 2012
  10. Mar 18, 2012
  11. Mar 14, 2012
  12. Mar 16, 2012
  13. Mar 15, 2012
    • Javi Merino's avatar
      tests: ignore git's output in test-subrepo-git.t · 0628290d
      Javi Merino authored
      git version 1.7.9.1 makes the testsuite fail with:
      
      @@ -482,7 +482,17 @@
      
       Sticky repository, update --clean
         $ hg update --clean tip
      -  Previous HEAD position was aa84837... f
      +  Warning: you are leaving 2 commits behind, not connected to
      +  any of your branches:
      +
      +    aa84837 f
      +    126f2a1 gg
      +
      +  If you want to keep them by creating a new branch, this may be a good time
      +  to do so with:
      +
      +   git branch new_branch_name aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
      +
         HEAD is now at 32a3438... fff
         1 files updated, 0 files merged, 0 files removed, 0 files unresolved
         $ hg id -n
      
      ERROR: test-subrepo-git.t output changed
      0628290d
  14. Mar 14, 2012
  15. Mar 13, 2012
  16. Mar 12, 2012
    • Wagner Bruna's avatar
      strip: enhance repair.strip to receive a list of nodes (issue3299) · cf17e76b
      Wagner Bruna authored
      Originally, mq.strip called repair.strip a single rev at a time.
      repair.strip stores in a backup bundle any revision greater than
      the revision being stripped, strips, then restores the backup with
      repo.addchangegroup. So, when stripping revisions on more than one
      topological branch, some could end up being restored from the backup
      bundle, only to be later removed by a subsequent repair.strip call.
      
      But repo.addchangegroup calls hooks for all those restore operations.
      And 9df9444e96ec changed it to delay all hook calls until the
      repository lock were released - by mq.strip, after stripping all
      revisions. Thus, the hooks could be called over revisions already
      removed from the repository at that point.
      
      By generating the revision lists at once inside repo.strip, we avoid
      calling addchangegroup for temporary restores. Incidentally, this
      also avoids creating many backup files for a single strip command.
      cf17e76b
    • Johan Samyn's avatar
      help: add verb to sentence in phases.txt · 3d26d69e
      Johan Samyn authored
      3d26d69e
  17. Mar 09, 2012
    • Michael Bacarella's avatar
      localrepo: fix unpushable repos when using bookmarks (issue3317) · b9c43023
      Michael Bacarella authored
      bookmarks is copied to journal.bookmarks differently from how dirstate is
      copied to journal.dirstate.  The different way is less robust, which can render
      the repo unpushable by other users if the first pushing user aborts their
      transaction.
      
      The underlying cause is that the copyfile method attempts an unnecessary chmod,
      which fails if the user is not the owner of the journal.bookmarks file.
      
      This patch makes the bookmarks journaling more consistent with the rest of the
      journaling, and will allow users to update lingering journal.bookmarks files
      that they're not the owners of.
      b9c43023
  18. Mar 12, 2012
  19. Mar 08, 2012
  20. Mar 07, 2012
    • Javi Merino's avatar
      update: don't translate the abort message twice · d4d35fd0
      Javi Merino authored
      The string representation of util.Abort() is translated when
      merge.update() raises the exception.  For languages with characters
      out of the valid ascii range, if we feed them again to i18n.gettext()
      mercurial dies with:
      
      [...]
        File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming
          ui.warn(_("not updating: %s\n" % str(inst)))
        File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext
          u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
        File "/usr/lib/python2.7/gettext.py", line 404, in ugettext
          return unicode(message)
      UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128)
      
      To reproduce this error, just try to pull a changeset that crosses
      branches with LANG=ru_RU.UTF-8
      d4d35fd0
  21. Mar 04, 2012
  22. Mar 01, 2012
  23. Mar 04, 2012
  24. Mar 02, 2012
  25. Feb 29, 2012
Loading