[Bug 5057] New: rebase failed with AttributeError: __exit__ leaving inconsistent rebase
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Thu Jan 21 18:30:35 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5057
Bug ID: 5057
Summary: rebase failed with AttributeError: __exit__ leaving
inconsistent rebase
Product: Mercurial
Version: 3.7-rc
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: normal
Component: rebase
Assignee: bugzilla at selenic.com
Reporter: timeless at gmail.com
CC: mercurial-devel at selenic.com
My base was 158bdc896572
@ changeset: 30617:fd6c84e1f188
| branch: stable
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 17:25:43 2016 +0000
| summary: patch: fix error handling of patches function
|
o changeset: 30616:2fa6ee6a4302
| branch: stable
| parent: 30613:5246f7be557d
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 16:58:14 2016 +0000
| summary: diff: fix error handling of blocks function
|
o changeset: 30613:5246f7be557d
| branch: stable
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 16:21:04 2016 +0000
| summary: export: warn about unrepresentable content
|
o changeset: 30612:11f75d88d850
| branch: stable
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 16:20:39 2016 +0000
| summary: tests: add coverage for rebase
|
o changeset: 30611:4f34b6da562e
| branch: stable
| parent: 30608:158bdc896572
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 16:20:10 2016 +0000
| summary: export: honor losedatafn
|
| o changeset: 30610:f62dea3f3697
| | branch: stable
| | tag: default/stable
| | user: Matt Mackall <mpm at selenic.com>
| | date: Wed Jan 20 22:39:51 2016 -0600
| | summary: Added signature for changeset 158bdc896572
| |
| o changeset: 30609:d08ea50cf975
|/ branch: stable
| user: Matt Mackall <mpm at selenic.com>
| date: Wed Jan 20 22:39:50 2016 -0600
| summary: Added tag 3.7-rc for changeset 158bdc896572
|
o changeset: 30608:158bdc896572
| branch: stable
| bookmark: @
| tag: 3.7-rc
| user: timeless <timeless at mozdev.org>
| date: Thu Jan 21 00:20:19 2016 +0000
| summary: shelve: lowercase flag description
|
and default was 7ea0cf1f3658:
o changeset: 30593:7ea0cf1f3658
| user: timeless <timeless at mozdev.org>
| date: Mon Jan 18 07:43:23 2016 +0000
| summary: progress: debugging bug with broken clowcopter server values
|
o changeset: 30592:4866c4f08df0
| user: timeless <timeless at mozdev.org>
| date: Mon Jan 18 07:42:56 2016 +0000
| summary: dispatch: try to report the url for HTTPError
|
o changeset: 30591:738fe126f26f
| bookmark: docchecker
| parent: 30327:351ceda90948
| user: timeless <timeless at mozdev.org>
| date: Tue Jan 12 09:30:57 2016 +0000
| summary: docchecker: try to reject single quotes
|
o changeset: 30327:351ceda90948
| user: timeless <timeless at mozdev.org>
| date: Wed Jan 06 20:45:50 2016 +0000
| summary: tests: splitting test-gendoc.t into per file tests [RFC]
|
o changeset: 30326:89dc5e988ec4
| user: timeless <timeless at mozdev.org>
| date: Wed Jan 06 19:57:29 2016 +0000
| summary: tests: run docchecker in gendoc.t
|
o changeset: 30325:56fd853c3ca8
| user: timeless <timeless at mozdev.org>
| date: Wed Jan 06 19:49:53 2016 +0000
| summary: tests: move gendoc.t runrst comment next to runrst
|
o changeset: 30324:d271b60d72a5
| user: timeless <timeless at mozdev.org>
| date: Wed Jan 06 17:18:18 2016 +0000
| summary: children: use double quotes for arguments
|
o changeset: 30323:a92aca6e9b17
| user: timeless <timeless at mozdev.org>
| date: Tue Jan 12 09:30:39 2016 +0000
| summary: largefiles: use double quotes for arguments
|
o changeset: 30322:171f57cfc47a
| parent: 30226:5dcadc6c5aed
| user: timeless <timeless at mozdev.org>
| date: Tue Jan 12 09:30:24 2016 +0000
| summary: graft: use double quotes for arguments
|
o changeset: 30226:5dcadc6c5aed
| user: Matt Harbison <matt_harbison at yahoo.com>
| date: Wed Jan 13 00:09:26 2016 -0500
| summary: test-status: stabilize for no-execbit platforms
|
my blackbox log says:
2016/01/21 17:58:00 timeless (155900)> diff
2016/01/21 17:58:00 timeless (155900)> diff exited 0 after 0.63 seconds
2016/01/21 17:58:29 timeless (161525)> st
2016/01/21 17:58:29 timeless (161525)> st exited 0 after 0.58 seconds
2016/01/21 17:58:31 timeless (162123)> diff
2016/01/21 17:58:32 timeless (162123)> diff exited 0 after 0.61 seconds
2016/01/21 17:58:38 timeless (1670)> shelve
2016/01/21 17:58:39 timeless (1670)> shelve exited 0 after 0.97 seconds
2016/01/21 17:58:41 timeless (2516)> rebase -s 4f34b6da562e -d default
2016/01/21 17:58:42 timeless (2516)> updated served branch cache in 0.0104
seconds
2016/01/21 17:58:42 timeless (2516)> wrote served branch cache with 2 labels
and 37 nodes
2016/01/21 17:58:42 timeless (2516)> updated served branch cache in 0.0101
seconds
2016/01/21 17:58:42 timeless (2516)> wrote served branch cache with 2 labels
and 37 nodes
2016/01/21 17:58:42 timeless (2516)> updated served branch cache in 0.0102
seconds
2016/01/21 17:58:42 timeless (2516)> wrote served branch cache with 2 labels
and 37 nodes
2016/01/21 17:58:43 timeless (2516)> updated served branch cache in 0.0102
seconds
2016/01/21 17:58:43 timeless (2516)> wrote served branch cache with 2 labels
and 37 nodes
2016/01/21 17:58:43 timeless (2516)> updated served branch cache in 0.0101
seconds
2016/01/21 17:58:43 timeless (2516)> wrote served branch cache with 2 labels
and 37 nodes
2016/01/21 17:58:43 timeless (2516)> writing 120 bytes to cache/hgtagsfnodes1
2016/01/21 17:58:43 timeless (2516)> 723/724 cache hits/lookups in 0.0166
seconds
2016/01/21 17:58:43 timeless (2516)> writing .hg/cache/tags2 with 134 tags
2016/01/21 17:58:43 timeless (2516)> ** Unknown exception encountered with
possibly-broken third-party extension hg-git
** which supports versions 2.8 of Mercurial.
** Please disable hg-git and try your action again.
** If that fixes the bug please report it to
https://bitbucket.org/durin42/hg-git/issues
** Python 2.7.8 (default, Jul 8 2015, 18:13:08) [GCC 4.9.2 20150212 (Red Hat
4.9.2-6)]
** Mercurial Distributed SCM (version 3.7-rc+4-2fa6ee6a4302+20160121)
** Extensions loaded: strip, mq, histedit, color, record, rebase, blackbox,
remotebranches, evolve, hg-git, pager, shelve, patchbomb
Traceback (most recent call last):
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 191, in _runcatch
ui.warn(_("%s debugger specified "
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 924, in _dispatch
msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 681, in runcommand
File "/home/timeless/hg/crew/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
File "/home/timeless/hg/crew/hgext/pager.py", line 143, in pagecmd
return orig(ui, options, cmd, cmdfunc)
File "/home/timeless/hg/crew/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
File "/home/timeless/hg/crew/hgext/color.py", line 518, in colorcmd
return orig(ui_, opts, cmd, cmdfunc)
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 1055, in
_runcommand
# so we need to escape any % signs.
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 1015, in checkargs
File "/home/timeless/hg/crew/mercurial/dispatch.py", line 921, in <lambda>
elif rpath:
File "/home/timeless/hg/crew/mercurial/util.py", line 991, in check
except TypeError:
File "/home/timeless/hg/crew/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
File "/home/timeless/hg/crew/mercurial/util.py", line 991, in check
except TypeError:
File "/home/timeless/hg/evolve-main/hgext/evolve.py", line 759, in
warnobserrors
ret = orig(ui, repo, *args, **kwargs)
File "/home/timeless/hg/crew/mercurial/util.py", line 991, in check
except TypeError:
File "/home/timeless/hg/crew/mercurial/extensions.py", line 195, in closure
return func(*(args + a), **kw)
File "/home/timeless/hg/crew/mercurial/util.py", line 991, in check
except TypeError:
File "/home/timeless/hg/crew/hgext/mq.py", line 3516, in mqcommand
return orig(ui, *args, **kwargs)
File "/home/timeless/hg/crew/mercurial/util.py", line 991, in check
except TypeError:
File "/home/timeless/hg/crew/hgext/rebase.py", line 550, in rebase
ui.note(_("rebase completed\n"))
AttributeError: __exit__
2016/01/21 17:58:43 timeless (2516)> rebase -s 4f34b6da562e -d default exited 0
after 2.86 seconds
2016/01/21 18:01:24 timeless (7723)> st
2016/01/21 18:01:24 timeless (7723)> st exited 0 after 0.81 seconds
2016/01/21 18:04:41 timeless (46202)> shelve l
2016/01/21 18:04:41 timeless (46202)> shelve l exited -1 after 0.08 seconds
2016/01/21 18:04:45 timeless (46902)> rebase --cont
2016/01/21 18:04:46 timeless (46902)> rebase --cont exited -1 after 0.93
seconds
here's the output from those last
(py)[timeless at gcc2-power8 mercurial]$ hg shelve l
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
(py)[timeless at gcc2-power8 mercurial]$ hg rebase --cont
abort: cannot continue inconsistent rebase
(use "hg rebase --abort" to clear broken state)
I suppose that we really don't want code to run to build the message, but it
sucks that shelve told me one thing, and the thing it told me didn't really
work. (fwiw, I was trying to do `hg shelve -l`, but I lost a character.)
The main problem is clearly the __exit__, but I'm not at all sure what it means
or where it's coming from...
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list