Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 10 Mar 2021 13:14:32 +0530
changeset 46811 5a0b930cfb3e
parent 43106 d783f945a701
child 48966 6000f5b25c9b
permissions -rw-r--r--
commit: get info from mergestate whether a file was merged or not While commiting a merge, the commit code does not know whether a file was merged during `hg merge` or not. This leads the commit code to look for filelog ancestor to choose parents of new filelog created on merge commit. This leads to wrong results in some cases as demonstrated by previous patch. From this patch, we start storing information about merged files in mergestate in stateextras and then use that on commit to detect whether we need to set two parents or not. Differential Revision: https://phab.mercurial-scm.org/D10149
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
27220
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     1
 
# __init__.py - Startup and module loading logic for Mercurial.
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     2
 
#
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     3
 
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     4
 
#
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     5
 
# This software may be used and distributed according to the terms of the
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     6
 
# GNU General Public License version 2 or any later version.
4374d819ccd5 mercurial: implement import hook for handling C/Python modules
Gregory Szorc <gregory.szorc@gmail.com>
parents: 0
diff changeset 
     7
 












4374d819ccd5
mercurial: implement import hook for handling C/Python modules



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
0

diff
changeset




     8


from __future__ import absolute_import













4374d819ccd5
mercurial: implement import hook for handling C/Python modules



Gregory Szorc <gregory.szorc@gmail.com>


parents: 
0

diff
changeset




     9









32458






0906b85bf222
demandimport: move to separate package



Siddharth Agarwal <sid0@fb.com>


parents: 
32412

diff
changeset




    10


# Allow 'from mercurial import demandimport' to keep working.













0906b85bf222
demandimport: move to separate package



Siddharth Agarwal <sid0@fb.com>


parents: 
32412

diff
changeset




    11


import hgdemandimport








43076






2372284d9457
formatting: blacken the codebase



Augie Fackler <augie@google.com>


parents: 
42603

diff
changeset




    12









32458






0906b85bf222
demandimport: move to separate package



Siddharth Agarwal <sid0@fb.com>


parents: 
32412

diff
changeset




    13


demandimport = hgdemandimport















hg-stable