Fri, 15 May 2015 09:54:56 -0500 factotum: use try/except/finally
Matt Mackall <mpm@selenic.com> [Fri, 15 May 2015 09:54:56 -0500] rev 25078
factotum: use try/except/finally
Fri, 15 May 2015 09:54:35 -0500 check-code: drop try/except/finally check
Matt Mackall <mpm@selenic.com> [Fri, 15 May 2015 09:54:35 -0500] rev 25077
check-code: drop try/except/finally check
Thu, 14 May 2015 09:04:48 +0200 util.h: kill no longer needed definitions for Python < 2.6
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 May 2015 09:04:48 +0200] rev 25076
util.h: kill no longer needed definitions for Python < 2.6 see e1fb276d4619
Thu, 14 May 2015 16:28:28 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2015 16:28:28 -0500] rev 25075
merge with stable
Thu, 14 May 2015 11:04:36 +0200 setup: integrate osutil C extension into extmodules initialization
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 May 2015 11:04:36 +0200] rev 25074
setup: integrate osutil C extension into extmodules initialization
Thu, 14 May 2015 11:04:35 +0200 setup: move osutil_ldflags logic to before extmodules definition
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 May 2015 11:04:35 +0200] rev 25073
setup: move osutil_ldflags logic to before extmodules definition
Thu, 14 May 2015 11:04:31 +0200 setup: kill pure hack for osutil on Windows for Python 2.4
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 May 2015 11:04:31 +0200] rev 25072
setup: kill pure hack for osutil on Windows for Python 2.4 see e1fb276d4619
Thu, 14 May 2015 11:37:36 +0200 windows: add comment in normcase()
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 May 2015 11:37:36 +0200] rev 25071
windows: add comment in normcase() see also 3c5e818ac679
Sun, 10 May 2015 10:57:24 -0400 rebase: clear merge when aborting before any rebasing (issue4661) stable
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Sun, 10 May 2015 10:57:24 -0400] rev 25070
rebase: clear merge when aborting before any rebasing (issue4661) The check of the inrebase function was not correct, and it failed to consider the situation in which nothing has been rebased yet, *and* the working dir had been updated away from the initial revision. But this is easy to fix. Given the rebase state, we know exactly where we should be standing: on the first unrebased commit. We check that instead. I also took the liberty to rename the function, as "inrebase" doesn't really describe the situation: we could still be in a rebase state yet the user somehow forcibly updated to a different revision. We also check that we're in a merge state, since an interrupted merge is the only "safe" way to interrupt a rebase. If the rebase got interrupted by power loss or whatever (so there's no merge state), it's still safer to not blow away the working directory.
Sun, 10 May 2015 10:02:15 -0400 test-rebase-abort: add test from issue4009 stable
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Sun, 10 May 2015 10:02:15 -0400] rev 25069
test-rebase-abort: add test from issue4009 The fix for issue4009, namely fe78eb7bcca0, introduced issue4661. Let's make sure that the fix for issue4661 will not reintroduce issue4009.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip