Siddharth Agarwal <sid0@fb.com> [Wed, 14 May 2014 12:49:55 -0700] rev 21404
update: when deactivating a bookmark, print a message
This helps prevent user confusion when innocent-seeming commands like
'hg update -C .' are run.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 02 Aug 2012 13:51:34 +0200] rev 21403
doc: improves merge-tools example with an overwrite of existing config
We highlight the fact that a user hgrc can overwrite the system wide
preconfiguration. As other benefit we show priority value other than 1 and shows
vimdiff configuration is usually directly available. This is valuable as vimdiff
is (surprisingly) a common request from user.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 12 May 2014 17:40:58 -0700] rev 21402
help: add additional information in the merge-tools section of config help
The merge tool configuration in general has always been a confusing topic for
user. We add mention of:
- possible pre-existing configuration,
- way to look at it,
- the more detailed help topic about how merge-tools configuration works.
This should help users find they way.
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:13:22 +0200] rev 21401
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
We were always using only the first 12 characters of the subrepo revision id
when generating the "subrepo diverged" promptchoice. This is not necessarily
correct for non mercurial subrepos.
Angel Ezquerra <angel.ezquerra@gmail.com> [Wed, 07 May 2014 00:08:20 +0200] rev 21400
subrepo: add shortid() method to subrepo classes
This method takes an "id" (e.g. a revision id) and returns a "short" version
(e.g. a short revision id).
This will be used on the next revision to fix a small bug in the way that the
text on the promptchoice shown when a subrepo diverges is generated.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 11 Mar 2014 18:32:16 -0500] rev 21399
localrepo: call _dirstatestatus instead of duplicating logic
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:20:30 -0500] rev 21398
workingctx: call _dirstatestatus in status
Rip out the call from workingctx.status to localrepo.status.
Sean Farley <sean.michael.farley@gmail.com> [Tue, 22 Apr 2014 13:14:51 -0500] rev 21397
context: add private _dirstatestatus method
This patch is a step forward in getting rid of needing to check 'parentworking'
throughout the status method. Eventually, we will use the power of inheritance
to do the correct thing when comparing the working directory with its parent.
This method is mostly a copy from localrepo.status. The custom status method of
workingctx will eventually be absorbed by the refactoring of localrepo.status
to context.status but unfortunately we can't do it in one step.