Mercurial > hg-stable
changeset 19816:d5ec50e8604b
mq: document repo.mq.qparents
The function is not very complex but writing this doc helped me to check if
I got everything right.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 25 Sep 2013 19:34:45 +0200 |
| parents | 378567bf9f74 |
| children | e67786965af2 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Sep 25 19:32:53 2013 +0200 +++ b/hgext/mq.py Wed Sep 25 19:34:45 2013 +0200 @@ -628,6 +628,14 @@ return (0, n) def qparents(self, repo, rev=None): + """return the mq handled parent or p1 + + In some case where mq get himself in being the parent of a merge the + paappropriate parent may be p2. + (eg: an in progress merge started with mq disabled) + + If no parent are managed by mq, p1 is returned. + """ if rev is None: (p1, p2) = repo.dirstate.parents() if p2 == nullid: