Skip to content
Snippets Groups Projects
  1. Oct 02, 2011
    • Greg Ward's avatar
      import: wrap a transaction around the whole command · 62dc0e7a
      Greg Ward authored
      Now 'rollback' after 'import' is less surprising: it rolls back all of
      the imported changesets, not just the last one. As an extra added
      benefit, you don't need 'rollback -f' after 'import --bypass', which
      was an undesired side effect of fixing issue2998 (59e8bc22506e)..
      
      Note that this is a different take on issue963, which complained that
      rollback after importing multiple patches returned the working dir
      parent to the starting point, not to the second-last patch applied.
      Since we now rollback the entire import, returning the working dir to
      the starting point is entirely logical. So this change also undoes
      a732eebf1958, the fix to issue963, and updates its tests accordingly.
      
      Bottom line: rollback after import was weird before issue963,
      understandable since the fix for issue963, and even better now.
      62dc0e7a
    • Greg Ward's avatar
      import: improve error reporting · 7f65ce5c
      Greg Ward authored
      When applying a series of patch files, it's nice to be explicitly told *which* file is broken.
      7f65ce5c
    • Greg Ward's avatar
      import: join base with patchurl *after* checking for stdin · 7f78a413
      Greg Ward authored
      This only matters when using the deprecated --base option, and
      combining --base with a patch on stdin makes no sense. But it's such
      an obvious bug and easy fix that I couldn't pass it by.
      7f78a413
    • Greg Ward's avatar
      import: rename some local variables · 5b2a3bb0
      Greg Ward authored
      5b2a3bb0
    • Greg Ward's avatar
      import: simplify status reporting logic (and make it more I18N-friendly) · 0705f2ac
      Greg Ward authored
      The old code printed (with ui.status()) the changeset ID created by
      patch N after committing patch N+1, e.g.
      
        applying patch1
        applying patch2
        applied 1d4bd90af0e4
      
      where 1d4bd90af0e4 is the changeset ID resulting from patch1. That's
      just weird. It's also inconsistent: we only reported the changeset ID
      when applying >1 patches. And it's inconsistent with 'commit', which
      only tells you the new changeset ID in verbose mode. Finally, the
      existing code was I18N-hostile, since it concatenated translated
      strings.
      
      The new way is to print the just-created changeset ID with ui.note()
      immediately after committing it. It also clarifies what the user
      message is for easier I18N.
      0705f2ac
  2. Oct 07, 2011
  3. Oct 02, 2011
  4. Oct 01, 2011
  5. Sep 30, 2011
  6. Sep 26, 2011
  7. Sep 30, 2011
  8. Sep 29, 2011
  9. Sep 24, 2011
  10. Sep 28, 2011
  11. Sep 08, 2010
    • Matt Mackall's avatar
      patchbomb: use prompt even in non-interactive mode · 3a55cee8
      Matt Mackall authored
      This matches our pre-existing behavior from:
      
      changeset:   12197:540693065d40
      user:        Christian Ebert <blacktrash@gmx.net>
      files:       hgext/patchbomb.py tests/test-patchbomb.t
      description:
      patchbomb: show prompt and selection in non-interactive mode
      changeset:   8940:01ada7b1861d
      user:        Mads Kiilerich <mads@kiilerich.com>
      date:        Sun Jun 21 03:13:38 2009 +0200
      files:       mercurial/ui.py tests/test-merge-prompt.out tests/test-merge-tools.out
      description:
      ui.prompt: Show prompt and selection in non-interactive mode
      3a55cee8
  12. Sep 28, 2011
    • Greg Ward's avatar
      patchbomb: make it easy for the user to decline sending an intro message. · 7bddec63
      Greg Ward authored
      - prompt(): respect interactive mode; clarify logic a bit
      - rename introneeded() to introwanted() and give it only one caller
      - add 'numbered' arg to makepatch() so it does not need to call
        introwanted()
      - factor makeintro() out of getpatchmsgs(), so it's easier to skip the
        intro message based on the user's behaviour
      
      Unexpected but perfectly reasonable side effect: in non-interactive
      mode, we don't show unanswerable "Cc" or "From" prompts anymore, so
      remove those from the test expectations.
      7bddec63
  13. Sep 20, 2011
    • Nikolaj Sjujskij's avatar
      building: build inotify for sys.platform='linux*' · f4bc0b9e
      Nikolaj Sjujskij authored
      If Python interpreter was built under Linux 3.x kernel, it reports
      sys.platform to be 'linux3' (it is fixed for Python 3, but not for 2.x).
      This cancels building inotify extension, which was built only for 'linux2'
      platform. Improved test checks if sys.platform begins with 'linux', and together
      with test for kernel version to be greater than 2.6 it seems to cover all known
      cases.
      f4bc0b9e
  14. Sep 27, 2011
  15. Sep 28, 2011
  16. Sep 27, 2011
Loading