timeless <timeless@mozdev.org> [Tue, 22 Dec 2015 23:25:17 +0000] rev 27630
histedit: hide --outgoing warnings
timeless <timeless@mozdev.org> [Wed, 23 Dec 2015 08:57:04 +0000] rev 27629
histedit: list action when intervention is required
timeless <timeless@mozdev.org> [Wed, 23 Dec 2015 08:52:52 +0000] rev 27628
error: make InterventionRequired take a hint
timeless <timeless@mozdev.org> [Thu, 24 Dec 2015 20:41:17 +0000] rev 27627
histedit: hook afterresolvedstates
timeless <timeless@mozdev.org> [Thu, 24 Dec 2015 20:41:40 +0000] rev 27626
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org> [Thu, 24 Dec 2015 20:46:06 +0000] rev 27625
graft: hook afterresolvedstates
timeless <timeless@mozdev.org> [Thu, 24 Dec 2015 19:25:44 +0000] rev 27624
resolve: suggest the next action
Expose afterresolvedstates to allow graft and similar to
suggest a message when resolving results in no unresolved
files.
If there isn't a matching state in afterresolvedstates,
then if verbose, suggest commiting.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 04 Jan 2016 21:52:44 -0800] rev 27623
dispatch: report similar names consistently
Durham Goode <durham@fb.com> [Mon, 04 Jan 2016 16:14:04 -0800] rev 27622
cmdutil: pass node instead of ctx to diffordiffstat
93bcc73df8d5 changed showpatch to use ctx's more, but it accidentally passed
prev as a context and node as a binary string, when both should be passed as
binary strings (since diffordiffstat tries to resolve them via repo[X]).
This affected hggit since the existing ctx belongs to the git overlay, but the
resolved context (from the repo[X] resolution) should belong to the main repo.
This broke a test because it tried to look in the git repo for data that didn't
exist.
This feels like a deeper issue in hggit somewhere, but the fix is here trivial and
obviously more correct
Yuya Nishihara <yuya@tcha.org> [Sun, 27 Dec 2015 23:37:14 +0900] rev 27621
import-checker: list package directory as stdlib module
Before this patch, a directory containing __init__.py wasn't counted as a
module and __init__.pyc was listed as foo.bar.__init__ module.