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.
hgext/progress.py
author Durham Goode <durham@fb.com>
Tue, 25 Aug 2015 15:54:33 -0700
changeset 26078 5ca587348875
parent 26073 5ef327e9c157
permissions -rw-r--r--
convert: fix syncing deletes from p2 merge commit Recently we fixed converting merges to correctly sync changes from p2. We missed the case of deletes though (so p2 deleted a file that p1 had not yet deleted, and the file does not belong to the source). The fix is to detect when p2 doesn't have the file, so we just sync it as a delete to p1 in the merge. Updated the test, and verified it failed before the fix.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10434
ad104a786d35 Progress bar extension
Augie Fackler <durin42@gmail.com>
parents:
diff changeset 
     1
 
# progress.py show progress bars for some actions
ad104a786d35 Progress bar extension
Augie Fackler <durin42@gmail.com>
parents:
diff changeset 
     2
 
#
ad104a786d35 Progress bar extension
Augie Fackler <durin42@gmail.com>
parents:
diff changeset 
     3
 
# Copyright (C) 2010 Augie Fackler <durin42@gmail.com>
ad104a786d35 Progress bar extension
Augie Fackler <durin42@gmail.com>
parents:
diff changeset 
     4
 
#
15772
83a140752239 progress: Use the same GPL boilerplate as most hg files
Augie Fackler <durin42@gmail.com>
parents: 15662
diff changeset 
     5
 
# This software may be used and distributed according to the terms of the
83a140752239 progress: Use the same GPL boilerplate as most hg files
Augie Fackler <durin42@gmail.com>
parents: 15662
diff changeset 
     6
 
# GNU General Public License version 2 or any later version.
10434
ad104a786d35 Progress bar extension
Augie Fackler <durin42@gmail.com>
parents:
diff changeset 
     7
 







25522






15c2c580b2a7
progress: deprecate the progress extension



Pierre-Yves David <pierre-yves.david@fb.com>


parents: 
25521

diff
changeset




     8


"""show progress bars for some actions (DEPRECATED)








10434






ad104a786d35
Progress bar extension



Augie Fackler <durin42@gmail.com>


parents: 

diff
changeset




     9









25522






15c2c580b2a7
progress: deprecate the progress extension



Pierre-Yves David <pierre-yves.david@fb.com>


parents: 
25521

diff
changeset




    10


This extension has been merged into core, you can remove it from your config.













15c2c580b2a7
progress: deprecate the progress extension



Pierre-Yves David <pierre-yves.david@fb.com>


parents: 
25521

diff
changeset




    11


See hg help config.progress for configuration options.








10434






ad104a786d35
Progress bar extension



Augie Fackler <durin42@gmail.com>


parents: 

diff
changeset




    12


"""








26073






5ef327e9c157
progress: restore testedwith to the stub



Augie Fackler <augie@google.com>


parents: 
25522

diff
changeset




    13


# Note for extension authors: ONLY specify testedwith = 'internal' for













5ef327e9c157
progress: restore testedwith to the stub



Augie Fackler <augie@google.com>


parents: 
25522

diff
changeset




    14


# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should













5ef327e9c157
progress: restore testedwith to the stub



Augie Fackler <augie@google.com>


parents: 
25522

diff
changeset




    15


# be specifying the version(s) of Mercurial they are tested with, or













5ef327e9c157
progress: restore testedwith to the stub



Augie Fackler <augie@google.com>


parents: 
25522

diff
changeset




    16


# leave the attribute unspecified.













5ef327e9c157
progress: restore testedwith to the stub



Augie Fackler <augie@google.com>


parents: 
25522

diff
changeset




    17


testedwith = 'internal'















hg-stable