Mercurial > hg
view mercurial/stack.py @ 41487:fa471151d269
extdiff: add --per-file and --confirm options
The new options lets the user control how the external program is run.
By default, Mercurial passes the 2 snapshot directories as usual, but
it can also run the program repeatedly on each file's snapshot pair,
and optionally prompt the user each time.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 29 Jan 2019 22:59:15 -0800 |
parents | 68fcc5503ec5 |
children | 77c52ce50e6a |
line wrap: on
line source
# stack.py - Mercurial functions for stack definition # # Copyright Matt Mackall <mpm@selenic.com> and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from . import ( revsetlang, scmutil, ) def getstack(repo, rev=None): """return a sorted smartrev of the stack containing either rev if it is not None or the current working directory parent. The stack will always contain all drafts changesets which are ancestors to the revision and are not merges. """ if rev is None: rev = '.' revspec = 'reverse(only(%s) and not public() and not ::merge())' revset = revsetlang.formatspec(revspec, rev) revisions = scmutil.revrange(repo, [revset]) revisions.sort() return revisions