FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 17 Oct 2015 01:15:33 +0900] rev 26746
dirstateguard: remove layering violation around saving/restoring backup
This violation, which passes 'repo' object to dirstate, was introduced
by 59b5e8844eb0 and 020b12d591f3.
Christian Delahousse <cdelahousse@fb.com> [Thu, 15 Oct 2015 15:20:44 -0700] rev 26745
rebase: reduce scope of try catch in restorestate
Refactoring by reduce the scope of the try catch block so that it only captures
what it needs. I could have made it smaller but another patch in the series
will add onto it.
Christian Delahousse <cdelahousse@fb.com> [Thu, 15 Oct 2015 12:13:46 -0700] rev 26744
rebase: on abort delete rebase state file no matter what
When a user's repository is in an unfinished rebase state and they choose to
abort, at a minimum, the repo should be out of that state. We've found
situations where the user could not leave the state unless manually deleting the
rebasestate file. This fix ensures that no matter what exception may be raised
during the abort, the rebase state file will be deleted, the user will be out of
the rebase state and they can get their repository into a workable condition.
Christian Delahousse <cdelahousse@fb.com> [Fri, 16 Oct 2015 15:01:42 -0700] rev 26743
contrib: make editmerge look for merge markers at the beginning of the line
This fix adds a caret to the start of the regex looking for merge markers. This
avoids the issue arises when you've real merge conflicts in a file that tests
for the existance of merge markers in test output. Editmerge will not open on
the fake/tested merge markers because they'll be indented in.
Tony Tung <tonytung@fb.com> [Fri, 09 Oct 2015 21:44:54 -0700] rev 26742
commit: abort when a committemplate is not changed
If a committemplate is provided and no message is provided on the
command line, and no edits are made to the commit template, then abort
the commit.
Siddharth Agarwal <sid0@fb.com> [Wed, 14 Oct 2015 16:04:43 -0700] rev 26741
localrepo.commit: disallow commit when driver-resolved files exist
This code will not currently be activated because there's no code to mark
files as driver-resolved in core. This point is also somewhat hard to plug into
from extensions.
Siddharth Agarwal <sid0@fb.com> [Wed, 14 Oct 2015 15:01:07 -0700] rev 26740
merge.mergestate: add a generator for driver-resolved files
Just like for unresolved files above, we need to be able to tell what files are
driver-resolved.
Siddharth Agarwal <sid0@fb.com> [Wed, 14 Oct 2015 16:27:10 -0700] rev 26739
hook: for python hooks, also return whether an exception was raised
The hook code treats python hooks raising an exception and returning True as
the exact same. This is OK for hooks themselves, but other code that wants to
invoke external code using the same underlying code is a bit more interested in
making a distinction.
Siddharth Agarwal <sid0@fb.com> [Wed, 14 Oct 2015 16:19:47 -0700] rev 26738
hook.runhooks: return a dict of result values
This will be useful to other calling code that would be interested in what the
individual hooks return.
Siddharth Agarwal <sid0@fb.com> [Wed, 14 Oct 2015 16:13:31 -0700] rev 26737
hook: factor out determination of hooks from running them
This will allow other code to run a predetermined series of hooks.
Mads Kiilerich <mads@kiilerich.com> [Tue, 10 Mar 2015 13:19:17 +0100] rev 26736
mq: generate patch names from first line of description
Avoid the pointless numeric rev.diff patch names.
Instead, do like mbox extension does and create meaningful patch names.
Mads Kiilerich <madski@unity3d.com> [Thu, 15 Oct 2015 21:36:47 +0200] rev 26735
contrib: offer Python 2.7.10
Mads Kiilerich <madski@unity3d.com> [Thu, 15 Oct 2015 21:35:49 +0200] rev 26734
contrib: drop Python < 2.6 from Makefile.python
Mads Kiilerich <madski@unity3d.com> [Fri, 16 Oct 2015 11:37:34 +0200] rev 26733
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 15 Oct 2015 14:53:32 -0700] rev 26732
exchange: don't print error codes after clone bundle failure
We don't appear to print error codes elsewhere. The error codes are
inconsistent between at least Linux and OS X and are more trouble than
they are worth. Humans care about the error string more than the code
anyway.
A glob was also added to pave over differences in error strings between
Linux and OS X.
Augie Fackler <augie@google.com> [Wed, 14 Oct 2015 14:53:15 -0400] rev 26731
debian: install bash completion as hg and not mercurial (issue4900)
Augie Fackler <augie@google.com> [Wed, 14 Oct 2015 12:57:33 -0400] rev 26730
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
Sean Farley <sean@farley.io> [Tue, 13 Oct 2015 23:04:53 -0700] rev 26729
exchange: add oparg to push so that extensions can wrap pushop
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 03:15:54 +0100] rev 26728
destmerge: extract logic based on branch heads in its own function
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 03:13:14 +0100] rev 26727
destmerge: extract logic based on bookmark into its own function
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 03:00:09 +0100] rev 26726
destupdate: have a generic and extensible way to run each step
We want extension to be able to easily override or add new way to select the
default update destination. We use the same list + dict approach as in other
parts of the code.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 02:33:09 +0100] rev 26725
destupdate: extract logic based on branch in its own function
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 02:27:30 +0100] rev 26724
destupdate: extract logic based on bookmarks in its own function
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 02:15:43 +0100] rev 26723
destupdate: extract logic based on obsolescence marker in its own function
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 02:12:55 +0100] rev 26722
destupdate: move obsolete handling first
This block was overwriting any result from the previous block anyway. So we move
it first to prove it is possible and we'll extract it in its own function in the
next patch.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 02:12:15 +0100] rev 26721
destupdate: indent bookmark and branch logic
We'll move the obsolete related logic first (as it is overwriting any other
anyway) to make the next patch clearer we add indentation in this one.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 14:10:57 +0100] rev 26720
destupdate: extract validation logic
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 15 Oct 2015 01:56:03 +0100] rev 26719
rebase: rename and test '_destrebase'
We make the name consistent with the other similar revsets and make sure it has
minimal tests.