timeless <timeless@mozdev.org> [Wed, 02 Dec 2015 06:33:52 +0000] rev 27173
graft: improve --continue abort message
before, if you ran hg graft --user ... --date ... --log ... revs,
and if it failed, it would suggest "hg graft --continue",
but if you did that, your --user / --date / --log options
were lost, because they were not persisted anywhere...
timeless <timeless@mozdev.org> [Wed, 02 Dec 2015 06:31:12 +0000] rev 27172
summary: mention graft
timeless <timeless@mozdev.org> [Wed, 02 Dec 2015 08:07:36 +0000] rev 27171
histedit: mention histedit-last-edit.txt on abort
Users may spend a lot of effort writing histedit rules,
getting an abort without being told they can recover their work
is very frustrating.
Avoid that by telling them where to find their work.
timeless <timeless@mozdev.org> [Wed, 02 Dec 2015 07:40:42 +0000] rev 27170
histedit: add missing raise keyword to statement
timeless <timeless@mozdev.org> [Wed, 02 Dec 2015 07:39:49 +0000] rev 27169
histedit: improve grammar for _histedit comment
Augie Fackler <augie@google.com> [Tue, 01 Dec 2015 14:44:08 -0500] rev 27168
test-fncache: ensure lock doesn't look held to __del__
This was showing a DeprecationWarning on Python 2.6.
Augie Fackler <augie@google.com> [Wed, 11 Nov 2015 20:07:15 -0500] rev 27167
commands: inline definition of localrepo.parents() and drop the method (API)
localrepo.parents() has relatively few users, and most of those were
actually implicitly looking at the wctx, which is now made explicit
via repo[None].
Augie Fackler <augie@google.com> [Wed, 11 Nov 2015 20:02:05 -0500] rev 27166
localrepo: document nodebookmarks
Augie Fackler <augie@google.com> [Wed, 11 Nov 2015 19:47:49 -0500] rev 27165
localrepo: remove clone method by hoisting into hg.py
hg.py was the only remaining caller of localrepo.clone(), so it's time
to move some more behavior out of localrepo.
Siddharth Agarwal <sid0@fb.com> [Tue, 01 Dec 2015 09:48:38 -0800] rev 27164
filemerge: default regular prompts to 'leave unresolved' (BC)
It makes far more sense to leave these conflicts unresolved and kick back to
the user than to just assume that the local version be chosen. There are almost
certainly buggy scripts and applications using Mercurial in the wild that do
merges or rebases non-interactively, and then assume that if the operation
succeeded there's nothing the user needs to pay attention to.
Siddharth Agarwal <sid0@fb.com> [Mon, 30 Nov 2015 13:43:55 -0800] rev 27163
filemerge: add a 'leave unresolved' option to change/delete prompts
We're going to make this option the default in an upcoming patch.
Siddharth Agarwal <sid0@fb.com> [Mon, 30 Nov 2015 11:17:18 -0800] rev 27162
filemerge: add a 'leave unresolved' option to regular prompts
'Regular' here means anything that isn't a change/delete prompt. We'll add this
option to change/delete prompts in a subsequent patch.
Siddharth Agarwal <sid0@fb.com> [Wed, 25 Nov 2015 14:25:26 -0800] rev 27161
filemerge: add debug output for whether this is a change/delete conflict
Just like binary and symlink conflicts, change/delete conflicts influence the
tool picked.
Anton Shestakov <av6@dwimlabs.net> [Sat, 28 Nov 2015 17:06:29 +0800] rev 27160
webcommands: test that fctx is not None in filediff()
A block of code above this one already says "if fctx is not None", and it's
also what this code actually intends to check, so let's be specific as PEP-8
recommends.
Anton Shestakov <av6@dwimlabs.net> [Sat, 28 Nov 2015 16:46:31 +0800] rev 27159
webcommands: stop using ersatz if-else ternary operator for rename variable
6ddc86eedc3b didn't remove it, let's do it now.
Placing the added lines into the already existing "if fctx is not None" block
also makes webcommands.comparison() look a bit more like
webcommands.filediff(), which eases possible future refactoring. And fctx is
not None only when path in ctx, so logically it's equivalent.
Anton Shestakov <av6@dwimlabs.net> [Sat, 28 Nov 2015 16:02:22 +0800] rev 27158
webcommands: get correct parents when comparing a removed file (issue4962)
When comparing a file that was removed at the current revision, parents used to
show grandparents instead, due to how fctx was "shifted" from the current
revision to its p1. Let's not do that.
The fix is pretty much copied from webcommands.filediff().