Wed, 28 Sep 2011 16:11:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 28 Sep 2011 16:11:53 -0500] rev 15167
merge with stable
Wed, 28 Sep 2011 14:49:00 -0500 patchbomb: drop loop in prompt
Matt Mackall <mpm@selenic.com> [Wed, 28 Sep 2011 14:49:00 -0500] rev 15166
patchbomb: drop loop in prompt There are no longer any prompts that insist on being answered, so the loop is no longer needed, nor is most of the other logic.
Wed, 08 Sep 2010 08:31:07 +0200 patchbomb: use prompt even in non-interactive mode
Matt Mackall <mpm@selenic.com> [Wed, 08 Sep 2010 08:31:07 +0200] rev 15165
patchbomb: use prompt even in non-interactive mode 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
Tue, 27 Sep 2011 22:38:47 -0400 patchbomb: make it easy for the user to decline sending an intro message.
Greg Ward <greg@gerg.ca> [Tue, 27 Sep 2011 22:38:47 -0400] rev 15164
patchbomb: make it easy for the user to decline sending an intro message. - 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.
Tue, 20 Sep 2011 15:21:27 +0300 building: build inotify for sys.platform='linux*' stable
Nikolaj Sjujskij <sterkrig@myopera.com> [Tue, 20 Sep 2011 15:21:27 +0300] rev 15163
building: build inotify for sys.platform='linux*' 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.
Mon, 26 Sep 2011 21:29:13 -0400 patchbomb: simplify some contorted logic and odd variable names.
Greg Ward <greg@gerg.ca> [Mon, 26 Sep 2011 21:29:13 -0400] rev 15162
patchbomb: simplify some contorted logic and odd variable names.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip